X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs_tbf.c;h=db9a29d6d9a1ed8cfc92583390a9bb526ac1784f;hb=3be9beb00e7cca9d758b364a85537b0631dddc12;hp=80fa9ffded74866b4119b8335568e8b6c0c30e52;hpb=cc2ff1bfd66a5c004eb6ed61fc2dac3f1ab49d3a;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/nrs_tbf.c b/lustre/ptlrpc/nrs_tbf.c index 80fa9ff..db9a29d 100644 --- a/lustre/ptlrpc/nrs_tbf.c +++ b/lustre/ptlrpc/nrs_tbf.c @@ -22,6 +22,7 @@ /* * Copyright (C) 2013 DataDirect Networks, Inc. * + * Copyright (c) 2014, Intel Corporation. */ /* * lustre/ptlrpc/nrs_tbf.c @@ -38,9 +39,6 @@ */ #define DEBUG_SUBSYSTEM S_RPC -#ifndef __KERNEL__ -#include -#endif #include #include #include @@ -56,17 +54,17 @@ #define NRS_POL_NAME_TBF "tbf" -int tbf_jobid_cache_size = 8192; -CFS_MODULE_PARM(tbf_jobid_cache_size, "i", int, 0644, - "The size of jobid cache"); +static int tbf_jobid_cache_size = 8192; +module_param(tbf_jobid_cache_size, int, 0644); +MODULE_PARM_DESC(tbf_jobid_cache_size, "The size of jobid cache"); -int tbf_rate = 10000; -CFS_MODULE_PARM(tbf_rate, "i", int, 0644, - "Default rate limit in RPCs/s"); +static int tbf_rate = 10000; +module_param(tbf_rate, int, 0644); +MODULE_PARM_DESC(tbf_rate, "Default rate limit in RPCs/s"); -int tbf_depth = 3; -CFS_MODULE_PARM(tbf_depth, "i", int, 0644, - "How many tokens that a client can save up"); +static int tbf_depth = 3; +module_param(tbf_depth, int, 0644); +MODULE_PARM_DESC(tbf_depth, "How many tokens that a client can save up"); static enum hrtimer_restart nrs_tbf_timer_cb(struct hrtimer *timer) { @@ -75,9 +73,7 @@ static enum hrtimer_restart nrs_tbf_timer_cb(struct hrtimer *timer) struct ptlrpc_nrs *nrs = head->th_res.res_policy->pol_nrs; struct ptlrpc_service_part *svcpt = nrs->nrs_svcpt; - spin_lock(&nrs->nrs_lock); nrs->nrs_throttling = 0; - spin_unlock(&nrs->nrs_lock); wake_up(&svcpt->scp_waitq); return HRTIMER_NORESTART; @@ -88,8 +84,8 @@ static enum hrtimer_restart nrs_tbf_timer_cb(struct hrtimer *timer) static void nrs_tbf_rule_fini(struct nrs_tbf_rule *rule) { LASSERT(atomic_read(&rule->tr_ref) == 0); - LASSERT(cfs_list_empty(&rule->tr_cli_list)); - LASSERT(cfs_list_empty(&rule->tr_linkage)); + LASSERT(list_empty(&rule->tr_cli_list)); + LASSERT(list_empty(&rule->tr_linkage)); rule->tr_head->th_ops->o_rule_fini(rule); OBD_FREE_PTR(rule); @@ -118,9 +114,11 @@ static inline void nrs_tbf_rule_get(struct nrs_tbf_rule *rule) static void nrs_tbf_cli_rule_put(struct nrs_tbf_client *cli) { - LASSERT(!cfs_list_empty(&cli->tc_linkage)); + LASSERT(!list_empty(&cli->tc_linkage)); LASSERT(cli->tc_rule); - cfs_list_del_init(&cli->tc_linkage); + spin_lock(&cli->tc_rule->tr_rule_lock); + list_del_init(&cli->tc_linkage); + spin_unlock(&cli->tc_rule->tr_rule_lock); nrs_tbf_rule_put(cli->tc_rule); cli->tc_rule = NULL; } @@ -150,26 +148,30 @@ nrs_tbf_cli_reset(struct nrs_tbf_head *head, struct nrs_tbf_rule *rule, struct nrs_tbf_client *cli) { - if (!cfs_list_empty(&cli->tc_linkage)) { + spin_lock(&cli->tc_rule_lock); + if (cli->tc_rule != NULL && !list_empty(&cli->tc_linkage)) { LASSERT(rule != cli->tc_rule); nrs_tbf_cli_rule_put(cli); } LASSERT(cli->tc_rule == NULL); - LASSERT(cfs_list_empty(&cli->tc_linkage)); + LASSERT(list_empty(&cli->tc_linkage)); /* Rule's ref is added before called */ cli->tc_rule = rule; - cfs_list_add_tail(&cli->tc_linkage, &rule->tr_cli_list); + spin_lock(&rule->tr_rule_lock); + list_add_tail(&cli->tc_linkage, &rule->tr_cli_list); + spin_unlock(&rule->tr_rule_lock); + spin_unlock(&cli->tc_rule_lock); nrs_tbf_cli_reset_value(head, cli); } static int -nrs_tbf_rule_dump(struct nrs_tbf_rule *rule, char *buff, int length) +nrs_tbf_rule_dump(struct nrs_tbf_rule *rule, struct seq_file *m) { - return rule->tr_head->th_ops->o_rule_dump(rule, buff, length); + return rule->tr_head->th_ops->o_rule_dump(rule, m); } static int -nrs_tbf_rule_dump_all(struct nrs_tbf_head *head, char *buff, int length) +nrs_tbf_rule_dump_all(struct nrs_tbf_head *head, struct seq_file *m) { struct nrs_tbf_rule *rule; int rc = 0; @@ -177,9 +179,13 @@ nrs_tbf_rule_dump_all(struct nrs_tbf_head *head, char *buff, int length) LASSERT(head != NULL); spin_lock(&head->th_rule_lock); /* List the rules from newest to oldest */ - cfs_list_for_each_entry(rule, &head->th_list, tr_linkage) { + list_for_each_entry(rule, &head->th_list, tr_linkage) { LASSERT((rule->tr_flags & NTRS_STOPPING) == 0); - rc += nrs_tbf_rule_dump(rule, buff + rc, length - rc); + rc = nrs_tbf_rule_dump(rule, m); + if (rc) { + rc = -ENOSPC; + break; + } } spin_unlock(&head->th_rule_lock); @@ -193,7 +199,7 @@ nrs_tbf_rule_find_nolock(struct nrs_tbf_head *head, struct nrs_tbf_rule *rule; LASSERT(head != NULL); - cfs_list_for_each_entry(rule, &head->th_list, tr_linkage) { + list_for_each_entry(rule, &head->th_list, tr_linkage) { LASSERT((rule->tr_flags & NTRS_STOPPING) == 0); if (strcmp(rule->tr_name, name) == 0) { nrs_tbf_rule_get(rule); @@ -225,7 +231,7 @@ nrs_tbf_rule_match(struct nrs_tbf_head *head, spin_lock(&head->th_rule_lock); /* Match the newest rule in the list */ - cfs_list_for_each_entry(tmp_rule, &head->th_list, tr_linkage) { + list_for_each_entry(tmp_rule, &head->th_list, tr_linkage) { LASSERT((tmp_rule->tr_flags & NTRS_STOPPING) == 0); if (head->th_ops->o_rule_match(tmp_rule, cli)) { rule = tmp_rule; @@ -250,8 +256,9 @@ nrs_tbf_cli_init(struct nrs_tbf_head *head, cli->tc_in_heap = false; head->th_ops->o_cli_init(cli, req); - CFS_INIT_LIST_HEAD(&cli->tc_list); - CFS_INIT_LIST_HEAD(&cli->tc_linkage); + INIT_LIST_HEAD(&cli->tc_list); + INIT_LIST_HEAD(&cli->tc_linkage); + spin_lock_init(&cli->tc_rule_lock); atomic_set(&cli->tc_ref, 1); rule = nrs_tbf_rule_match(head, cli); nrs_tbf_cli_reset(head, rule, cli); @@ -260,10 +267,12 @@ nrs_tbf_cli_init(struct nrs_tbf_head *head, static void nrs_tbf_cli_fini(struct nrs_tbf_client *cli) { - LASSERT(cfs_list_empty(&cli->tc_list)); + LASSERT(list_empty(&cli->tc_list)); LASSERT(!cli->tc_in_heap); LASSERT(atomic_read(&cli->tc_ref) == 0); + spin_lock(&cli->tc_rule_lock); nrs_tbf_cli_rule_put(cli); + spin_unlock(&cli->tc_rule_lock); OBD_FREE_PTR(cli); } @@ -286,12 +295,16 @@ nrs_tbf_rule_start(struct ptlrpc_nrs_policy *policy, return -ENOMEM; memcpy(rule->tr_name, start->tc_name, strlen(start->tc_name)); - rule->tr_rpc_rate = start->tc_rpc_rate; - rule->tr_nsecs = NSEC_PER_SEC / rule->tr_rpc_rate; + rule->tr_rpc_rate = start->u.tc_start.ts_rpc_rate; + rule->tr_nsecs = NSEC_PER_SEC; + do_div(rule->tr_nsecs, rule->tr_rpc_rate); rule->tr_depth = tbf_depth; atomic_set(&rule->tr_ref, 1); - CFS_INIT_LIST_HEAD(&rule->tr_cli_list); - CFS_INIT_LIST_HEAD(&rule->tr_nids); + INIT_LIST_HEAD(&rule->tr_cli_list); + INIT_LIST_HEAD(&rule->tr_nids); + INIT_LIST_HEAD(&rule->tr_linkage); + spin_lock_init(&rule->tr_rule_lock); + rule->tr_head = head; rc = head->th_ops->o_rule_init(policy, rule, start); if (rc) { @@ -303,15 +316,15 @@ nrs_tbf_rule_start(struct ptlrpc_nrs_policy *policy, spin_lock(&head->th_rule_lock); tmp_rule = nrs_tbf_rule_find_nolock(head, start->tc_name); if (tmp_rule) { + spin_unlock(&head->th_rule_lock); nrs_tbf_rule_put(tmp_rule); nrs_tbf_rule_put(rule); return -EEXIST; } - cfs_list_add(&rule->tr_linkage, &head->th_list); - rule->tr_head = head; + list_add(&rule->tr_linkage, &head->th_list); spin_unlock(&head->th_rule_lock); atomic_inc(&head->th_rule_sequence); - if (start->tc_rule_flags & NTRS_DEFAULT) { + if (start->u.tc_start.ts_rule_flags & NTRS_DEFAULT) { rule->tr_flags |= NTRS_DEFAULT; LASSERT(head->th_rule == NULL); head->th_rule = rule; @@ -333,8 +346,9 @@ nrs_tbf_rule_change(struct ptlrpc_nrs_policy *policy, if (rule == NULL) return -ENOENT; - rule->tr_rpc_rate = change->tc_rpc_rate; - rule->tr_nsecs = NSEC_PER_SEC / rule->tr_rpc_rate; + rule->tr_rpc_rate = change->u.tc_change.tc_rpc_rate; + rule->tr_nsecs = NSEC_PER_SEC; + do_div(rule->tr_nsecs, rule->tr_rpc_rate); rule->tr_generation++; nrs_tbf_rule_put(rule); @@ -357,7 +371,7 @@ nrs_tbf_rule_stop(struct ptlrpc_nrs_policy *policy, if (rule == NULL) return -ENOENT; - cfs_list_del_init(&rule->tr_linkage); + list_del_init(&rule->tr_linkage); rule->tr_flags |= NTRS_STOPPING; nrs_tbf_rule_put(rule); nrs_tbf_rule_put(rule); @@ -376,14 +390,14 @@ nrs_tbf_command(struct ptlrpc_nrs_policy *policy, switch (cmd->tc_cmd) { case NRS_CTL_TBF_START_RULE: - if (!(cmd->tc_valid_types & head->th_type_flag)) + if (cmd->u.tc_start.ts_valid_type != head->th_type_flag) return -EINVAL; spin_unlock(&policy->pol_nrs->nrs_lock); rc = nrs_tbf_rule_start(policy, head, cmd); spin_lock(&policy->pol_nrs->nrs_lock); return rc; - case NRS_CTL_TBF_CHANGE_RATE: + case NRS_CTL_TBF_CHANGE_RULE: rc = nrs_tbf_rule_change(policy, head, cmd); return rc; case NRS_CTL_TBF_STOP_RULE: @@ -404,7 +418,8 @@ nrs_tbf_command(struct ptlrpc_nrs_policy *policy, * \retval 0 e1 > e2 * \retval 1 e1 < e2 */ -static int tbf_cli_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2) +static int +tbf_cli_compare(struct cfs_binheap_node *e1, struct cfs_binheap_node *e2) { struct nrs_tbf_client *cli1; struct nrs_tbf_client *cli2; @@ -431,71 +446,72 @@ static int tbf_cli_compare(cfs_binheap_node_t *e1, cfs_binheap_node_t *e2) /** * TBF binary heap operations */ -static cfs_binheap_ops_t nrs_tbf_heap_ops = { +static struct cfs_binheap_ops nrs_tbf_heap_ops = { .hop_enter = NULL, .hop_exit = NULL, .hop_compare = tbf_cli_compare, }; -static unsigned nrs_tbf_jobid_hop_hash(cfs_hash_t *hs, const void *key, +static unsigned nrs_tbf_jobid_hop_hash(struct cfs_hash *hs, const void *key, unsigned mask) { return cfs_hash_djb2_hash(key, strlen(key), mask); } -static int nrs_tbf_jobid_hop_keycmp(const void *key, cfs_hlist_node_t *hnode) +static int nrs_tbf_jobid_hop_keycmp(const void *key, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); return (strcmp(cli->tc_jobid, key) == 0); } -static void *nrs_tbf_jobid_hop_key(cfs_hlist_node_t *hnode) +static void *nrs_tbf_jobid_hop_key(struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); return cli->tc_jobid; } -static void *nrs_tbf_jobid_hop_object(cfs_hlist_node_t *hnode) +static void *nrs_tbf_jobid_hop_object(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); + return hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); } -static void nrs_tbf_jobid_hop_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void nrs_tbf_jobid_hop_get(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); atomic_inc(&cli->tc_ref); } -static void nrs_tbf_jobid_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void nrs_tbf_jobid_hop_put(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); atomic_dec(&cli->tc_ref); } -static void nrs_tbf_jobid_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void +nrs_tbf_jobid_hop_exit(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, - struct nrs_tbf_client, - tc_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 cfs_hash_ops_t nrs_tbf_jobid_hash_ops = { +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, @@ -511,11 +527,11 @@ static cfs_hash_ops_t nrs_tbf_jobid_hash_ops = { CFS_HASH_DEPTH) static struct nrs_tbf_client * -nrs_tbf_jobid_hash_lookup(cfs_hash_t *hs, - cfs_hash_bd_t *bd, +nrs_tbf_jobid_hash_lookup(struct cfs_hash *hs, + struct cfs_hash_bd *bd, const char *jobid) { - cfs_hlist_node_t *hnode; + struct hlist_node *hnode; struct nrs_tbf_client *cli; /* cfs_hash_bd_peek_locked is a somehow "internal" function @@ -526,8 +542,8 @@ nrs_tbf_jobid_hash_lookup(cfs_hash_t *hs, cfs_hash_get(hs, hnode); cli = container_of0(hnode, struct nrs_tbf_client, tc_hnode); - if (!cfs_list_empty(&cli->tc_lru)) - cfs_list_del_init(&cli->tc_lru); + if (!list_empty(&cli->tc_lru)) + list_del_init(&cli->tc_lru); return cli; } @@ -539,8 +555,8 @@ nrs_tbf_jobid_cli_find(struct nrs_tbf_head *head, { const char *jobid; struct nrs_tbf_client *cli; - cfs_hash_t *hs = head->th_cli_hash; - cfs_hash_bd_t bd; + struct cfs_hash *hs = head->th_cli_hash; + struct cfs_hash_bd bd; jobid = lustre_msg_get_jobid(req->rq_reqmsg); if (jobid == NULL) @@ -558,8 +574,8 @@ nrs_tbf_jobid_cli_findadd(struct nrs_tbf_head *head, { const char *jobid; struct nrs_tbf_client *ret; - cfs_hash_t *hs = head->th_cli_hash; - cfs_hash_bd_t bd; + struct cfs_hash *hs = head->th_cli_hash; + struct cfs_hash_bd bd; jobid = cli->tc_jobid; cfs_hash_bd_get_and_lock(hs, (void *)jobid, &bd, 1); @@ -577,18 +593,19 @@ static void nrs_tbf_jobid_cli_put(struct nrs_tbf_head *head, struct nrs_tbf_client *cli) { - cfs_hash_bd_t bd; - cfs_hash_t *hs = head->th_cli_hash; + struct cfs_hash_bd bd; + struct cfs_hash *hs = head->th_cli_hash; struct nrs_tbf_bucket *bkt; int hw; - CFS_LIST_HEAD (zombies); + struct list_head zombies; + INIT_LIST_HEAD(&zombies); cfs_hash_bd_get(hs, &cli->tc_jobid, &bd); bkt = cfs_hash_bd_extra_get(hs, &bd); if (!cfs_hash_bd_dec_and_lock(hs, &bd, &cli->tc_ref)) return; - LASSERT(cfs_list_empty(&cli->tc_lru)); - cfs_list_add_tail(&cli->tc_lru, &bkt->ntb_lru); + 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. @@ -596,21 +613,21 @@ nrs_tbf_jobid_cli_put(struct nrs_tbf_head *head, hw = tbf_jobid_cache_size >> (hs->hs_cur_bits - hs->hs_bkt_bits); while (cfs_hash_bd_count_get(&bd) > hw) { - if (unlikely(cfs_list_empty(&bkt->ntb_lru))) + if (unlikely(list_empty(&bkt->ntb_lru))) break; - cli = cfs_list_entry(bkt->ntb_lru.next, + 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); - cfs_list_move(&cli->tc_lru, &zombies); + list_move(&cli->tc_lru, &zombies); } cfs_hash_bd_unlock(head->th_cli_hash, &bd, 1); - while (!cfs_list_empty(&zombies)) { + while (!list_empty(&zombies)) { cli = container_of0(zombies.next, struct nrs_tbf_client, tc_lru); - cfs_list_del_init(&cli->tc_lru); + list_del_init(&cli->tc_lru); nrs_tbf_cli_fini(cli); } } @@ -623,8 +640,8 @@ nrs_tbf_jobid_cli_init(struct nrs_tbf_client *cli, if (jobid == NULL) jobid = NRS_TBF_JOBID_NULL; - LASSERT(strlen(jobid) < JOBSTATS_JOBID_SIZE); - CFS_INIT_LIST_HEAD(&cli->tc_lru); + LASSERT(strlen(jobid) < LUSTRE_JOBID_SIZE); + INIT_LIST_HEAD(&cli->tc_lru); memcpy(cli->tc_jobid, jobid, strlen(jobid)); } @@ -649,7 +666,7 @@ nrs_tbf_jobid_startup(struct ptlrpc_nrs_policy *policy, int bits; int i; int rc; - cfs_hash_bd_t bd; + struct cfs_hash_bd bd; bits = nrs_tbf_jobid_hash_order(); if (bits < NRS_TBF_JOBID_BKT_BITS) @@ -668,16 +685,16 @@ nrs_tbf_jobid_startup(struct ptlrpc_nrs_policy *policy, cfs_hash_for_each_bucket(head->th_cli_hash, &bd, i) { bkt = cfs_hash_bd_extra_get(head->th_cli_hash, &bd); - CFS_INIT_LIST_HEAD(&bkt->ntb_lru); + INIT_LIST_HEAD(&bkt->ntb_lru); } memset(&start, 0, sizeof(start)); - start.tc_jobids_str = "*"; + start.u.tc_start.ts_jobids_str = "*"; - start.tc_rpc_rate = tbf_rate; - start.tc_rule_flags = NTRS_DEFAULT; + 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; - CFS_INIT_LIST_HEAD(&start.tc_jobids); + INIT_LIST_HEAD(&start.u.tc_start.ts_jobids); rc = nrs_tbf_rule_start(policy, head, &start); return rc; @@ -688,19 +705,19 @@ nrs_tbf_jobid_startup(struct ptlrpc_nrs_policy *policy, * */ static void -nrs_tbf_jobid_list_free(cfs_list_t *jobid_list) +nrs_tbf_jobid_list_free(struct list_head *jobid_list) { struct nrs_tbf_jobid *jobid, *n; - cfs_list_for_each_entry_safe(jobid, n, jobid_list, tj_linkage) { + list_for_each_entry_safe(jobid, n, jobid_list, tj_linkage) { OBD_FREE(jobid->tj_id, strlen(jobid->tj_id) + 1); - cfs_list_del(&jobid->tj_linkage); + list_del(&jobid->tj_linkage); OBD_FREE(jobid, sizeof(struct nrs_tbf_jobid)); } } static int -nrs_tbf_jobid_list_add(const struct cfs_lstr *id, cfs_list_t *jobid_list) +nrs_tbf_jobid_list_add(const struct cfs_lstr *id, struct list_head *jobid_list) { struct nrs_tbf_jobid *jobid; @@ -715,16 +732,16 @@ nrs_tbf_jobid_list_add(const struct cfs_lstr *id, cfs_list_t *jobid_list) } memcpy(jobid->tj_id, id->ls_str, id->ls_len); - cfs_list_add_tail(&jobid->tj_linkage, jobid_list); + list_add_tail(&jobid->tj_linkage, jobid_list); return 0; } static int -nrs_tbf_jobid_list_match(cfs_list_t *jobid_list, char *id) +nrs_tbf_jobid_list_match(struct list_head *jobid_list, char *id) { struct nrs_tbf_jobid *jobid; - cfs_list_for_each_entry(jobid, jobid_list, tj_linkage) { + list_for_each_entry(jobid, jobid_list, tj_linkage) { if (strcmp(id, jobid->tj_id) == 0) return 1; } @@ -732,7 +749,7 @@ nrs_tbf_jobid_list_match(cfs_list_t *jobid_list, char *id) } static int -nrs_tbf_jobid_list_parse(char *str, int len, cfs_list_t *jobid_list) +nrs_tbf_jobid_list_parse(char *str, int len, struct list_head *jobid_list) { struct cfs_lstr src; struct cfs_lstr res; @@ -741,7 +758,7 @@ nrs_tbf_jobid_list_parse(char *str, int len, cfs_list_t *jobid_list) src.ls_str = str; src.ls_len = len; - CFS_INIT_LIST_HEAD(jobid_list); + INIT_LIST_HEAD(jobid_list); while (src.ls_str) { rc = cfs_gettok(&src, ' ', &res); if (rc == 0) { @@ -759,26 +776,53 @@ nrs_tbf_jobid_list_parse(char *str, int len, cfs_list_t *jobid_list) static void nrs_tbf_jobid_cmd_fini(struct nrs_tbf_cmd *cmd) { - if (!cfs_list_empty(&cmd->tc_jobids)) - nrs_tbf_jobid_list_free(&cmd->tc_jobids); - if (cmd->tc_jobids_str) - OBD_FREE(cmd->tc_jobids_str, strlen(cmd->tc_jobids_str) + 1); + if (!list_empty(&cmd->u.tc_start.ts_jobids)) + nrs_tbf_jobid_list_free(&cmd->u.tc_start.ts_jobids); + if (cmd->u.tc_start.ts_jobids_str) + OBD_FREE(cmd->u.tc_start.ts_jobids_str, + strlen(cmd->u.tc_start.ts_jobids_str) + 1); } -static int nrs_tbf_jobid_parse(struct nrs_tbf_cmd *cmd, const char *id) +static int nrs_tbf_check_id_value(struct cfs_lstr *src, char *key) { + struct cfs_lstr res; + int keylen = strlen(key); int rc; - OBD_ALLOC(cmd->tc_jobids_str, strlen(id) + 1); - if (cmd->tc_jobids_str == NULL) + rc = cfs_gettok(src, '=', &res); + if (rc == 0 || res.ls_len != keylen || + strncmp(res.ls_str, key, keylen) != 0 || + src->ls_len <= 2 || src->ls_str[0] != '{' || + src->ls_str[src->ls_len - 1] != '}') + return -EINVAL; + + /* Skip '{' and '}' */ + src->ls_str++; + src->ls_len -= 2; + return 0; +} + +static int nrs_tbf_jobid_parse(struct nrs_tbf_cmd *cmd, char *id) +{ + struct cfs_lstr src; + int rc; + + src.ls_str = id; + src.ls_len = strlen(id); + rc = nrs_tbf_check_id_value(&src, "jobid"); + if (rc) + return rc; + + OBD_ALLOC(cmd->u.tc_start.ts_jobids_str, src.ls_len + 1); + if (cmd->u.tc_start.ts_jobids_str == NULL) return -ENOMEM; - memcpy(cmd->tc_jobids_str, id, strlen(id)); + memcpy(cmd->u.tc_start.ts_jobids_str, src.ls_str, src.ls_len); /* parse jobid list */ - rc = nrs_tbf_jobid_list_parse(cmd->tc_jobids_str, - strlen(cmd->tc_jobids_str), - &cmd->tc_jobids); + rc = nrs_tbf_jobid_list_parse(cmd->u.tc_start.ts_jobids_str, + strlen(cmd->u.tc_start.ts_jobids_str), + &cmd->u.tc_start.ts_jobids); if (rc) nrs_tbf_jobid_cmd_fini(cmd); @@ -791,18 +835,18 @@ static int nrs_tbf_jobid_rule_init(struct ptlrpc_nrs_policy *policy, { int rc = 0; - LASSERT(start->tc_jobids_str); + LASSERT(start->u.tc_start.ts_jobids_str); OBD_ALLOC(rule->tr_jobids_str, - strlen(start->tc_jobids_str) + 1); + strlen(start->u.tc_start.ts_jobids_str) + 1); if (rule->tr_jobids_str == NULL) return -ENOMEM; memcpy(rule->tr_jobids_str, - start->tc_jobids_str, - strlen(start->tc_jobids_str)); + start->u.tc_start.ts_jobids_str, + strlen(start->u.tc_start.ts_jobids_str)); - CFS_INIT_LIST_HEAD(&rule->tr_jobids); - if (!cfs_list_empty(&start->tc_jobids)) { + INIT_LIST_HEAD(&rule->tr_jobids); + if (!list_empty(&start->u.tc_start.ts_jobids)) { rc = nrs_tbf_jobid_list_parse(rule->tr_jobids_str, strlen(rule->tr_jobids_str), &rule->tr_jobids); @@ -811,18 +855,17 @@ static int nrs_tbf_jobid_rule_init(struct ptlrpc_nrs_policy *policy, } if (rc) OBD_FREE(rule->tr_jobids_str, - strlen(start->tc_jobids_str) + 1); + strlen(start->u.tc_start.ts_jobids_str) + 1); return rc; } static int -nrs_tbf_jobid_rule_dump(struct nrs_tbf_rule *rule, char *buff, int length) +nrs_tbf_jobid_rule_dump(struct nrs_tbf_rule *rule, struct seq_file *m) { - return snprintf(buff, length, "%s {%s} %llu, ref %d\n", - rule->tr_name, - rule->tr_jobids_str, - rule->tr_rpc_rate, - atomic_read(&rule->tr_ref) - 1); + seq_printf(m, "%s {%s} %llu, ref %d\n", rule->tr_name, + rule->tr_jobids_str, rule->tr_rpc_rate, + atomic_read(&rule->tr_ref) - 1); + return 0; } static int @@ -834,13 +877,13 @@ nrs_tbf_jobid_rule_match(struct nrs_tbf_rule *rule, static void nrs_tbf_jobid_rule_fini(struct nrs_tbf_rule *rule) { - if (!cfs_list_empty(&rule->tr_jobids)) + if (!list_empty(&rule->tr_jobids)) nrs_tbf_jobid_list_free(&rule->tr_jobids); LASSERT(rule->tr_jobids_str != NULL); OBD_FREE(rule->tr_jobids_str, strlen(rule->tr_jobids_str) + 1); } -struct nrs_tbf_ops nrs_tbf_jobid_ops = { +static struct nrs_tbf_ops nrs_tbf_jobid_ops = { .o_name = NRS_TBF_TYPE_JOBID, .o_startup = nrs_tbf_jobid_startup, .o_cli_find = nrs_tbf_jobid_cli_find, @@ -862,57 +905,57 @@ struct nrs_tbf_ops nrs_tbf_jobid_ops = { #define NRS_TBF_NID_BKT_BITS 8 #define NRS_TBF_NID_BITS 16 -static unsigned nrs_tbf_nid_hop_hash(cfs_hash_t *hs, const void *key, +static unsigned nrs_tbf_nid_hop_hash(struct cfs_hash *hs, const void *key, unsigned mask) { return cfs_hash_djb2_hash(key, sizeof(lnet_nid_t), mask); } -static int nrs_tbf_nid_hop_keycmp(const void *key, cfs_hlist_node_t *hnode) +static int nrs_tbf_nid_hop_keycmp(const void *key, struct hlist_node *hnode) { lnet_nid_t *nid = (lnet_nid_t *)key; - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); return *nid == cli->tc_nid; } -static void *nrs_tbf_nid_hop_key(cfs_hlist_node_t *hnode) +static void *nrs_tbf_nid_hop_key(struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); return &cli->tc_nid; } -static void *nrs_tbf_nid_hop_object(cfs_hlist_node_t *hnode) +static void *nrs_tbf_nid_hop_object(struct hlist_node *hnode) { - return cfs_hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); + return hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); } -static void nrs_tbf_nid_hop_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void nrs_tbf_nid_hop_get(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); atomic_inc(&cli->tc_ref); } -static void nrs_tbf_nid_hop_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void nrs_tbf_nid_hop_put(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); atomic_dec(&cli->tc_ref); } -static void nrs_tbf_nid_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +static void nrs_tbf_nid_hop_exit(struct cfs_hash *hs, struct hlist_node *hnode) { - struct nrs_tbf_client *cli = cfs_hlist_entry(hnode, + struct nrs_tbf_client *cli = hlist_entry(hnode, struct nrs_tbf_client, tc_hnode); @@ -923,7 +966,7 @@ static void nrs_tbf_nid_hop_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode) nrs_tbf_cli_fini(cli); } -static cfs_hash_ops_t nrs_tbf_nid_hash_ops = { +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, @@ -975,12 +1018,12 @@ nrs_tbf_nid_startup(struct ptlrpc_nrs_policy *policy, return -ENOMEM; memset(&start, 0, sizeof(start)); - start.tc_nids_str = "*"; + start.u.tc_start.ts_nids_str = "*"; - start.tc_rpc_rate = tbf_rate; - start.tc_rule_flags = NTRS_DEFAULT; + 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; - CFS_INIT_LIST_HEAD(&start.tc_nids); + INIT_LIST_HEAD(&start.u.tc_start.ts_nids); rc = nrs_tbf_rule_start(policy, head, &start); return rc; @@ -997,25 +1040,25 @@ static int nrs_tbf_nid_rule_init(struct ptlrpc_nrs_policy *policy, struct nrs_tbf_rule *rule, struct nrs_tbf_cmd *start) { - LASSERT(start->tc_nids_str); + LASSERT(start->u.tc_start.ts_nids_str); OBD_ALLOC(rule->tr_nids_str, - strlen(start->tc_nids_str) + 1); + strlen(start->u.tc_start.ts_nids_str) + 1); if (rule->tr_nids_str == NULL) return -ENOMEM; memcpy(rule->tr_nids_str, - start->tc_nids_str, - strlen(start->tc_nids_str)); + start->u.tc_start.ts_nids_str, + strlen(start->u.tc_start.ts_nids_str)); - CFS_INIT_LIST_HEAD(&rule->tr_nids); - if (!cfs_list_empty(&start->tc_nids)) { + INIT_LIST_HEAD(&rule->tr_nids); + if (!list_empty(&start->u.tc_start.ts_nids)) { if (cfs_parse_nidlist(rule->tr_nids_str, strlen(rule->tr_nids_str), &rule->tr_nids) <= 0) { CERROR("nids {%s} illegal\n", rule->tr_nids_str); OBD_FREE(rule->tr_nids_str, - strlen(start->tc_nids_str) + 1); + strlen(start->u.tc_start.ts_nids_str) + 1); return -EINVAL; } } @@ -1023,13 +1066,12 @@ static int nrs_tbf_nid_rule_init(struct ptlrpc_nrs_policy *policy, } static int -nrs_tbf_nid_rule_dump(struct nrs_tbf_rule *rule, char *buff, int length) +nrs_tbf_nid_rule_dump(struct nrs_tbf_rule *rule, struct seq_file *m) { - return snprintf(buff, length, "%s {%s} %llu, ref %d\n", - rule->tr_name, - rule->tr_nids_str, - rule->tr_rpc_rate, - atomic_read(&rule->tr_ref) - 1); + seq_printf(m, "%s {%s} %llu, ref %d\n", rule->tr_name, + rule->tr_nids_str, rule->tr_rpc_rate, + atomic_read(&rule->tr_ref) - 1); + return 0; } static int @@ -1041,7 +1083,7 @@ nrs_tbf_nid_rule_match(struct nrs_tbf_rule *rule, static void nrs_tbf_nid_rule_fini(struct nrs_tbf_rule *rule) { - if (!cfs_list_empty(&rule->tr_nids)) + if (!list_empty(&rule->tr_nids)) cfs_free_nidlist(&rule->tr_nids); LASSERT(rule->tr_nids_str != NULL); OBD_FREE(rule->tr_nids_str, strlen(rule->tr_nids_str) + 1); @@ -1049,24 +1091,34 @@ static void nrs_tbf_nid_rule_fini(struct nrs_tbf_rule *rule) static void nrs_tbf_nid_cmd_fini(struct nrs_tbf_cmd *cmd) { - if (!cfs_list_empty(&cmd->tc_nids)) - cfs_free_nidlist(&cmd->tc_nids); - if (cmd->tc_nids_str) - OBD_FREE(cmd->tc_nids_str, strlen(cmd->tc_nids_str) + 1); + if (!list_empty(&cmd->u.tc_start.ts_nids)) + cfs_free_nidlist(&cmd->u.tc_start.ts_nids); + if (cmd->u.tc_start.ts_nids_str) + OBD_FREE(cmd->u.tc_start.ts_nids_str, + strlen(cmd->u.tc_start.ts_nids_str) + 1); } -static int nrs_tbf_nid_parse(struct nrs_tbf_cmd *cmd, const char *id) +static int nrs_tbf_nid_parse(struct nrs_tbf_cmd *cmd, char *id) { - OBD_ALLOC(cmd->tc_nids_str, strlen(id) + 1); - if (cmd->tc_nids_str == NULL) + struct cfs_lstr src; + int rc; + + src.ls_str = id; + src.ls_len = strlen(id); + rc = nrs_tbf_check_id_value(&src, "nid"); + if (rc) + return rc; + + OBD_ALLOC(cmd->u.tc_start.ts_nids_str, src.ls_len + 1); + if (cmd->u.tc_start.ts_nids_str == NULL) return -ENOMEM; - memcpy(cmd->tc_nids_str, id, strlen(id)); + memcpy(cmd->u.tc_start.ts_nids_str, src.ls_str, src.ls_len); /* parse NID list */ - if (cfs_parse_nidlist(cmd->tc_nids_str, - strlen(cmd->tc_nids_str), - &cmd->tc_nids) <= 0) { + if (cfs_parse_nidlist(cmd->u.tc_start.ts_nids_str, + strlen(cmd->u.tc_start.ts_nids_str), + &cmd->u.tc_start.ts_nids) <= 0) { nrs_tbf_nid_cmd_fini(cmd); return -EINVAL; } @@ -1074,7 +1126,7 @@ static int nrs_tbf_nid_parse(struct nrs_tbf_cmd *cmd, const char *id) return 0; } -struct nrs_tbf_ops nrs_tbf_nid_ops = { +static struct nrs_tbf_ops nrs_tbf_nid_ops = { .o_name = NRS_TBF_TYPE_NID, .o_startup = nrs_tbf_nid_startup, .o_cli_find = nrs_tbf_nid_cli_find, @@ -1137,7 +1189,7 @@ static int nrs_tbf_start(struct ptlrpc_nrs_policy *policy, char *arg) atomic_set(&head->th_rule_sequence, 0); spin_lock_init(&head->th_rule_lock); - CFS_INIT_LIST_HEAD(&head->th_list); + INIT_LIST_HEAD(&head->th_list); hrtimer_init(&head->th_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); head->th_timer.function = nrs_tbf_timer_cb; rc = head->th_ops->o_startup(policy, head); @@ -1174,18 +1226,16 @@ static void nrs_tbf_stop(struct ptlrpc_nrs_policy *policy) hrtimer_cancel(&head->th_timer); /* Should cleanup hash first before free rules */ cfs_hash_putref(head->th_cli_hash); - cfs_list_for_each_entry_safe(rule, n, &head->th_list, tr_linkage) { - cfs_list_del_init(&rule->tr_linkage); + list_for_each_entry_safe(rule, n, &head->th_list, tr_linkage) { + list_del_init(&rule->tr_linkage); nrs_tbf_rule_put(rule); } - LASSERT(cfs_list_empty(&head->th_list)); + LASSERT(list_empty(&head->th_list)); LASSERT(head->th_binheap != NULL); LASSERT(cfs_binheap_is_empty(head->th_binheap)); cfs_binheap_destroy(head->th_binheap); OBD_FREE_PTR(head); - spin_lock(&nrs->nrs_lock); nrs->nrs_throttling = 0; - spin_unlock(&nrs->nrs_lock); wake_up(&policy->pol_nrs->nrs_svcpt->scp_waitq); } @@ -1203,8 +1253,9 @@ static void nrs_tbf_stop(struct ptlrpc_nrs_policy *policy) * \retval 0 operation carried out successfully * \retval -ve error */ -int nrs_tbf_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc, - void *arg) +static int nrs_tbf_ctl(struct ptlrpc_nrs_policy *policy, + enum ptlrpc_nrs_ctl opc, + void *arg) { int rc = 0; ENTRY; @@ -1220,26 +1271,13 @@ int nrs_tbf_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc, */ case NRS_CTL_TBF_RD_RULE: { struct nrs_tbf_head *head = policy->pol_private; + struct seq_file *m = (struct seq_file *) arg; struct ptlrpc_service_part *svcpt; - struct nrs_tbf_dump *dump; - int length; - - dump = (struct nrs_tbf_dump *)arg; svcpt = policy->pol_nrs->nrs_svcpt; - length = snprintf(dump->td_buff, dump->td_size, - "CPT %d:\n", - svcpt->scp_cpt); - dump->td_length += length; - dump->td_buff += length; - dump->td_size -= length; - - length = nrs_tbf_rule_dump_all(head, - dump->td_buff, - dump->td_size); - dump->td_length += length; - dump->td_buff += length; - dump->td_size -= length; + seq_printf(m, "CPT %d:\n", svcpt->scp_cpt); + + rc = nrs_tbf_rule_dump_all(head, m); } break; @@ -1256,6 +1294,15 @@ int nrs_tbf_ctl(struct ptlrpc_nrs_policy *policy, enum ptlrpc_nrs_ctl opc, cmd); } break; + /** + * Read the TBF policy type of a policy instance. + */ + case NRS_CTL_TBF_RD_TYPE_FLAG: { + struct nrs_tbf_head *head = policy->pol_private; + + *(__u32 *)arg = head->th_type_flag; + } + break; } RETURN(rc); @@ -1380,7 +1427,7 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy, struct nrs_tbf_head *head = policy->pol_private; struct ptlrpc_nrs_request *nrq = NULL; struct nrs_tbf_client *cli; - cfs_binheap_node_t *node; + struct cfs_binheap_node *node; assert_spin_locked(&policy->pol_nrs->nrs_svcpt->scp_req_lock); @@ -1394,26 +1441,27 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy, cli = container_of(node, struct nrs_tbf_client, tc_node); LASSERT(cli->tc_in_heap); if (peek) { - nrq = cfs_list_entry(cli->tc_list.next, + nrq = list_entry(cli->tc_list.next, struct ptlrpc_nrs_request, nr_u.tbf.tr_list); } else { __u64 now = ktime_to_ns(ktime_get()); __u64 passed; - long ntoken; + __u64 ntoken; __u64 deadline; deadline = cli->tc_check_time + cli->tc_nsecs; LASSERT(now >= cli->tc_check_time); passed = now - cli->tc_check_time; - ntoken = (passed * cli->tc_rpc_rate) / NSEC_PER_SEC; + ntoken = passed * cli->tc_rpc_rate; + do_div(ntoken, NSEC_PER_SEC); ntoken += cli->tc_ntoken; if (ntoken > cli->tc_depth) ntoken = cli->tc_depth; if (ntoken > 0) { struct ptlrpc_request *req; - nrq = cfs_list_entry(cli->tc_list.next, + nrq = list_entry(cli->tc_list.next, struct ptlrpc_nrs_request, nr_u.tbf.tr_list); req = container_of(nrq, @@ -1422,8 +1470,8 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy, ntoken--; cli->tc_ntoken = ntoken; cli->tc_check_time = now; - cfs_list_del_init(&nrq->nr_u.tbf.tr_list); - if (cfs_list_empty(&cli->tc_list)) { + list_del_init(&nrq->nr_u.tbf.tr_list); + if (list_empty(&cli->tc_list)) { cfs_binheap_remove(head->th_binheap, &cli->tc_node); cli->tc_in_heap = false; @@ -1440,9 +1488,7 @@ struct ptlrpc_nrs_request *nrs_tbf_req_get(struct ptlrpc_nrs_policy *policy, } else { ktime_t time; - spin_lock(&policy->pol_nrs->nrs_lock); policy->pol_nrs->nrs_throttling = 1; - spin_unlock(&policy->pol_nrs->nrs_lock); head->th_deadline = deadline; time = ktime_set(0, 0); time = ktime_add_ns(time, deadline); @@ -1475,13 +1521,13 @@ static int nrs_tbf_req_add(struct ptlrpc_nrs_policy *policy, struct nrs_tbf_client, tc_res); head = container_of(nrs_request_resource(nrq)->res_parent, struct nrs_tbf_head, th_res); - if (cfs_list_empty(&cli->tc_list)) { + if (list_empty(&cli->tc_list)) { LASSERT(!cli->tc_in_heap); rc = cfs_binheap_insert(head->th_binheap, &cli->tc_node); if (rc == 0) { cli->tc_in_heap = true; nrq->nr_u.tbf.tr_sequence = head->th_sequence++; - cfs_list_add_tail(&nrq->nr_u.tbf.tr_list, + list_add_tail(&nrq->nr_u.tbf.tr_list, &cli->tc_list); if (policy->pol_nrs->nrs_throttling) { __u64 deadline = cli->tc_check_time + @@ -1501,7 +1547,7 @@ static int nrs_tbf_req_add(struct ptlrpc_nrs_policy *policy, } else { LASSERT(cli->tc_in_heap); nrq->nr_u.tbf.tr_sequence = head->th_sequence++; - cfs_list_add_tail(&nrq->nr_u.tbf.tr_list, + list_add_tail(&nrq->nr_u.tbf.tr_list, &cli->tc_list); } return rc; @@ -1526,9 +1572,9 @@ static void nrs_tbf_req_del(struct ptlrpc_nrs_policy *policy, head = container_of(nrs_request_resource(nrq)->res_parent, struct nrs_tbf_head, th_res); - LASSERT(!cfs_list_empty(&nrq->nr_u.tbf.tr_list)); - cfs_list_del_init(&nrq->nr_u.tbf.tr_list); - if (cfs_list_empty(&cli->tc_list)) { + LASSERT(!list_empty(&nrq->nr_u.tbf.tr_list)); + list_del_init(&nrq->nr_u.tbf.tr_list); + if (list_empty(&cli->tc_list)) { cfs_binheap_remove(head->th_binheap, &cli->tc_node); cli->tc_in_heap = false; @@ -1561,7 +1607,7 @@ static void nrs_tbf_req_stop(struct ptlrpc_nrs_policy *policy, nrq->nr_u.tbf.tr_sequence); } -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS /** * lprocfs interface @@ -1572,31 +1618,31 @@ static void nrs_tbf_req_stop(struct ptlrpc_nrs_policy *policy, */ #define LPROCFS_NRS_RATE_MAX 65535 -static int ptlrpc_lprocfs_rd_nrs_tbf_rule(char *page, char **start, - off_t off, int count, int *eof, - void *data) +static int +ptlrpc_lprocfs_nrs_tbf_rule_seq_show(struct seq_file *m, void *data) { - struct ptlrpc_service *svc = data; + struct ptlrpc_service *svc = m->private; int rc; - int rc2; - struct nrs_tbf_dump dump; - rc2 = snprintf(page, count, "regular_requests:\n"); + seq_printf(m, "regular_requests:\n"); /** * Perform two separate calls to this as only one of the NRS heads' * policies may be in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED or * ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPING state. */ - dump.td_length = 0; - dump.td_buff = page + rc2; - dump.td_size = count - rc2; rc = ptlrpc_nrs_policy_control(svc, PTLRPC_NRS_QUEUE_REG, NRS_POL_NAME_TBF, NRS_CTL_TBF_RD_RULE, - false, &dump); + false, m); if (rc == 0) { - *eof = 1; - rc2 += dump.td_length; + /** + * -ENOSPC means buf in the parameter m is overflow, return 0 + * here to let upper layer function seq_read alloc a larger + * memory area and do this process again. + */ + } else if (rc == -ENOSPC) { + return 0; + /** * Ignore -ENODEV as the regular NRS head's policy may be in the * ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state. @@ -1608,90 +1654,143 @@ static int ptlrpc_lprocfs_rd_nrs_tbf_rule(char *page, char **start, if (!nrs_svc_has_hp(svc)) goto no_hp; - rc2 += snprintf(page + rc2, count - rc2, "high_priority_requests:\n"); - dump.td_length = 0; - dump.td_buff = page + rc2; - dump.td_size = count - rc2; + seq_printf(m, "high_priority_requests:\n"); rc = ptlrpc_nrs_policy_control(svc, PTLRPC_NRS_QUEUE_HP, NRS_POL_NAME_TBF, NRS_CTL_TBF_RD_RULE, - false, &dump); + false, m); if (rc == 0) { - *eof = 1; - rc2 += dump.td_length; /** - * Ignore -ENODEV as the high priority NRS head's policy may be - * in the ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPED state. + * -ENOSPC means buf in the parameter m is overflow, return 0 + * here to let upper layer function seq_read alloc a larger + * memory area and do this process again. */ - } else if (rc != -ENODEV) { - return rc; + } else if (rc == -ENOSPC) { + return 0; } no_hp: - return rc2 ? : rc; + return rc; } -static int nrs_tbf_id_parse(struct nrs_tbf_cmd *cmd, char **val) +static int nrs_tbf_id_parse(struct nrs_tbf_cmd *cmd, char *token) { int rc; - char *token; - - token = strsep(val, "}"); - if (*val == NULL) - GOTO(out, rc = -EINVAL); - - if (strlen(token) <= 1 || - token[0] != '{') - GOTO(out, rc = -EINVAL); - /* Skip '{' */ - token++; - - /* Should be followed by ' ' or nothing */ - if ((*val)[0] == '\0') - *val = NULL; - else if ((*val)[0] == ' ') - (*val)++; - else - GOTO(out, rc = -EINVAL); - rc = nrs_tbf_jobid_parse(cmd, token); - if (!rc) - cmd->tc_valid_types |= NRS_TBF_FLAG_JOBID; - - rc = nrs_tbf_nid_parse(cmd, token); - if (!rc) - cmd->tc_valid_types |= NRS_TBF_FLAG_NID; - - if (!cmd->tc_valid_types) + if (cmd->u.tc_start.ts_valid_type & NRS_TBF_FLAG_JOBID) + rc = nrs_tbf_jobid_parse(cmd, token); + else if (cmd->u.tc_start.ts_valid_type & NRS_TBF_FLAG_NID) + rc = nrs_tbf_nid_parse(cmd, token); + else if (cmd->u.tc_start.ts_valid_type == NRS_TBF_FLAG_INVALID) rc = -EINVAL; else rc = 0; -out: + return rc; } static void nrs_tbf_cmd_fini(struct nrs_tbf_cmd *cmd) { - if (cmd->tc_valid_types & NRS_TBF_FLAG_JOBID) - nrs_tbf_jobid_cmd_fini(cmd); - if (cmd->tc_valid_types & NRS_TBF_FLAG_NID) - nrs_tbf_nid_cmd_fini(cmd); + if (cmd->tc_cmd == NRS_CTL_TBF_START_RULE) { + if (cmd->u.tc_start.ts_valid_type & NRS_TBF_FLAG_JOBID) + nrs_tbf_jobid_cmd_fini(cmd); + else if (cmd->u.tc_start.ts_valid_type & NRS_TBF_FLAG_NID) + nrs_tbf_nid_cmd_fini(cmd); + } +} + +static bool name_is_valid(const char *name) +{ + int i; + + for (i = 0; i < strlen(name); i++) { + if ((!isalnum(name[i])) && + (name[i] != '_')) + return false; + } + return true; +} + +static int +nrs_tbf_parse_value_pair(struct nrs_tbf_cmd *cmd, char *buffer) +{ + char *key; + char *val; + int rc; + __u64 rate; + + val = buffer; + key = strsep(&val, "="); + if (val == NULL || strlen(val) == 0) + return -EINVAL; + + /* Key of the value pair */ + if (strcmp(key, "rate") == 0) { + rc = kstrtoull(val, 10, &rate); + if (rc) + return rc; + + if (rate <= 0 || rate >= LPROCFS_NRS_RATE_MAX) + return -EINVAL; + + if (cmd->tc_cmd == NRS_CTL_TBF_START_RULE) + cmd->u.tc_start.ts_rpc_rate = rate; + else if (cmd->tc_cmd == NRS_CTL_TBF_CHANGE_RULE) + cmd->u.tc_change.tc_rpc_rate = rate; + else + return -EINVAL; + } else { + return -EINVAL; + } + return 0; +} + +static int +nrs_tbf_parse_value_pairs(struct nrs_tbf_cmd *cmd, char *buffer) +{ + char *val; + char *token; + int rc; + + val = buffer; + while (val != NULL && strlen(val) != 0) { + token = strsep(&val, " "); + rc = nrs_tbf_parse_value_pair(cmd, token); + if (rc) + return rc; + } + + switch (cmd->tc_cmd) { + case NRS_CTL_TBF_START_RULE: + if (cmd->u.tc_start.ts_rpc_rate == 0) + cmd->u.tc_start.ts_rpc_rate = tbf_rate; + break; + case NRS_CTL_TBF_CHANGE_RULE: + if (cmd->u.tc_change.tc_rpc_rate == 0) + return -EINVAL; + break; + case NRS_CTL_TBF_STOP_RULE: + break; + default: + return -EINVAL; + } + return 0; } static struct nrs_tbf_cmd * -nrs_tbf_parse_cmd(char *buffer, unsigned long count) +nrs_tbf_parse_cmd(char *buffer, unsigned long count, __u32 type_flag) { - static struct nrs_tbf_cmd *cmd; - char *token; - char *val; - int i; - int rc = 0; + static struct nrs_tbf_cmd *cmd; + char *token; + char *val; + int rc = 0; OBD_ALLOC_PTR(cmd); if (cmd == NULL) GOTO(out, rc = -ENOMEM); + memset(cmd, 0, sizeof(*cmd)); val = buffer; token = strsep(&val, " "); @@ -1699,58 +1798,51 @@ nrs_tbf_parse_cmd(char *buffer, unsigned long count) GOTO(out_free_cmd, rc = -EINVAL); /* Type of the command */ - if (strcmp(token, "start") == 0) + if (strcmp(token, "start") == 0) { cmd->tc_cmd = NRS_CTL_TBF_START_RULE; - else if (strcmp(token, "stop") == 0) + cmd->u.tc_start.ts_valid_type = type_flag; + } else if (strcmp(token, "stop") == 0) cmd->tc_cmd = NRS_CTL_TBF_STOP_RULE; else if (strcmp(token, "change") == 0) - cmd->tc_cmd = NRS_CTL_TBF_CHANGE_RATE; + cmd->tc_cmd = NRS_CTL_TBF_CHANGE_RULE; else GOTO(out_free_cmd, rc = -EINVAL); /* Name of the rule */ token = strsep(&val, " "); - if (val == NULL) { - /** - * Stop comand only need name argument, - * But other commands need ID or rate argument. - */ - if (cmd->tc_cmd != NRS_CTL_TBF_STOP_RULE) - GOTO(out_free_cmd, rc = -EINVAL); - } - - for (i = 0; i < strlen(token); i++) { - if ((!isalnum(token[i])) && - (token[i] != '_')) - GOTO(out_free_cmd, rc = -EINVAL); - } + if ((val == NULL && cmd->tc_cmd != NRS_CTL_TBF_STOP_RULE) || + !name_is_valid(token)) + GOTO(out_free_cmd, rc = -EINVAL); cmd->tc_name = token; if (cmd->tc_cmd == NRS_CTL_TBF_START_RULE) { /* List of ID */ LASSERT(val); - rc = nrs_tbf_id_parse(cmd, &val); + token = val; + val = strrchr(token, '}'); + if (!val) + GOTO(out_free_cmd, rc = -EINVAL); + + /* Skip '}' */ + val++; + if (*val == '\0') { + val = NULL; + } else if (*val == ' ') { + *val = '\0'; + val++; + } else + GOTO(out_free_cmd, rc = -EINVAL); + + rc = nrs_tbf_id_parse(cmd, token); if (rc) GOTO(out_free_cmd, rc); } - if (val != NULL) { - if (cmd->tc_cmd == NRS_CTL_TBF_STOP_RULE || - strlen(val) == 0 || !isdigit(val[0])) - GOTO(out_free_nid, rc = -EINVAL); - - cmd->tc_rpc_rate = simple_strtoull(val, NULL, 10); - if (cmd->tc_rpc_rate <= 0 || - cmd->tc_rpc_rate >= LPROCFS_NRS_RATE_MAX) - GOTO(out_free_nid, rc = -EINVAL); - } else { - if (cmd->tc_cmd == NRS_CTL_TBF_CHANGE_RATE) - GOTO(out_free_nid, rc = -EINVAL); - /* No RPC rate given */ - cmd->tc_rpc_rate = tbf_rate; - } + rc = nrs_tbf_parse_value_pairs(cmd, val); + if (rc) + GOTO(out_cmd_fini, rc = -EINVAL); goto out; -out_free_nid: +out_cmd_fini: nrs_tbf_cmd_fini(cmd); out_free_cmd: OBD_FREE_PTR(cmd); @@ -1760,13 +1852,40 @@ out: return cmd; } +/** + * Get the TBF policy type (nid, jobid, etc) preset by + * proc entry 'nrs_policies' for command buffer parsing. + * + * \param[in] svc the PTLRPC service + * \param[in] queue the NRS queue type + * + * \retval the preset TBF policy type flag + */ +static __u32 +nrs_tbf_type_flag(struct ptlrpc_service *svc, enum ptlrpc_nrs_queue_type queue) +{ + __u32 type; + int rc; + + rc = ptlrpc_nrs_policy_control(svc, queue, + NRS_POL_NAME_TBF, + NRS_CTL_TBF_RD_TYPE_FLAG, + true, &type); + if (rc != 0) + type = NRS_TBF_FLAG_INVALID; + + return type; +} + extern struct nrs_core nrs_core; #define LPROCFS_WR_NRS_TBF_MAX_CMD (4096) -static int ptlrpc_lprocfs_wr_nrs_tbf_rule(struct file *file, - const char *buffer, - unsigned long count, void *data) +static ssize_t +ptlrpc_lprocfs_nrs_tbf_rule_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct ptlrpc_service *svc = data; + struct seq_file *m = file->private_data; + struct ptlrpc_service *svc = m->private; char *kernbuf; char *val; int rc; @@ -1808,7 +1927,7 @@ static int ptlrpc_lprocfs_wr_nrs_tbf_rule(struct file *file, else if (queue == PTLRPC_NRS_QUEUE_BOTH && !nrs_svc_has_hp(svc)) queue = PTLRPC_NRS_QUEUE_REG; - cmd = nrs_tbf_parse_cmd(val, length); + cmd = nrs_tbf_parse_cmd(val, length, nrs_tbf_type_flag(svc, queue)); if (IS_ERR(cmd)) GOTO(out_free_kernbuff, rc = PTR_ERR(cmd)); @@ -1830,7 +1949,7 @@ out_free_kernbuff: out: return rc ? rc : count; } - +LPROC_SEQ_FOPS(ptlrpc_lprocfs_nrs_tbf_rule); /** * Initializes a TBF policy's lprocfs interface for service \a svc @@ -1840,13 +1959,11 @@ out: * \retval 0 success * \retval != 0 error */ -int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc) +static int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc) { - int rc; struct lprocfs_vars nrs_tbf_lprocfs_vars[] = { { .name = "nrs_tbf_rule", - .read_fptr = ptlrpc_lprocfs_rd_nrs_tbf_rule, - .write_fptr = ptlrpc_lprocfs_wr_nrs_tbf_rule, + .fops = &ptlrpc_lprocfs_nrs_tbf_rule_fops, .data = svc }, { NULL } }; @@ -1854,9 +1971,7 @@ int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc) if (svc->srv_procroot == NULL) return 0; - rc = lprocfs_add_vars(svc->srv_procroot, nrs_tbf_lprocfs_vars, NULL); - - return rc; + return lprocfs_add_vars(svc->srv_procroot, nrs_tbf_lprocfs_vars, NULL); } /** @@ -1864,15 +1979,15 @@ int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc) * * \param[in] svc the service */ -void nrs_tbf_lprocfs_fini(struct ptlrpc_service *svc) +static void nrs_tbf_lprocfs_fini(struct ptlrpc_service *svc) { if (svc->srv_procroot == NULL) return; - lprocfs_remove_proc_entry("nrs_tbf_quantum", svc->srv_procroot); + lprocfs_remove_proc_entry("nrs_tbf_rule", svc->srv_procroot); } -#endif /* LPROCFS */ +#endif /* CONFIG_PROC_FS */ /** * TBF policy operations @@ -1887,7 +2002,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 LPROCFS +#ifdef CONFIG_PROC_FS .op_lprocfs_init = nrs_tbf_lprocfs_init, .op_lprocfs_fini = nrs_tbf_lprocfs_fini, #endif