Whamcloud - gitweb
LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git] / lustre / ptlrpc / nrs_tbf.c
index f3ba8f0..9486172 100644 (file)
@@ -42,6 +42,7 @@
 #include <obd_support.h>
 #include <obd_class.h>
 #include <libcfs/libcfs.h>
+#include <lustre_req_layout.h>
 #include "ptlrpc_internal.h"
 
 /**
@@ -300,6 +301,7 @@ nrs_tbf_rule_start(struct ptlrpc_nrs_policy *policy,
 
        memcpy(rule->tr_name, start->tc_name, strlen(start->tc_name));
        rule->tr_rpc_rate = start->u.tc_start.ts_rpc_rate;
+       rule->tr_flags = start->u.tc_start.ts_rule_flags;
        rule->tr_nsecs = NSEC_PER_SEC;
        do_div(rule->tr_nsecs, rule->tr_rpc_rate);
        rule->tr_depth = tbf_depth;
@@ -348,6 +350,9 @@ nrs_tbf_rule_start(struct ptlrpc_nrs_policy *policy,
                head->th_rule = rule;
        }
 
+       CDEBUG(D_RPCTRACE, "TBF starts rule@%p rate %llu gen %llu\n",
+              rule, rule->tr_rpc_rate, rule->tr_generation);
+
        return 0;
 }
 
@@ -518,11 +523,9 @@ tbf_cli_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2)
        cli1 = container_of(e1, struct nrs_tbf_client, tc_node);
        cli2 = container_of(e2, struct nrs_tbf_client, tc_node);
 
-       if (cli1->tc_check_time + cli1->tc_nsecs <
-           cli2->tc_check_time + cli2->tc_nsecs)
+       if (cli1->tc_deadline < cli2->tc_deadline)
                return 1;
-       else if (cli1->tc_check_time + cli1->tc_nsecs >
-                cli2->tc_check_time + cli2->tc_nsecs)
+       else if (cli1->tc_deadline > cli2->tc_deadline)
                return 0;
 
        if (cli1->tc_check_time < cli2->tc_check_time)
@@ -567,7 +570,7 @@ static void *nrs_tbf_jobid_hop_key(struct hlist_node *hnode)
        return cli->tc_jobid;
 }
 
-static void *nrs_tbf_jobid_hop_object(struct hlist_node *hnode)
+static void *nrs_tbf_hop_object(struct hlist_node *hnode)
 {
        return hlist_entry(hnode, struct nrs_tbf_client, tc_hnode);
 }
@@ -606,7 +609,7 @@ static struct cfs_hash_ops nrs_tbf_jobid_hash_ops = {
        .hs_hash        = nrs_tbf_jobid_hop_hash,
        .hs_keycmp      = nrs_tbf_jobid_hop_keycmp,
        .hs_key         = nrs_tbf_jobid_hop_key,
-       .hs_object      = nrs_tbf_jobid_hop_object,
+       .hs_object      = nrs_tbf_hop_object,
        .hs_get         = nrs_tbf_jobid_hop_get,
        .hs_put         = nrs_tbf_jobid_hop_put,
        .hs_put_locked  = nrs_tbf_jobid_hop_put,
@@ -625,13 +628,10 @@ nrs_tbf_jobid_hash_lookup(struct cfs_hash *hs,
        struct hlist_node *hnode;
        struct nrs_tbf_client *cli;
 
-       /* cfs_hash_bd_peek_locked is a somehow "internal" function
-        * of cfs_hash, it doesn't add refcount on object. */
-       hnode = cfs_hash_bd_peek_locked(hs, bd, (void *)jobid);
+       hnode = cfs_hash_bd_lookup_locked(hs, bd, (void *)jobid);
        if (hnode == NULL)
                return NULL;
 
-       cfs_hash_get(hs, hnode);
        cli = container_of0(hnode, struct nrs_tbf_client, tc_hnode);
        if (!list_empty(&cli->tc_lru))
                list_del_init(&cli->tc_lru);
@@ -787,6 +787,10 @@ nrs_tbf_jobid_startup(struct ptlrpc_nrs_policy *policy,
        start.tc_name = NRS_TBF_DEFAULT_RULE;
        INIT_LIST_HEAD(&start.u.tc_start.ts_jobids);
        rc = nrs_tbf_rule_start(policy, head, &start);
+       if (rc) {
+               cfs_hash_putref(head->th_cli_hash);
+               head->th_cli_hash = NULL;
+       }
 
        return rc;
 }
@@ -803,37 +807,83 @@ nrs_tbf_jobid_list_free(struct list_head *jobid_list)
        list_for_each_entry_safe(jobid, n, jobid_list, tj_linkage) {
                OBD_FREE(jobid->tj_id, strlen(jobid->tj_id) + 1);
                list_del(&jobid->tj_linkage);
-               OBD_FREE(jobid, sizeof(struct nrs_tbf_jobid));
+               OBD_FREE_PTR(jobid);
        }
 }
 
 static int
-nrs_tbf_jobid_list_add(const struct cfs_lstr *id, struct list_head *jobid_list)
+nrs_tbf_jobid_list_add(struct cfs_lstr *id, struct list_head *jobid_list)
 {
        struct nrs_tbf_jobid *jobid;
+       char *ptr;
 
-       OBD_ALLOC(jobid, sizeof(struct nrs_tbf_jobid));
+       OBD_ALLOC_PTR(jobid);
        if (jobid == NULL)
                return -ENOMEM;
 
        OBD_ALLOC(jobid->tj_id, id->ls_len + 1);
        if (jobid->tj_id == NULL) {
-               OBD_FREE(jobid, sizeof(struct nrs_tbf_jobid));
+               OBD_FREE_PTR(jobid);
                return -ENOMEM;
        }
 
        memcpy(jobid->tj_id, id->ls_str, id->ls_len);
+       ptr = lprocfs_strnstr(id->ls_str, "*", id->ls_len);
+       if (ptr == NULL)
+               jobid->tj_match_flag = NRS_TBF_MATCH_FULL;
+       else
+               jobid->tj_match_flag = NRS_TBF_MATCH_WILDCARD;
+
        list_add_tail(&jobid->tj_linkage, jobid_list);
        return 0;
 }
 
+static bool
+cfs_match_wildcard(const char *pattern, const char *content)
+{
+       if (*pattern == '\0' && *content == '\0')
+               return true;
+
+       if (*pattern == '*' && *(pattern + 1) != '\0' && *content == '\0')
+               return false;
+
+       while (*pattern == *content) {
+               pattern++;
+               content++;
+               if (*pattern == '\0' && *content == '\0')
+                       return true;
+
+               if (*pattern == '*' && *(pattern + 1) != '\0' &&
+                   *content == '\0')
+                       return false;
+       }
+
+       if (*pattern == '*')
+               return (cfs_match_wildcard(pattern + 1, content) ||
+                       cfs_match_wildcard(pattern, content + 1));
+
+       return false;
+}
+
+static inline bool
+nrs_tbf_jobid_match(const struct nrs_tbf_jobid *jobid, const char *id)
+{
+       if (jobid->tj_match_flag == NRS_TBF_MATCH_FULL)
+               return strcmp(jobid->tj_id, id) == 0;
+
+       if (jobid->tj_match_flag == NRS_TBF_MATCH_WILDCARD)
+               return cfs_match_wildcard(jobid->tj_id, id);
+
+       return false;
+}
+
 static int
 nrs_tbf_jobid_list_match(struct list_head *jobid_list, char *id)
 {
        struct nrs_tbf_jobid *jobid;
 
        list_for_each_entry(jobid, jobid_list, tj_linkage) {
-               if (strcmp(id, jobid->tj_id) == 0)
+               if (nrs_tbf_jobid_match(jobid, id))
                        return 1;
        }
        return 0;
@@ -1021,11 +1071,6 @@ static void *nrs_tbf_nid_hop_key(struct hlist_node *hnode)
        return &cli->tc_nid;
 }
 
