{"id":815174,"url":"http://patchwork.ozlabs.org/api/patches/815174/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918210711.10202-3-fw@strlen.de/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918210711.10202-3-fw@strlen.de>","list_archive_url":null,"date":"2017-09-18T21:07:09","name":"[net-next,2/4] test_rhashtable: don't use global entries variable","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"5d0bd0263a38b410b2e2a78892cf626afc6c7731","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918210711.10202-3-fw@strlen.de/mbox/","series":[{"id":3736,"url":"http://patchwork.ozlabs.org/api/series/3736/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3736","date":"2017-09-18T21:07:07","name":"test_rhashtable: add test case for rhl table","version":1,"mbox":"http://patchwork.ozlabs.org/series/3736/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815174/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815174/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwz8m5tvkz9s7m\n\tfor ;\n\tTue, 19 Sep 2017 07:07:04 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751457AbdIRVHC (ORCPT );\n\tMon, 18 Sep 2017 17:07:02 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:51754 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1750972AbdIRVHA (ORCPT\n\t); Mon, 18 Sep 2017 17:07:00 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1du3Ci-0008Bq-MF; Mon, 18 Sep 2017 23:03:44 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next 2/4] test_rhashtable: don't use global entries\n\tvariable","Date":"Mon, 18 Sep 2017 23:07:09 +0200","Message-Id":"<20170918210711.10202-3-fw@strlen.de>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170918210711.10202-1-fw@strlen.de>","References":"<20170918210711.10202-1-fw@strlen.de>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"pass the entries to test as an argument instead.\nFollowup patch will add an rhlist test case; rhlist delete opererations\nare slow so we need to use a smaller number to test it.\n\nSigned-off-by: Florian Westphal \n---\n lib/test_rhashtable.c | 37 +++++++++++++++++++++++--------------\n 1 file changed, 23 insertions(+), 14 deletions(-)","diff":"diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c\nindex c40d6e636f33..69f5b3849980 100644\n--- a/lib/test_rhashtable.c\n+++ b/lib/test_rhashtable.c\n@@ -28,9 +28,9 @@\n #define MAX_ENTRIES\t1000000\n #define TEST_INSERT_FAIL INT_MAX\n \n-static int entries = 50000;\n-module_param(entries, int, 0);\n-MODULE_PARM_DESC(entries, \"Number of entries to add (default: 50000)\");\n+static int parm_entries = 50000;\n+module_param(parm_entries, int, 0);\n+MODULE_PARM_DESC(parm_entries, \"Number of entries to add (default: 50000)\");\n \n static int runs = 4;\n module_param(runs, int, 0);\n@@ -67,6 +67,7 @@ struct test_obj {\n };\n \n struct thread_data {\n+\tunsigned int entries;\n \tint id;\n \tstruct task_struct *task;\n \tstruct test_obj *objs;\n@@ -105,11 +106,12 @@ static int insert_retry(struct rhashtable *ht, struct test_obj *obj,\n \treturn err ? : retries;\n }\n \n-static int __init test_rht_lookup(struct rhashtable *ht, struct test_obj *array)\n+static int __init test_rht_lookup(struct rhashtable *ht, struct test_obj *array,\n+\t\t\t\t unsigned int entries)\n {\n \tunsigned int i;\n \n-\tfor (i = 0; i < entries * 2; i++) {\n+\tfor (i = 0; i < entries; i++) {\n \t\tstruct test_obj *obj;\n \t\tbool expected = !(i % 2);\n \t\tstruct test_obj_val key = {\n@@ -142,7 +144,7 @@ static int __init test_rht_lookup(struct rhashtable *ht, struct test_obj *array)\n \treturn 0;\n }\n \n-static void test_bucket_stats(struct rhashtable *ht)\n+static void test_bucket_stats(struct rhashtable *ht, unsigned int entries)\n {\n \tunsigned int err, total = 0, chain_len = 0;\n \tstruct rhashtable_iter hti;\n@@ -184,7 +186,8 @@ static void test_bucket_stats(struct rhashtable *ht)\n \t\tpr_warn(\"Test failed: Total count mismatch ^^^\");\n }\n \n-static s64 __init test_rhashtable(struct rhashtable *ht, struct test_obj *array)\n+static s64 __init test_rhashtable(struct rhashtable *ht, struct test_obj *array,\n+\t\t\t\t unsigned int entries)\n {\n \tstruct test_obj *obj;\n \tint err;\n@@ -212,12 +215,12 @@ static s64 __init test_rhashtable(struct rhashtable *ht, struct test_obj *array)\n \t\tpr_info(\" %u insertions retried due to memory pressure\\n\",\n \t\t\tinsert_retries);\n \n-\ttest_bucket_stats(ht);\n+\ttest_bucket_stats(ht, entries);\n \trcu_read_lock();\n-\ttest_rht_lookup(ht, array);\n+\ttest_rht_lookup(ht, array, entries);\n \trcu_read_unlock();\n \n-\ttest_bucket_stats(ht);\n+\ttest_bucket_stats(ht, entries);\n \n \tpr_info(\" Deleting %d keys\\n\", entries);\n \tfor (i = 0; i < entries; i++) {\n@@ -245,6 +248,7 @@ static struct rhashtable ht;\n \n static int thread_lookup_test(struct thread_data *tdata)\n {\n+\tunsigned int entries = tdata->entries;\n \tint i, err = 0;\n \n \tfor (i = 0; i < entries; i++) {\n@@ -281,7 +285,7 @@ static int threadfunc(void *data)\n \tif (down_interruptible(&startup_sem))\n \t\tpr_err(\" thread[%d]: down_interruptible failed\\n\", tdata->id);\n \n-\tfor (i = 0; i < entries; i++) {\n+\tfor (i = 0; i < tdata->entries; i++) {\n \t\ttdata->objs[i].value.id = i;\n \t\ttdata->objs[i].value.tid = tdata->id;\n \t\terr = insert_retry(&ht, &tdata->objs[i], test_rht_params);\n@@ -305,7 +309,7 @@ static int threadfunc(void *data)\n \t}\n \n \tfor (step = 10; step > 0; step--) {\n-\t\tfor (i = 0; i < entries; i += step) {\n+\t\tfor (i = 0; i < tdata->entries; i += step) {\n \t\t\tif (tdata->objs[i].value.id == TEST_INSERT_FAIL)\n \t\t\t\tcontinue;\n \t\t\terr = rhashtable_remove_fast(&ht, &tdata->objs[i].node,\n@@ -336,12 +340,16 @@ static int threadfunc(void *data)\n \n static int __init test_rht_init(void)\n {\n+\tunsigned int entries;\n \tint i, err, started_threads = 0, failed_threads = 0;\n \tu64 total_time = 0;\n \tstruct thread_data *tdata;\n \tstruct test_obj *objs;\n \n-\tentries = min(entries, MAX_ENTRIES);\n+\tif (parm_entries < 0)\n+\t\tparm_entries = 1;\n+\n+\tentries = min(parm_entries, MAX_ENTRIES);\n \n \ttest_rht_params.automatic_shrinking = shrinking;\n \ttest_rht_params.max_size = max_size ? : roundup_pow_of_two(entries);\n@@ -367,7 +375,7 @@ static int __init test_rht_init(void)\n \t\t\tcontinue;\n \t\t}\n \n-\t\ttime = test_rhashtable(&ht, objs);\n+\t\ttime = test_rhashtable(&ht, objs, entries);\n \t\trhashtable_destroy(&ht);\n \t\tif (time < 0) {\n \t\t\tvfree(objs);\n@@ -409,6 +417,7 @@ static int __init test_rht_init(void)\n \t}\n \tfor (i = 0; i < tcount; i++) {\n \t\ttdata[i].id = i;\n+\t\ttdata[i].entries = entries;\n \t\ttdata[i].objs = objs + i * entries;\n \t\ttdata[i].task = kthread_run(threadfunc, &tdata[i],\n \t\t \"rhashtable_thrad[%d]\", i);\n","prefixes":["net-next","2/4"]}