-static void *nrs_tbf_nid_hop_object(struct hlist_node *hnode)
-{
-       return hlist_entry(hnode, struct nrs_tbf_client, tc_hnode);
-}
-
 static void nrs_tbf_nid_hop_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
        struct nrs_tbf_client *cli = hlist_entry(hnode,
@@ -1061,7 +1106,7 @@ static struct cfs_hash_ops nrs_tbf_nid_hash_ops = {
        .hs_hash        = nrs_tbf_nid_hop_hash,
        .hs_keycmp      = nrs_tbf_nid_hop_keycmp,
        .hs_key         = nrs_tbf_nid_hop_key,
-       .hs_object      = nrs_tbf_nid_hop_object,
+       .hs_object      = nrs_tbf_hop_object,
        .hs_get         = nrs_tbf_nid_hop_get,
        .hs_put         = nrs_tbf_nid_hop_put,
        .hs_put_locked  = nrs_tbf_nid_hop_put,
@@ -1116,6 +1161,10 @@ nrs_tbf_nid_startup(struct ptlrpc_nrs_policy *policy,
        start.tc_name = NRS_TBF_DEFAULT_RULE;
        INIT_LIST_HEAD(&start.u.tc_start.ts_nids);
        rc = nrs_tbf_rule_start(policy, head, &start);
+       if (rc) {
+               cfs_hash_putref(head->th_cli_hash);
+               head->th_cli_hash = NULL;
+       }
 
        return rc;
 }
@@ -1230,6 +1279,816 @@ static struct nrs_tbf_ops nrs_tbf_nid_ops = {
        .o_rule_fini = nrs_tbf_nid_rule_fini,
 };
 
+static unsigned nrs_tbf_hop_hash(struct cfs_hash *hs, const void *key,
+                                unsigned mask)
+{
+       return cfs_hash_djb2_hash(key, strlen(key), mask);
+}
+
+static int nrs_tbf_hop_keycmp(const void *key, struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       return (strcmp(cli->tc_key, key) == 0);
+}
+
+static void *nrs_tbf_hop_key(struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+       return cli->tc_key;
+}
+
+static void nrs_tbf_hop_get(struct cfs_hash *hs, struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       atomic_inc(&cli->tc_ref);
+}
+
+static void nrs_tbf_hop_put(struct cfs_hash *hs, struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       atomic_dec(&cli->tc_ref);
+}
+
+static void nrs_tbf_hop_exit(struct cfs_hash *hs, struct hlist_node *hnode)
+
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       LASSERT(atomic_read(&cli->tc_ref) == 0);
+       nrs_tbf_cli_fini(cli);
+}
+
+static struct cfs_hash_ops nrs_tbf_hash_ops = {
+       .hs_hash        = nrs_tbf_hop_hash,
+       .hs_keycmp      = nrs_tbf_hop_keycmp,
+       .hs_key         = nrs_tbf_hop_key,
+       .hs_object      = nrs_tbf_hop_object,
+       .hs_get         = nrs_tbf_hop_get,
+       .hs_put         = nrs_tbf_hop_put,
+       .hs_put_locked  = nrs_tbf_hop_put,
+       .hs_exit        = nrs_tbf_hop_exit,
+};
+
+#define NRS_TBF_GENERIC_BKT_BITS       10
+#define NRS_TBF_GENERIC_HASH_FLAGS     (CFS_HASH_SPIN_BKTLOCK | \
+                                       CFS_HASH_NO_ITEMREF | \
+                                       CFS_HASH_DEPTH)
+
+static int
+nrs_tbf_startup(struct ptlrpc_nrs_policy *policy, struct nrs_tbf_head *head)
+{
+       struct nrs_tbf_cmd       start;
+       struct nrs_tbf_bucket   *bkt;
+       int                      bits;
+       int                      i;
+       int                      rc;
+       struct cfs_hash_bd       bd;
+
+       bits = nrs_tbf_jobid_hash_order();
+       if (bits < NRS_TBF_GENERIC_BKT_BITS)
+               bits = NRS_TBF_GENERIC_BKT_BITS;
+       head->th_cli_hash = cfs_hash_create("nrs_tbf_hash",
+                                           bits, bits,
+                                           NRS_TBF_GENERIC_BKT_BITS,
+                                           sizeof(*bkt), 0, 0,
+                                           &nrs_tbf_hash_ops,
+                                           NRS_TBF_GENERIC_HASH_FLAGS);
+       if (head->th_cli_hash == NULL)
+               return -ENOMEM;
+
+       cfs_hash_for_each_bucket(head->th_cli_hash, &bd, i) {
+               bkt = cfs_hash_bd_extra_get(head->th_cli_hash, &bd);
+               INIT_LIST_HEAD(&bkt->ntb_lru);
+       }
+
+       memset(&start, 0, sizeof(start));
+       start.u.tc_start.ts_conds_str = "*";
+
+       start.u.tc_start.ts_rpc_rate = tbf_rate;
+       start.u.tc_start.ts_rule_flags = NTRS_DEFAULT;
+       start.tc_name = NRS_TBF_DEFAULT_RULE;
+       INIT_LIST_HEAD(&start.u.tc_start.ts_conds);
+       rc = nrs_tbf_rule_start(policy, head, &start);
+       if (rc)
+               cfs_hash_putref(head->th_cli_hash);
+
+       return rc;
+}
+
+static struct nrs_tbf_client *
+nrs_tbf_cli_hash_lookup(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+                       const char *key)
+{
+       struct hlist_node *hnode;
+       struct nrs_tbf_client *cli;
+
+       hnode = cfs_hash_bd_lookup_locked(hs, bd, (void *)key);
+       if (hnode == NULL)
+               return NULL;
+
+       cli = container_of0(hnode, struct nrs_tbf_client, tc_hnode);
+       if (!list_empty(&cli->tc_lru))
+               list_del_init(&cli->tc_lru);
+       return cli;
+}
+
+/**
+ * ONLY opcode presented in this function will be checked in
+ * nrs_tbf_id_cli_set(). That means, we can add or remove an
+ * opcode to enable or disable requests handled in nrs_tbf
+ */
+static struct req_format *req_fmt(__u32 opcode)
+{
+       switch (opcode) {
+       case OST_GETATTR:
+               return &RQF_OST_GETATTR;
+       case OST_SETATTR:
+               return &RQF_OST_SETATTR;
+       case OST_READ:
+               return &RQF_OST_BRW_READ;
+       case OST_WRITE:
+               return &RQF_OST_BRW_WRITE;
+       /* FIXME: OST_CREATE and OST_DESTROY comes from MDS
+        * in most case. Should they be removed? */
+       case OST_CREATE:
+               return &RQF_OST_CREATE;
+       case OST_DESTROY:
+               return &RQF_OST_DESTROY;
+       case OST_PUNCH:
+               return &RQF_OST_PUNCH;
+       case OST_SYNC:
+               return &RQF_OST_SYNC;
+       case OST_LADVISE:
+               return &RQF_OST_LADVISE;
+       case MDS_GETATTR:
+               return &RQF_MDS_GETATTR;
+       case MDS_GETATTR_NAME:
+               return &RQF_MDS_GETATTR_NAME;
+       /* close is skipped to avoid LDLM cancel slowness */
+#if 0
+       case MDS_CLOSE:
+               return &RQF_MDS_CLOSE;
+#endif
+       case MDS_REINT:
+               return &RQF_MDS_REINT;
+       case MDS_READPAGE:
+               return &RQF_MDS_READPAGE;
+       case MDS_GET_ROOT:
+               return &RQF_MDS_GET_ROOT;
+       case MDS_STATFS:
+               return &RQF_MDS_STATFS;
+       case MDS_SYNC:
+               return &RQF_MDS_SYNC;
+       case MDS_QUOTACTL:
+               return &RQF_MDS_QUOTACTL;
+       case MDS_GETXATTR:
+               return &RQF_MDS_GETXATTR;
+       case MDS_GET_INFO:
+               return &RQF_MDS_GET_INFO;
+       /* HSM op is skipped */
+#if 0 
+       case MDS_HSM_STATE_GET:
+               return &RQF_MDS_HSM_STATE_GET;
+       case MDS_HSM_STATE_SET:
+               return &RQF_MDS_HSM_STATE_SET;
+       case MDS_HSM_ACTION:
+               return &RQF_MDS_HSM_ACTION;
+       case MDS_HSM_CT_REGISTER:
+               return &RQF_MDS_HSM_CT_REGISTER;
+       case MDS_HSM_CT_UNREGISTER:
+               return &RQF_MDS_HSM_CT_UNREGISTER;
+#endif
+       case MDS_SWAP_LAYOUTS:
+               return &RQF_MDS_SWAP_LAYOUTS;
+       case LDLM_ENQUEUE:
+               return &RQF_LDLM_ENQUEUE;
+       default:
+               return NULL;
+       }
+}
+
+static struct req_format *intent_req_fmt(__u32 it_opc)
+{
+       if (it_opc & (IT_OPEN | IT_CREAT))
+               return &RQF_LDLM_INTENT_OPEN;
+       else if (it_opc & (IT_GETATTR | IT_LOOKUP))
+               return &RQF_LDLM_INTENT_GETATTR;
+       else if (it_opc & IT_GETXATTR)
+               return &RQF_LDLM_INTENT_GETXATTR;
+       else if (it_opc & (IT_GLIMPSE | IT_BRW))
+               return &RQF_LDLM_INTENT;
+       else
+               return NULL;
+}
+
+static int ost_tbf_id_cli_set(struct ptlrpc_request *req,
+                             struct tbf_id *id)
+{
+       struct ost_body *body;
+
+       body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
+       if (body != NULL) {
+               id->ti_uid = body->oa.o_uid;
+               id->ti_gid = body->oa.o_gid;
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
+static void unpack_ugid_from_mdt_body(struct ptlrpc_request *req,
+                                     struct tbf_id *id)
+{
+       struct mdt_body *b = req_capsule_client_get(&req->rq_pill,
+                                                   &RMF_MDT_BODY);
+       LASSERT(b != NULL);
+
+       /* TODO: nodemaping feature converts {ug}id from individual
+        * clients to the actual ones of the file system. Some work
+        * may be needed to fix this. */
+       id->ti_uid = b->mbo_uid;
+       id->ti_gid = b->mbo_gid;
+}
+
+static void unpack_ugid_from_mdt_rec_reint(struct ptlrpc_request *req,
+                                          struct tbf_id *id)
+{
+       struct mdt_rec_reint *rec;
+
+       rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
+       LASSERT(rec != NULL);
+
+       /* use the fs{ug}id as {ug}id of the process */
+       id->ti_uid = rec->rr_fsuid;
+       id->ti_gid = rec->rr_fsgid;
+}
+
+static int mdt_tbf_id_cli_set(struct ptlrpc_request *req,
+                             struct tbf_id *id)
+{
+       u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+       int rc = 0;
+
+       switch (opc) {
+       case MDS_GETATTR:
+       case MDS_GETATTR_NAME:
+       case MDS_GET_ROOT:
+       case MDS_READPAGE:
+       case MDS_SYNC:
+       case MDS_GETXATTR:
+       case MDS_HSM_STATE_GET ... MDS_SWAP_LAYOUTS:
+               unpack_ugid_from_mdt_body(req, id);
+               break;
+       case MDS_CLOSE:
+       case MDS_REINT:
+               unpack_ugid_from_mdt_rec_reint(req, id);
+               break;
+       default:
+               rc = -EINVAL;
+               break;
+       }
+       return rc;
+}
+
+static int ldlm_tbf_id_cli_set(struct ptlrpc_request *req,
+                             struct tbf_id *id)
+{
+       struct ldlm_intent *lit;
+       struct req_format *fmt;
+
+       if (req->rq_reqmsg->lm_bufcount <= DLM_INTENT_IT_OFF)
+               return -EINVAL;
+
+       req_capsule_extend(&req->rq_pill, &RQF_LDLM_INTENT_BASIC);
+       lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
+       if (lit == NULL)
+               return -EINVAL;
+
+       fmt = intent_req_fmt(lit->opc);
+       if (fmt == NULL)
+               return -EINVAL;
+
+       req_capsule_extend(&req->rq_pill, fmt);
+
+       if (lit->opc & (IT_GETXATTR | IT_GETATTR | IT_LOOKUP))
+               unpack_ugid_from_mdt_body(req, id);
+       else if (lit->opc & (IT_OPEN | IT_OPEN | IT_GLIMPSE | IT_BRW))
+               unpack_ugid_from_mdt_rec_reint(req, id);
+       else
+               return -EINVAL;
+       return 0;
+}
+
+static int nrs_tbf_id_cli_set(struct ptlrpc_request *req, struct tbf_id *id,
+                             enum nrs_tbf_flag ti_type)
+{
+       u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+       struct req_format *fmt = req_fmt(opc);
+       bool fmt_unset = false;
+       int rc;
+
+       memset(id, 0, sizeof(struct tbf_id));
+       id->ti_type = ti_type;
+
+       if (fmt == NULL)
+               return -EINVAL;
+       req_capsule_init(&req->rq_pill, req, RCL_SERVER);
+       if (req->rq_pill.rc_fmt == NULL) {
+               req_capsule_set(&req->rq_pill, fmt);
+               fmt_unset = true;
+       }
+
+       if (opc < OST_LAST_OPC)
+               rc = ost_tbf_id_cli_set(req, id);
+       else if (opc >= MDS_FIRST_OPC && opc < MDS_LAST_OPC)
+               rc = mdt_tbf_id_cli_set(req, id);
+       else if (opc == LDLM_ENQUEUE)
+               rc = ldlm_tbf_id_cli_set(req, id);
+       else
+               rc = -EINVAL;
+
+       /* restore it to the initialized state */
+       if (fmt_unset)
+               req->rq_pill.rc_fmt = NULL;
+       return rc;
+}
+
+static inline void nrs_tbf_cli_gen_key(struct nrs_tbf_client *cli,
+                                      struct ptlrpc_request *req,
+                                      char *keystr, size_t keystr_sz)
+{
+       const char *jobid;
+       u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+       struct tbf_id id;
+
+       nrs_tbf_id_cli_set(req, &id, NRS_TBF_FLAG_UID | NRS_TBF_FLAG_GID);
+       jobid = lustre_msg_get_jobid(req->rq_reqmsg);
+       if (jobid == NULL)
+               jobid = NRS_TBF_JOBID_NULL;
+
+       snprintf(keystr, keystr_sz, "%s_%s_%d_%u_%u", jobid,
+                libcfs_nid2str(req->rq_peer.nid), opc, id.ti_uid,
+                id.ti_gid);
+
+       if (cli) {
+               INIT_LIST_HEAD(&cli->tc_lru);
+               strlcpy(cli->tc_key, keystr, sizeof(cli->tc_key));
+               strlcpy(cli->tc_jobid, jobid, sizeof(cli->tc_jobid));
+               cli->tc_nid = req->rq_peer.nid;
+               cli->tc_opcode = opc;
+               cli->tc_id = id;
+       }
+}
+
+static struct nrs_tbf_client *
+nrs_tbf_cli_find(struct nrs_tbf_head *head, struct ptlrpc_request *req)
+{
+       struct nrs_tbf_client *cli;
+       struct cfs_hash *hs = head->th_cli_hash;
+       struct cfs_hash_bd bd;
+       char keystr[NRS_TBF_KEY_LEN];
+
+       nrs_tbf_cli_gen_key(NULL, req, keystr, sizeof(keystr));
+       cfs_hash_bd_get_and_lock(hs, (void *)keystr, &bd, 1);
+       cli = nrs_tbf_cli_hash_lookup(hs, &bd, keystr);
+       cfs_hash_bd_unlock(hs, &bd, 1);
+
+       return cli;
+}
+
+static struct nrs_tbf_client *
+nrs_tbf_cli_findadd(struct nrs_tbf_head *head,
+                   struct nrs_tbf_client *cli)
+{
+       const char              *key;
+       struct nrs_tbf_client   *ret;
+       struct cfs_hash         *hs = head->th_cli_hash;
+       struct cfs_hash_bd       bd;
+
+       key = cli->tc_key;
+       cfs_hash_bd_get_and_lock(hs, (void *)key, &bd, 1);
+       ret = nrs_tbf_cli_hash_lookup(hs, &bd, key);
+       if (ret == NULL) {
+               cfs_hash_bd_add_locked(hs, &bd, &cli->tc_hnode);
+               ret = cli;
+       }
+       cfs_hash_bd_unlock(hs, &bd, 1);
+
+       return ret;
+}
+
+static void
+nrs_tbf_cli_put(struct nrs_tbf_head *head, struct nrs_tbf_client *cli)
+{
+       struct cfs_hash_bd       bd;
+       struct cfs_hash         *hs = head->th_cli_hash;
+       struct nrs_tbf_bucket   *bkt;
+       int                      hw;
+       struct list_head         zombies;
+
+       INIT_LIST_HEAD(&zombies);
+       cfs_hash_bd_get(hs, &cli->tc_key, &bd);
+       bkt = cfs_hash_bd_extra_get(hs, &bd);
+       if (!cfs_hash_bd_dec_and_lock(hs, &bd, &cli->tc_ref))
+               return;
+       LASSERT(list_empty(&cli->tc_lru));
+       list_add_tail(&cli->tc_lru, &bkt->ntb_lru);
+
+       /**
+        * Check and purge the LRU, there is at least one client in the LRU.
+        */
+       hw = tbf_jobid_cache_size >> (hs->hs_cur_bits - hs->hs_bkt_bits);
+       while (cfs_hash_bd_count_get(&bd) > hw) {
+               if (unlikely(list_empty(&bkt->ntb_lru)))
+                       break;
+               cli = list_entry(bkt->ntb_lru.next,
+                                struct nrs_tbf_client,
+                                tc_lru);
+               LASSERT(atomic_read(&cli->tc_ref) == 0);
+               cfs_hash_bd_del_locked(hs, &bd, &cli->tc_hnode);
+               list_move(&cli->tc_lru, &zombies);
+       }
+       cfs_hash_bd_unlock(head->th_cli_hash, &bd, 1);
+
+       while (!list_empty(&zombies)) {
+               cli = container_of0(zombies.next,
+                                   struct nrs_tbf_client, tc_lru);
+               list_del_init(&cli->tc_lru);
+               nrs_tbf_cli_fini(cli);
+       }
+}
+
+static void
+nrs_tbf_generic_cli_init(struct nrs_tbf_client *cli,
+                        struct ptlrpc_request *req)
+{
+       char keystr[NRS_TBF_KEY_LEN];
+
+       nrs_tbf_cli_gen_key(cli, req, keystr, sizeof(keystr));
+}
+
+static void
+nrs_tbf_id_list_free(struct list_head *uid_list)
+{
+       struct nrs_tbf_id *nti_id, *n;
+
+       list_for_each_entry_safe(nti_id, n, uid_list, nti_linkage) {
+               list_del_init(&nti_id->nti_linkage);
+               OBD_FREE_PTR(nti_id);
+       }
+}
+
+static void
+nrs_tbf_expression_free(struct nrs_tbf_expression *expr)
+{
+       LASSERT(expr->te_field >= NRS_TBF_FIELD_NID &&
+               expr->te_field < NRS_TBF_FIELD_MAX);
+       switch (expr->te_field) {
+       case NRS_TBF_FIELD_NID:
+               cfs_free_nidlist(&expr->te_cond);
+               break;
+       case NRS_TBF_FIELD_JOBID:
+               nrs_tbf_jobid_list_free(&expr->te_cond);
+               break;
+       case NRS_TBF_FIELD_OPCODE:
+               CFS_FREE_BITMAP(expr->te_opcodes);
+               break;
+       case NRS_TBF_FIELD_UID:
+       case NRS_TBF_FIELD_GID:
+               nrs_tbf_id_list_free(&expr->te_cond);
+               break;
+       default:
+               LBUG();
+       }
+       OBD_FREE_PTR(expr);
+}
+
+static void
+nrs_tbf_conjunction_free(struct nrs_tbf_conjunction *conjunction)
+{
+       struct nrs_tbf_expression *expression;
+       struct nrs_tbf_expression *n;
+
+       LASSERT(list_empty(&conjunction->tc_linkage));
+       list_for_each_entry_safe(expression, n,
+                                &conjunction->tc_expressions,
+                                te_linkage) {
+               list_del_init(&expression->te_linkage);
+               nrs_tbf_expression_free(expression);
+       }
+       OBD_FREE_PTR(conjunction);
+}
+
+static void
+nrs_tbf_conds_free(struct list_head *cond_list)
+{
+       struct nrs_tbf_conjunction *conjunction;
+       struct nrs_tbf_conjunction *n;
+
+       list_for_each_entry_safe(conjunction, n, cond_list, tc_linkage) {
+               list_del_init(&conjunction->tc_linkage);
+               nrs_tbf_conjunction_free(conjunction);
+       }
+}
+
+static void
+nrs_tbf_generic_cmd_fini(struct nrs_tbf_cmd *cmd)
+{
+       if (!list_empty(&cmd->u.tc_start.ts_conds))
+               nrs_tbf_conds_free(&cmd->u.tc_start.ts_conds);
+       if (cmd->u.tc_start.ts_conds_str)
+               OBD_FREE(cmd->u.tc_start.ts_conds_str,
+                        strlen(cmd->u.tc_start.ts_conds_str) + 1);
+}
+
+#define NRS_TBF_DISJUNCTION_DELIM      (',')
+#define NRS_TBF_CONJUNCTION_DELIM      ('&')
+#define NRS_TBF_EXPRESSION_DELIM       ('=')
+
+static inline bool
+nrs_tbf_check_field(struct cfs_lstr *field, char *str)
+{
+       int len = strlen(str);
+
+       return (field->ls_len == len &&
+               strncmp(field->ls_str, str, len) == 0);
+}
+
+static int
+nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap **bitmaptr);
+static int
+nrs_tbf_id_list_parse(char *str, int len, struct list_head *id_list,
+                     enum nrs_tbf_flag tif);
+
+static int
+nrs_tbf_expression_parse(struct cfs_lstr *src, struct list_head *cond_list)
+{
+       struct nrs_tbf_expression *expr;
+       struct cfs_lstr field;
+       int rc = 0;
+
+       OBD_ALLOC_PTR(expr);
+       if (expr == NULL)
+               return -ENOMEM;
+
+       rc = cfs_gettok(src, NRS_TBF_EXPRESSION_DELIM, &field);
+       if (rc == 0 || src->ls_len <= 2 || src->ls_str[0] != '{' ||
+           src->ls_str[src->ls_len - 1] != '}')
+               GOTO(out, rc = -EINVAL);
+
+       /* Skip '{' and '}' */
+       src->ls_str++;
+       src->ls_len -= 2;
+
+       if (nrs_tbf_check_field(&field, "nid")) {
+               if (cfs_parse_nidlist(src->ls_str,
+                                     src->ls_len,
+                                     &expr->te_cond) <= 0)
+                       GOTO(out, rc = -EINVAL);
+               expr->te_field = NRS_TBF_FIELD_NID;
+       } else if (nrs_tbf_check_field(&field, "jobid")) {
+               if (nrs_tbf_jobid_list_parse(src->ls_str,
+                                            src->ls_len,
+                                            &expr->te_cond) < 0)
+                       GOTO(out, rc = -EINVAL);
+               expr->te_field = NRS_TBF_FIELD_JOBID;
+       } else if (nrs_tbf_check_field(&field, "opcode")) {
+               if (nrs_tbf_opcode_list_parse(src->ls_str,
+                                             src->ls_len,
+                                             &expr->te_opcodes) < 0)
+                       GOTO(out, rc = -EINVAL);
+               expr->te_field = NRS_TBF_FIELD_OPCODE;
+       } else if (nrs_tbf_check_field(&field, "uid")) {
+               if (nrs_tbf_id_list_parse(src->ls_str,
+                                         src->ls_len,
+                                         &expr->te_cond,
+                                         NRS_TBF_FLAG_UID) < 0)
+                       GOTO(out, rc = -EINVAL);
+               expr->te_field = NRS_TBF_FIELD_UID;
+       } else if (nrs_tbf_check_field(&field, "gid")) {
+               if (nrs_tbf_id_list_parse(src->ls_str,
+                                         src->ls_len,
+                                         &expr->te_cond,
+                                         NRS_TBF_FLAG_GID) < 0)
+                       GOTO(out, rc = -EINVAL);
+               expr->te_field = NRS_TBF_FIELD_GID;
+       } else {
+               GOTO(out, rc = -EINVAL);
+       }
+
+       list_add_tail(&expr->te_linkage, cond_list);
+       return 0;
+out:
+       OBD_FREE_PTR(expr);
+       return rc;
+}
+
+static int
+nrs_tbf_conjunction_parse(struct cfs_lstr *src, struct list_head *cond_list)
+{
+       struct nrs_tbf_conjunction *conjunction;
+       struct cfs_lstr expr;
+       int rc = 0;
+
+       OBD_ALLOC_PTR(conjunction);
+       if (conjunction == NULL)
+               return -ENOMEM;
+
+       INIT_LIST_HEAD(&conjunction->tc_expressions);
+       list_add_tail(&conjunction->tc_linkage, cond_list);
+
+       while (src->ls_str) {
+               rc = cfs_gettok(src, NRS_TBF_CONJUNCTION_DELIM, &expr);
+               if (rc == 0) {
+                       rc = -EINVAL;
+                       break;
+               }
+               rc = nrs_tbf_expression_parse(&expr,
+                                             &conjunction->tc_expressions);
+               if (rc)
+                       break;
+       }
+       return rc;
+}
+
+static int
+nrs_tbf_conds_parse(char *str, int len, struct list_head *cond_list)
+{
+       struct cfs_lstr src;
+       struct cfs_lstr res;
+       int rc = 0;
+
+       src.ls_str = str;
+       src.ls_len = len;
+       INIT_LIST_HEAD(cond_list);
+       while (src.ls_str) {
+               rc = cfs_gettok(&src, NRS_TBF_DISJUNCTION_DELIM, &res);
+               if (rc == 0) {
+                       rc = -EINVAL;
+                       break;
+               }
+               rc = nrs_tbf_conjunction_parse(&res, cond_list);
+               if (rc)
+                       break;
+       }
+       return rc;
+}
+
+static int
+nrs_tbf_generic_parse(struct nrs_tbf_cmd *cmd, const char *id)
+{
+       int rc;
+
+       OBD_ALLOC(cmd->u.tc_start.ts_conds_str, strlen(id) + 1);
+       if (cmd->u.tc_start.ts_conds_str == NULL)
+               return -ENOMEM;
+
+       memcpy(cmd->u.tc_start.ts_conds_str, id, strlen(id));
+
+       /* Parse hybird NID and JOBID conditions */
+       rc = nrs_tbf_conds_parse(cmd->u.tc_start.ts_conds_str,
+                                strlen(cmd->u.tc_start.ts_conds_str),
+                                &cmd->u.tc_start.ts_conds);
+       if (rc)
+               nrs_tbf_generic_cmd_fini(cmd);
+
+       return rc;
+}
+
+static int
+nrs_tbf_id_list_match(struct list_head *id_list, struct tbf_id id);
+
+static int
+nrs_tbf_expression_match(struct nrs_tbf_expression *expr,
+                        struct nrs_tbf_rule *rule,
+                        struct nrs_tbf_client *cli)
+{
+       switch (expr->te_field) {
+       case NRS_TBF_FIELD_NID:
+               return cfs_match_nid(cli->tc_nid, &expr->te_cond);
+       case NRS_TBF_FIELD_JOBID:
+               return nrs_tbf_jobid_list_match(&expr->te_cond, cli->tc_jobid);
+       case NRS_TBF_FIELD_OPCODE:
+               return cfs_bitmap_check(expr->te_opcodes, cli->tc_opcode);
+       case NRS_TBF_FIELD_UID:
+       case NRS_TBF_FIELD_GID:
+               return nrs_tbf_id_list_match(&expr->te_cond, cli->tc_id);
+       default:
+               return 0;
+       }
+}
+
+static int
+nrs_tbf_conjunction_match(struct nrs_tbf_conjunction *conjunction,
+                         struct nrs_tbf_rule *rule,
+                         struct nrs_tbf_client *cli)
+{
+       struct nrs_tbf_expression *expr;
+       int matched;
+
+       list_for_each_entry(expr, &conjunction->tc_expressions, te_linkage) {
+               matched = nrs_tbf_expression_match(expr, rule, cli);
+               if (!matched)
+                       return 0;
+       }
+
+       return 1;
+}
+
+static int
+nrs_tbf_cond_match(struct nrs_tbf_rule *rule, struct nrs_tbf_client *cli)
+{
+       struct nrs_tbf_conjunction *conjunction;
+       int matched;
+
+       list_for_each_entry(conjunction, &rule->tr_conds, tc_linkage) {
+               matched = nrs_tbf_conjunction_match(conjunction, rule, cli);
+               if (matched)
+                       return 1;
+       }
+
+       return 0;
+}
+
+static void
+nrs_tbf_generic_rule_fini(struct nrs_tbf_rule *rule)
+{
+       if (!list_empty(&rule->tr_conds))
+               nrs_tbf_conds_free(&rule->tr_conds);
+       LASSERT(rule->tr_conds_str != NULL);
+       OBD_FREE(rule->tr_conds_str, strlen(rule->tr_conds_str) + 1);
+}
+
+static int
+nrs_tbf_rule_init(struct ptlrpc_nrs_policy *policy,
+                 struct nrs_tbf_rule *rule, struct nrs_tbf_cmd *start)
+{
+       int rc = 0;
+
+       LASSERT(start->u.tc_start.ts_conds_str);
+       OBD_ALLOC(rule->tr_conds_str,
+                 strlen(start->u.tc_start.ts_conds_str) + 1);
+       if (rule->tr_conds_str == NULL)
+               return -ENOMEM;
+
+       memcpy(rule->tr_conds_str,
+              start->u.tc_start.ts_conds_str,
+              strlen(start->u.tc_start.ts_conds_str));
+
+       INIT_LIST_HEAD(&rule->tr_conds);
+       if (!list_empty(&start->u.tc_start.ts_conds)) {
+               rc = nrs_tbf_conds_parse(rule->tr_conds_str,
+                                        strlen(rule->tr_conds_str),
+                                        &rule->tr_conds);
+       }
+       if (rc)
+               nrs_tbf_generic_rule_fini(rule);
+
+       return rc;
+}
+
+static int
+nrs_tbf_generic_rule_dump(struct nrs_tbf_rule *rule, struct seq_file *m)
+{
+       seq_printf(m, "%s %s %llu, ref %d\n", rule->tr_name,
+                  rule->tr_conds_str, rule->tr_rpc_rate,
+                  atomic_read(&rule->tr_ref) - 1);
+       return 0;
+}
+
+static int
+nrs_tbf_generic_rule_match(struct nrs_tbf_rule *rule,
+                          struct nrs_tbf_client *cli)
+{
+       return nrs_tbf_cond_match(rule, cli);
+}
+
+static struct nrs_tbf_ops nrs_tbf_generic_ops = {
+       .o_name = NRS_TBF_TYPE_GENERIC,
+       .o_startup = nrs_tbf_startup,
+       .o_cli_find = nrs_tbf_cli_find,
+       .o_cli_findadd = nrs_tbf_cli_findadd,
+       .o_cli_put = nrs_tbf_cli_put,
+       .o_cli_init = nrs_tbf_generic_cli_init,
+       .o_rule_init = nrs_tbf_rule_init,
+       .o_rule_dump = nrs_tbf_generic_rule_dump,
+       .o_rule_match = nrs_tbf_generic_rule_match,
+       .o_rule_fini = nrs_tbf_generic_rule_fini,
+};
+
 static void nrs_tbf_opcode_rule_fini(struct nrs_tbf_rule *rule)
 {
        if (rule->tr_opcodes != NULL)
@@ -1260,13 +2119,8 @@ static void *nrs_tbf_opcode_hop_key(struct hlist_node *hnode)
        struct nrs_tbf_client *cli = hlist_entry(hnode,
                                                 struct nrs_tbf_client,
                                                 tc_hnode);
-
-       return &cli->tc_opcode;
-}
-
-static void *nrs_tbf_opcode_hop_object(struct hlist_node *hnode)
-{
-       return hlist_entry(hnode, struct nrs_tbf_client, tc_hnode);
+
+       return &cli->tc_opcode;
 }
 
 static void nrs_tbf_opcode_hop_get(struct cfs_hash *hs,
@@ -1307,7 +2161,7 @@ static struct cfs_hash_ops nrs_tbf_opcode_hash_ops = {
        .hs_hash        = nrs_tbf_opcode_hop_hash,
        .hs_keycmp      = nrs_tbf_opcode_hop_keycmp,
        .hs_key         = nrs_tbf_opcode_hop_key,
-       .hs_object      = nrs_tbf_opcode_hop_object,
+       .hs_object      = nrs_tbf_hop_object,
        .hs_get         = nrs_tbf_opcode_hop_get,
        .hs_put         = nrs_tbf_opcode_hop_put,
        .hs_put_locked  = nrs_tbf_opcode_hop_put,
@@ -1390,14 +2244,18 @@ nrs_tbf_opcode_set_bit(const struct cfs_lstr *id, struct cfs_bitmap *opcodes)
 }
 
 static int
-nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap *opcodes)
+nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap **bitmaptr)
 {
+       struct cfs_bitmap *opcodes;
        struct cfs_lstr src;
        struct cfs_lstr res;
        int rc = 0;
-
        ENTRY;
 
+       opcodes = CFS_ALLOCATE_BITMAP(LUSTRE_MAX_OPCODES);
+       if (opcodes == NULL)
+               return -ENOMEM;
+
        src.ls_str = str;
        src.ls_len = len;
        while (src.ls_str) {
@@ -1411,6 +2269,11 @@ nrs_tbf_opcode_list_parse(char *str, int len, struct cfs_bitmap *opcodes)
                        break;
        }
 
+       if (rc == 0)
+               *bitmaptr = opcodes;
+       else
+               CFS_FREE_BITMAP(opcodes);
+
        RETURN(rc);
 }
 
@@ -1430,28 +2293,23 @@ static int nrs_tbf_opcode_parse(struct nrs_tbf_cmd *cmd, char *id)
        struct cfs_lstr src;
        int rc;
 
-       cmd->u.tc_start.ts_opcodes = CFS_ALLOCATE_BITMAP(LUSTRE_MAX_OPCODES);
-       if (cmd->u.tc_start.ts_opcodes == NULL)
-               return -ENOMEM;
-
        src.ls_str = id;
        src.ls_len = strlen(id);
        rc = nrs_tbf_check_id_value(&src, "opcode");
        if (rc)
-               GOTO(out, rc);
+               return rc;
 
        OBD_ALLOC(cmd->u.tc_start.ts_opcodes_str, src.ls_len + 1);
        if (cmd->u.tc_start.ts_opcodes_str == NULL)
-               GOTO(out, rc = -ENOMEM);
+               return -ENOMEM;
 
        memcpy(cmd->u.tc_start.ts_opcodes_str, src.ls_str, src.ls_len);
 
        /* parse opcode list */
        rc = nrs_tbf_opcode_list_parse(cmd->u.tc_start.ts_opcodes_str,
                                       strlen(cmd->u.tc_start.ts_opcodes_str),
-                                      cmd->u.tc_start.ts_opcodes);
-out:
-       if (rc != 0)
+                                      &cmd->u.tc_start.ts_opcodes);
+       if (rc)
                nrs_tbf_opcode_cmd_fini(cmd);
 
        return rc;
@@ -1471,6 +2329,8 @@ static int nrs_tbf_opcode_rule_init(struct ptlrpc_nrs_policy *policy,
                                    struct nrs_tbf_rule *rule,
                                    struct nrs_tbf_cmd *start)
 {
+       int rc = 0;
+
        LASSERT(start->u.tc_start.ts_opcodes_str != NULL);
        OBD_ALLOC(rule->tr_opcodes_str,
                  strlen(start->u.tc_start.ts_opcodes_str) + 1);
@@ -1480,19 +2340,18 @@ static int nrs_tbf_opcode_rule_init(struct ptlrpc_nrs_policy *policy,
        strncpy(rule->tr_opcodes_str, start->u.tc_start.ts_opcodes_str,
                strlen(start->u.tc_start.ts_opcodes_str) + 1);
 
+       /* Default rule '*' */
        if (start->u.tc_start.ts_opcodes == NULL)
                return 0;
 
-       rule->tr_opcodes = CFS_ALLOCATE_BITMAP(LUSTRE_MAX_OPCODES);
-       if (rule->tr_opcodes == NULL) {
+       rc = nrs_tbf_opcode_list_parse(rule->tr_opcodes_str,
+                                      strlen(rule->tr_opcodes_str),
+                                      &rule->tr_opcodes);
+       if (rc)
                OBD_FREE(rule->tr_opcodes_str,
                         strlen(start->u.tc_start.ts_opcodes_str) + 1);
-               return -ENOMEM;
-       }
 
-       cfs_bitmap_copy(rule->tr_opcodes, start->u.tc_start.ts_opcodes);
-
-       return 0;
+       return rc;
 }
 
 static int
@@ -1518,6 +2377,340 @@ struct nrs_tbf_ops nrs_tbf_opcode_ops = {
        .o_rule_fini = nrs_tbf_opcode_rule_fini,
 };
 
+static unsigned nrs_tbf_id_hop_hash(struct cfs_hash *hs, const void *key,
+                                   unsigned mask)
+{
+       return cfs_hash_djb2_hash(key, sizeof(struct tbf_id), mask);
+}
+
+static int nrs_tbf_id_hop_keycmp(const void *key, struct hlist_node *hnode)
+{
+       const struct tbf_id *opc = key;
+       enum nrs_tbf_flag ntf;
+       struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client,
+                                                tc_hnode);
+       ntf = opc->ti_type & cli->tc_id.ti_type;
+       if ((ntf & NRS_TBF_FLAG_UID) && opc->ti_uid != cli->tc_id.ti_uid)
+               return 0;
+
+       if ((ntf & NRS_TBF_FLAG_GID) && opc->ti_gid != cli->tc_id.ti_gid)
+               return 0;
+
+       return 1;
+}
+
+static void *nrs_tbf_id_hop_key(struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+       return &cli->tc_id;
+}
+
+static void nrs_tbf_id_hop_get(struct cfs_hash *hs, struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       atomic_inc(&cli->tc_ref);
+}
+
+static void nrs_tbf_id_hop_put(struct cfs_hash *hs, struct hlist_node *hnode)
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       atomic_dec(&cli->tc_ref);
+}
+
+static void
+nrs_tbf_id_hop_exit(struct cfs_hash *hs, struct hlist_node *hnode)
+
+{
+       struct nrs_tbf_client *cli = hlist_entry(hnode,
+                                                struct nrs_tbf_client,
+                                                tc_hnode);
+
+       LASSERT(atomic_read(&cli->tc_ref) == 0);
+       nrs_tbf_cli_fini(cli);
+}
+
+static struct cfs_hash_ops nrs_tbf_id_hash_ops = {
+       .hs_hash        = nrs_tbf_id_hop_hash,
+       .hs_keycmp      = nrs_tbf_id_hop_keycmp,
+       .hs_key         = nrs_tbf_id_hop_key,
+       .hs_object      = nrs_tbf_hop_object,
+       .hs_get         = nrs_tbf_id_hop_get,
+       .hs_put         = nrs_tbf_id_hop_put,
+       .hs_put_locked  = nrs_tbf_id_hop_put,
+       .hs_exit        = nrs_tbf_id_hop_exit,
+};
+
+static int
+nrs_tbf_id_startup(struct ptlrpc_nrs_policy *policy,
+                  struct nrs_tbf_head *head)
+{
+       struct nrs_tbf_cmd start;
+       int rc;
+
+       head->th_cli_hash = cfs_hash_create("nrs_tbf_id_hash",
+                                           NRS_TBF_NID_BITS,
+                                           NRS_TBF_NID_BITS,
+                                           NRS_TBF_NID_BKT_BITS, 0,
+                                           CFS_HASH_MIN_THETA,
+                                           CFS_HASH_MAX_THETA,
+                                           &nrs_tbf_id_hash_ops,
+                                           CFS_HASH_RW_BKTLOCK);
+       if (head->th_cli_hash == NULL)
+               return -ENOMEM;
+
+       memset(&start, 0, sizeof(start));
+       start.u.tc_start.ts_ids_str = "*";
+       start.u.tc_start.ts_rpc_rate = tbf_rate;
+       start.u.tc_start.ts_rule_flags = NTRS_DEFAULT;
+       start.tc_name = NRS_TBF_DEFAULT_RULE;
+       INIT_LIST_HEAD(&start.u.tc_start.ts_ids);
+       rc = nrs_tbf_rule_start(policy, head, &start);
+       if (rc) {
+               cfs_hash_putref(head->th_cli_hash);
+               head->th_cli_hash = NULL;
+       }
+
+       return rc;
+}
+
+static struct nrs_tbf_client *
+nrs_tbf_id_cli_find(struct nrs_tbf_head *head,
+                   struct ptlrpc_request *req)
+{
+       struct tbf_id id;
+
+       LASSERT(head->th_type_flag == NRS_TBF_FLAG_UID ||
+               head->th_type_flag == NRS_TBF_FLAG_GID);
+
+       nrs_tbf_id_cli_set(req, &id, head->th_type_flag);
+       return cfs_hash_lookup(head->th_cli_hash, &id);
+}
+
+static struct nrs_tbf_client *
+nrs_tbf_id_cli_findadd(struct nrs_tbf_head *head,
+                      struct nrs_tbf_client *cli)
+{
+       return cfs_hash_findadd_unique(head->th_cli_hash, &cli->tc_id,
+                                      &cli->tc_hnode);
+}
+
+static void
+nrs_tbf_uid_cli_init(struct nrs_tbf_client *cli,
+                    struct ptlrpc_request *req)
+{
+       nrs_tbf_id_cli_set(req, &cli->tc_id, NRS_TBF_FLAG_UID);
+}
+
+static void
+nrs_tbf_gid_cli_init(struct nrs_tbf_client *cli,
+                    struct ptlrpc_request *req)
+{
+       nrs_tbf_id_cli_set(req, &cli->tc_id, NRS_TBF_FLAG_GID);
+}
+
+static int
+nrs_tbf_id_list_match(struct list_head *id_list, struct tbf_id id)
+{
+       struct nrs_tbf_id *nti_id;
+       enum nrs_tbf_flag flag;
+
+       list_for_each_entry(nti_id, id_list, nti_linkage) {
+               flag = id.ti_type & nti_id->nti_id.ti_type;
+               if (!flag)
+                       continue;
+
+               if ((flag & NRS_TBF_FLAG_UID) &&
+                   (id.ti_uid != nti_id->nti_id.ti_uid))
+                       continue;
+
+               if ((flag & NRS_TBF_FLAG_GID) &&
+                   (id.ti_gid != nti_id->nti_id.ti_gid))
+                       continue;
+
+               return 1;
+       }
+       return 0;
+}
+
+static int
+nrs_tbf_id_rule_match(struct nrs_tbf_rule *rule,
+                     struct nrs_tbf_client *cli)
+{
+       return nrs_tbf_id_list_match(&rule->tr_ids, cli->tc_id);
+}
+
+static void nrs_tbf_id_cmd_fini(struct nrs_tbf_cmd *cmd)
+{
+       nrs_tbf_id_list_free(&cmd->u.tc_start.ts_ids);
+
+       if (cmd->u.tc_start.ts_ids_str)
+               OBD_FREE(cmd->u.tc_start.ts_ids_str,
+                        strlen(cmd->u.tc_start.ts_ids_str) + 1);
+}
+
+static int
+nrs_tbf_id_list_parse(char *str, int len, struct list_head *id_list,
+                     enum nrs_tbf_flag tif)
+{
+       struct cfs_lstr src;
+       struct cfs_lstr res;
+       int rc = 0;
+       struct tbf_id id = { 0 };
+       ENTRY;
+
+       if (tif != NRS_TBF_FLAG_UID && tif != NRS_TBF_FLAG_GID)
+               RETURN(-EINVAL);
+
+       src.ls_str = str;
+       src.ls_len = len;
+       INIT_LIST_HEAD(id_list);
+       while (src.ls_str) {
+               struct nrs_tbf_id *nti_id;
+
+               if (cfs_gettok(&src, ' ', &res) == 0)
+                       GOTO(out, rc = -EINVAL);
+
+               id.ti_type = tif;
+               if (tif == NRS_TBF_FLAG_UID) {
+                       if (!cfs_str2num_check(res.ls_str, res.ls_len,
+                                              &id.ti_uid, 0, (u32)~0U))
+                               GOTO(out, rc = -EINVAL);
+               } else {
+                       if (!cfs_str2num_check(res.ls_str, res.ls_len,
+                                              &id.ti_gid, 0, (u32)~0U))
+                               GOTO(out, rc = -EINVAL);
+               }
+
+               OBD_ALLOC_PTR(nti_id);
+               if (nti_id == NULL)
+                       GOTO(out, rc = -ENOMEM);
+
+               nti_id->nti_id = id;
+               list_add_tail(&nti_id->nti_linkage, id_list);
+       }
+out:
+       if (rc)
+               nrs_tbf_id_list_free(id_list);
+       RETURN(rc);
+}
+
+static int nrs_tbf_ug_id_parse(struct nrs_tbf_cmd *cmd, char *id)
+{
+       struct cfs_lstr src;
+       int rc;
+       enum nrs_tbf_flag tif;
+
+       tif = cmd->u.tc_start.ts_valid_type;
+
+       src.ls_str = id;
+       src.ls_len = strlen(id);
+
+       rc = nrs_tbf_check_id_value(&src,
+                                   tif == NRS_TBF_FLAG_UID ? "uid" : "gid");
+       if (rc)
+               return rc;
+
+       OBD_ALLOC(cmd->u.tc_start.ts_ids_str, src.ls_len + 1);
+       if (cmd->u.tc_start.ts_ids_str == NULL)
+               return -ENOMEM;
+
+       strlcpy(cmd->u.tc_start.ts_ids_str, src.ls_str, src.ls_len + 1);
+
+       rc = nrs_tbf_id_list_parse(cmd->u.tc_start.ts_ids_str,
+                                  strlen(cmd->u.tc_start.ts_ids_str),
+                                  &cmd->u.tc_start.ts_ids, tif);
+       if (rc)
+               nrs_tbf_id_cmd_fini(cmd);
+
+       return rc;
+}
+
+static int
+nrs_tbf_id_rule_init(struct ptlrpc_nrs_policy *policy,
+                    struct nrs_tbf_rule *rule,
+                    struct nrs_tbf_cmd *start)
+{
+       struct nrs_tbf_head *head = rule->tr_head;
+       int rc = 0;
+       enum nrs_tbf_flag tif = head->th_type_flag;
+       int ids_len = strlen(start->u.tc_start.ts_ids_str) + 1;
+
+       LASSERT(start->u.tc_start.ts_ids_str);
+       INIT_LIST_HEAD(&rule->tr_ids);
+
+       OBD_ALLOC(rule->tr_ids_str, ids_len);
+       if (rule->tr_ids_str == NULL)
+               return -ENOMEM;
+
+       strlcpy(rule->tr_ids_str, start->u.tc_start.ts_ids_str,
+               ids_len);
+
+       if (!list_empty(&start->u.tc_start.ts_ids)) {
+               rc = nrs_tbf_id_list_parse(rule->tr_ids_str,
+                                          strlen(rule->tr_ids_str),
+                                          &rule->tr_ids, tif);
+               if (rc)
+                       CERROR("%ss {%s} illegal\n",
+                              tif == NRS_TBF_FLAG_UID ? "uid" : "gid",
+                              rule->tr_ids_str);
+       }
+       if (rc) {
+               OBD_FREE(rule->tr_ids_str, ids_len);
+               rule->tr_ids_str = NULL;
+       }
+       return rc;
+}
+
+static int
+nrs_tbf_id_rule_dump(struct nrs_tbf_rule *rule, struct seq_file *m)
+{
+       seq_printf(m, "%s {%s} %llu, ref %d\n", rule->tr_name,
+                  rule->tr_ids_str, rule->tr_rpc_rate,
+                  atomic_read(&rule->tr_ref) - 1);
+       return 0;
+}
+
+static void nrs_tbf_id_rule_fini(struct nrs_tbf_rule *rule)
+{
+       nrs_tbf_id_list_free(&rule->tr_ids);
+       if (rule->tr_ids_str != NULL)
+               OBD_FREE(rule->tr_ids_str, strlen(rule->tr_ids_str) + 1);
+}
+
+struct nrs_tbf_ops nrs_tbf_uid_ops = {
+       .o_name = NRS_TBF_TYPE_UID,
+       .o_startup = nrs_tbf_id_startup,
+       .o_cli_find = nrs_tbf_id_cli_find,
+       .o_cli_findadd = nrs_tbf_id_cli_findadd,
+       .o_cli_put = nrs_tbf_nid_cli_put,
+       .o_cli_init = nrs_tbf_uid_cli_init,
+       .o_rule_init = nrs_tbf_id_rule_init,
+       .o_rule_dump = nrs_tbf_id_rule_dump,
+       .o_rule_match = nrs_tbf_id_rule_match,
+       .o_rule_fini = nrs_tbf_id_rule_fini,
+};
+
+struct nrs_tbf_ops nrs_tbf_gid_ops = {
+       .o_name = NRS_TBF_TYPE_GID,
+       .o_startup = nrs_tbf_id_startup,
+       .o_cli_find = nrs_tbf_id_cli_find,
+       .o_cli_findadd = nrs_tbf_id_cli_findadd,
+       .o_cli_put = nrs_tbf_nid_cli_put,
+       .o_cli_init = nrs_tbf_gid_cli_init,
+       .o_rule_init = nrs_tbf_id_rule_init,
+       .o_rule_dump = nrs_tbf_id_rule_dump,
+       .o_rule_match = nrs_tbf_id_rule_match,
+       .o_rule_fini = nrs_tbf_id_rule_fini,
+};
+
 static struct nrs_tbf_type nrs_tbf_types[] = {
        {
                .ntt_name = NRS_TBF_TYPE_JOBID,
@@ -1534,6 +2727,21 @@ static struct nrs_tbf_type nrs_tbf_types[] = {
                .ntt_flag = NRS_TBF_FLAG_OPCODE,
                .ntt_ops = &nrs_tbf_opcode_ops,
        },
+       {
+               .ntt_name = NRS_TBF_TYPE_GENERIC,
+               .ntt_flag = NRS_TBF_FLAG_GENERIC,
+               .ntt_ops = &nrs_tbf_generic_ops,
+       },
+       {
+               .ntt_name = NRS_TBF_TYPE_UID,
+               .ntt_flag = NRS_TBF_FLAG_UID,
+               .ntt_ops = &nrs_tbf_uid_ops,
+       },
+       {
+               .ntt_name = NRS_TBF_TYPE_GID,
+               .ntt_flag = NRS_TBF_FLAG_GID,
+               .ntt_ops = &nrs_tbf_gid_ops,
+       },
 };
 
 /**
@@ -1554,15 +2762,20 @@ static int nrs_tbf_start(struct ptlrpc_nrs_policy *policy, char *arg)
        struct nrs_tbf_head     *head;
        struct nrs_tbf_ops      *ops;
        __u32                    type;
+       char                    *name;
        int found = 0;
        int i;
        int rc = 0;
 
-       if (arg == NULL || strlen(arg) > NRS_TBF_TYPE_MAX_LEN)
+       if (arg == NULL)
+               name = NRS_TBF_TYPE_GENERIC;
+       else if (strlen(arg) < NRS_TBF_TYPE_MAX_LEN)
+               name = arg;
+       else
                GOTO(out, rc = -EINVAL);
 
        for (i = 0; i < ARRAY_SIZE(nrs_tbf_types); i++) {
-               if (strcmp(arg, nrs_tbf_types[i].ntt_name) == 0) {
+               if (strcmp(name, nrs_tbf_types[i].ntt_name) == 0) {
                        ops = nrs_tbf_types[i].ntt_ops;
                        type = nrs_tbf_types[i].ntt_flag;
                        found = 1;
@@ -1576,8 +2789,8 @@ static int nrs_tbf_start(struct ptlrpc_nrs_policy *policy, char *arg)
        if (head == NULL)
                GOTO(out, rc = -ENOMEM);
 
-       memcpy(head->th_type, arg, strlen(arg));
-       head->th_type[strlen(arg)] = '\0';
+       memcpy(head->th_type, name, strlen(name));
+       head->th_type[strlen(name)] = '\0';
        head->th_ops = ops;
        head->th_type_flag = type;
 
@@ -1749,11 +2962,21 @@ static int nrs_tbf_res_get(struct ptlrpc_nrs_policy *policy,
                    cli->tc_rule->tr_flags & NTRS_STOPPING) {
                        struct nrs_tbf_rule *rule;
 
+                       CDEBUG(D_RPCTRACE,
+                              "TBF class@%p rate %llu sequence %d, "
+                              "rule flags %d, head sequence %d\n",
+                              cli, cli->tc_rpc_rate,
+                              cli->tc_rule_sequence,
+                              cli->tc_rule->tr_flags,
+                              atomic_read(&head->th_rule_sequence));
                        rule = nrs_tbf_rule_match(head, cli);
-                       if (rule != cli->tc_rule)
+                       if (rule != cli->tc_rule) {
                                nrs_tbf_cli_reset(head, rule, cli);
-                       else
+                       } else {
+                               if (cli->tc_rule_generation != rule->tr_generation)
+                                       nrs_tbf_cli_reset_value(head, cli);
                                nrs_tbf_rule_put(rule);
+                       }
                } else if (cli->tc_rule_generation !=
                           cli->tc_rule->tr_generation) {
                        nrs_tbf_cli_reset_value(head, cli);
@@ -1847,10 +3070,12 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy,
                                     struct ptlrpc_nrs_request,
                                     nr_u.tbf.tr_list);
        } else {
+               struct nrs_tbf_rule *rule = cli->tc_rule;
                __u64 now = ktime_to_ns(ktime_get());
                __u64 passed;
                __u64 ntoken;
                __u64 deadline;
+               __u64 old_resid = 0;
 
                deadline = cli->tc_check_time +
                          cli->tc_nsecs;
@@ -1858,9 +3083,19 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy,
                passed = now - cli->tc_check_time;
                ntoken = passed * cli->tc_rpc_rate;
                do_div(ntoken, NSEC_PER_SEC);
+
                ntoken += cli->tc_ntoken;
-               if (ntoken > cli->tc_depth)
+               if (rule->tr_flags & NTRS_REALTIME) {
+                       LASSERT(cli->tc_nsecs_resid < cli->tc_nsecs);
+                       old_resid = cli->tc_nsecs_resid;
+                       cli->tc_nsecs_resid += passed % cli->tc_nsecs;
+                       if (cli->tc_nsecs_resid > cli->tc_nsecs) {
+                               ntoken++;
+                               cli->tc_nsecs_resid -= cli->tc_nsecs;
+                       }
+               } else if (ntoken > cli->tc_depth)
                        ntoken = cli->tc_depth;
+
                if (ntoken > 0) {
                        struct ptlrpc_request *req;
                        nrq = list_entry(cli->tc_list.next,
@@ -1878,18 +3113,30 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy,
                                                   &cli->tc_node);
                                cli->tc_in_heap = false;
                        } else {
+                               if (!(rule->tr_flags & NTRS_REALTIME))
+                                       cli->tc_deadline = now + cli->tc_nsecs;
                                cfs_binheap_relocate(head->th_binheap,
                                                     &cli->tc_node);
                        }
                        CDEBUG(D_RPCTRACE,
-                              "NRS start %s request from %s, "
-                              "seq: %llu\n",
-                              policy->pol_desc->pd_name,
-                              libcfs_id2str(req->rq_peer),
-                              nrq->nr_u.tbf.tr_sequence);
+                              "TBF dequeues: class@%p rate %llu gen %llu "
+                              "token %llu, rule@%p rate %llu gen %llu\n",
+                              cli, cli->tc_rpc_rate,
+                              cli->tc_rule_generation, cli->tc_ntoken,
+                              cli->tc_rule, cli->tc_rule->tr_rpc_rate,
+                              cli->tc_rule->tr_generation);
                } else {
                        ktime_t time;
 
+                       if (rule->tr_flags & NTRS_REALTIME) {
+                               cli->tc_deadline = deadline;
+                               cli->tc_nsecs_resid = old_resid;
+                               cfs_binheap_relocate(head->th_binheap,
+                                                    &cli->tc_node);
+                               if (node != cfs_binheap_root(head->th_binheap))
+                                       return nrs_tbf_req_get(policy,
+                                                              peek, force);
+                       }
                        policy->pol_nrs->nrs_throttling = 1;
                        head->th_deadline = deadline;
                        time = ktime_set(0, 0);
@@ -1925,6 +3172,7 @@ static int nrs_tbf_req_add(struct ptlrpc_nrs_policy *policy,
                            struct nrs_tbf_head, th_res);
        if (list_empty(&cli->tc_list)) {
                LASSERT(!cli->tc_in_heap);
+               cli->tc_deadline = cli->tc_check_time + cli->tc_nsecs;
                rc = cfs_binheap_insert(head->th_binheap, &cli->tc_node);
                if (rc == 0) {
                        cli->tc_in_heap = true;
@@ -1932,8 +3180,7 @@ static int nrs_tbf_req_add(struct ptlrpc_nrs_policy *policy,
                        list_add_tail(&nrq->nr_u.tbf.tr_list,
                                          &cli->tc_list);
                        if (policy->pol_nrs->nrs_throttling) {
-                               __u64 deadline = cli->tc_check_time +
-                                                cli->tc_nsecs;
+                               __u64 deadline = cli->tc_deadline;
                                if ((head->th_deadline > deadline) &&
                                    (hrtimer_try_to_cancel(&head->th_timer)
                                     >= 0)) {
@@ -1952,6 +3199,16 @@ static int nrs_tbf_req_add(struct ptlrpc_nrs_policy *policy,
                list_add_tail(&nrq->nr_u.tbf.tr_list,
                                  &cli->tc_list);
        }
+
+       if (rc == 0)
+               CDEBUG(D_RPCTRACE,
+                      "TBF enqueues: class@%p rate %llu gen %llu "
+                      "token %llu, rule@%p rate %llu gen %llu\n",
+                      cli, cli->tc_rpc_rate,
+                      cli->tc_rule_generation, cli->tc_ntoken,
+                      cli->tc_rule, cli->tc_rule->tr_rpc_rate,
+                      cli->tc_rule->tr_generation);
+
        return rc;
 }
 
@@ -2009,10 +3266,8 @@ static void nrs_tbf_req_stop(struct ptlrpc_nrs_policy *policy,
               nrq->nr_u.tbf.tr_sequence);
 }
 
-#ifdef CONFIG_PROC_FS
-
 /**
- * lprocfs interface
+ * debugfs interface
  */
 
 /**
@@ -2079,6 +3334,7 @@ no_hp:
 static int nrs_tbf_id_parse(struct nrs_tbf_cmd *cmd, char *token)
 {
        int rc;
+       ENTRY;
 
        switch (cmd->u.tc_start.ts_valid_type) {
        case NRS_TBF_FLAG_JOBID:
@@ -2090,22 +3346,44 @@ static int nrs_tbf_id_parse(struct nrs_tbf_cmd *cmd, char *token)
        case NRS_TBF_FLAG_OPCODE:
                rc = nrs_tbf_opcode_parse(cmd, token);
                break;
+       case NRS_TBF_FLAG_GENERIC:
+               rc = nrs_tbf_generic_parse(cmd, token);
+               break;
+       case NRS_TBF_FLAG_UID:
+       case NRS_TBF_FLAG_GID:
+               rc = nrs_tbf_ug_id_parse(cmd, token);
+               break;
        default:
                RETURN(-EINVAL);
        }
 
-       return rc;
+       RETURN(rc);
 }
 
 static void nrs_tbf_cmd_fini(struct nrs_tbf_cmd *cmd)
 {
        if (cmd->tc_cmd == NRS_CTL_TBF_START_RULE) {
-               if (cmd->u.tc_start.ts_valid_type == NRS_TBF_FLAG_JOBID)
+               switch (cmd->u.tc_start.ts_valid_type) {
+               case NRS_TBF_FLAG_JOBID:
                        nrs_tbf_jobid_cmd_fini(cmd);
-               else if (cmd->u.tc_start.ts_valid_type == NRS_TBF_FLAG_NID)
+                       break;
+               case NRS_TBF_FLAG_NID:
                        nrs_tbf_nid_cmd_fini(cmd);
-               else if (cmd->u.tc_start.ts_valid_type == NRS_TBF_FLAG_OPCODE)
+                       break;
+               case NRS_TBF_FLAG_OPCODE:
                        nrs_tbf_opcode_cmd_fini(cmd);
+                       break;
+               case NRS_TBF_FLAG_GENERIC:
+                       nrs_tbf_generic_cmd_fini(cmd);
+                       break;
+               case NRS_TBF_FLAG_UID:
+               case NRS_TBF_FLAG_GID:
+                       nrs_tbf_id_cmd_fini(cmd);
+                       break;
+               default:
+                       CWARN("unknown NRS_TBF_FLAGS:0x%x\n",
+                             cmd->u.tc_start.ts_valid_type);
+               }
        }
 }
 
@@ -2159,6 +3437,15 @@ nrs_tbf_parse_value_pair(struct nrs_tbf_cmd *cmd, char *buffer)
                        cmd->u.tc_change.tc_next_name = val;
                else
                        return -EINVAL;
+       } else if (strcmp(key, "realtime") == 0) {
+               unsigned long realtime;
+
+               rc = kstrtoul(val, 10, &realtime);
+               if (rc)
+                       return rc;
+
+               if (realtime > 0)
+                       cmd->u.tc_start.ts_rule_flags |= NTRS_REALTIME;
        } else {
                return -EINVAL;
        }
@@ -2296,7 +3583,6 @@ nrs_tbf_type_flag(struct ptlrpc_service *svc, enum ptlrpc_nrs_queue_type queue)
        return type;
 }
 
-extern struct nrs_core nrs_core;
 #define LPROCFS_WR_NRS_TBF_MAX_CMD (4096)
 static ssize_t
 ptlrpc_lprocfs_nrs_tbf_rule_seq_write(struct file *file,
@@ -2368,7 +3654,8 @@ out_free_kernbuff:
 out:
        return rc ? rc : count;
 }
-LPROC_SEQ_FOPS(ptlrpc_lprocfs_nrs_tbf_rule);
+
+LDEBUGFS_SEQ_FOPS(ptlrpc_lprocfs_nrs_tbf_rule);
 
 /**
  * Initializes a TBF policy's lprocfs interface for service \a svc
@@ -2387,27 +3674,13 @@ static int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc)
                { NULL }
        };
 
-       if (svc->srv_procroot == NULL)
+       if (!svc->srv_debugfs_entry)
                return 0;
 
-       return lprocfs_add_vars(svc->srv_procroot, nrs_tbf_lprocfs_vars, NULL);
-}
-
-/**
- * Cleans up a TBF policy's lprocfs interface for service \a svc
- *
- * \param[in] svc the service
- */
-static void nrs_tbf_lprocfs_fini(struct ptlrpc_service *svc)
-{
-       if (svc->srv_procroot == NULL)
-               return;
-
-       lprocfs_remove_proc_entry("nrs_tbf_rule", svc->srv_procroot);
+       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars,
+                                NULL);
 }
 
-#endif /* CONFIG_PROC_FS */
-
 /**
  * TBF policy operations
  */
@@ -2421,10 +3694,7 @@ static const struct ptlrpc_nrs_pol_ops nrs_tbf_ops = {
        .op_req_enqueue         = nrs_tbf_req_add,
        .op_req_dequeue         = nrs_tbf_req_del,
        .op_req_stop            = nrs_tbf_req_stop,
-#ifdef CONFIG_PROC_FS
        .op_lprocfs_init        = nrs_tbf_lprocfs_init,
-       .op_lprocfs_fini        = nrs_tbf_lprocfs_fini,
-#endif
 };
 
 /**