{"id":815173,"url":"http://patchwork.ozlabs.org/api/patches/815173/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918210711.10202-2-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-2-fw@strlen.de>","list_archive_url":null,"date":"2017-09-18T21:07:08","name":"[net-next,1/4] test_rhashtable: don't allocate huge static array","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"7b621639a1cf374702d1712503370e7cc36f3613","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-2-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/815173/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815173/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 3xwz8j2CLcz9s7m\n\tfor ;\n\tTue, 19 Sep 2017 07:07:01 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751365AbdIRVG7 (ORCPT );\n\tMon, 18 Sep 2017 17:06:59 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:51750 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1750972AbdIRVG6 (ORCPT\n\t); Mon, 18 Sep 2017 17:06:58 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1du3Cf-0008Bc-CE; Mon, 18 Sep 2017 23:03:41 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH net-next 1/4] test_rhashtable: don't allocate huge static\n\tarray","Date":"Mon, 18 Sep 2017 23:07:08 +0200","Message-Id":"<20170918210711.10202-2-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":"Signed-off-by: Florian Westphal \n---\n lib/test_rhashtable.c | 27 ++++++++++++++++-----------\n 1 file changed, 16 insertions(+), 11 deletions(-)","diff":"diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c\nindex 0ffca990a833..c40d6e636f33 100644\n--- a/lib/test_rhashtable.c\n+++ b/lib/test_rhashtable.c\n@@ -72,8 +72,6 @@ struct thread_data {\n \tstruct test_obj *objs;\n };\n \n-static struct test_obj array[MAX_ENTRIES];\n-\n static struct rhashtable_params test_rht_params = {\n \t.head_offset = offsetof(struct test_obj, node),\n \t.key_offset = offsetof(struct test_obj, value),\n@@ -85,7 +83,7 @@ static struct rhashtable_params test_rht_params = {\n static struct semaphore prestart_sem;\n static struct semaphore startup_sem = __SEMAPHORE_INITIALIZER(startup_sem, 0);\n \n-static int insert_retry(struct rhashtable *ht, struct rhash_head *obj,\n+static int insert_retry(struct rhashtable *ht, struct test_obj *obj,\n const struct rhashtable_params params)\n {\n \tint err, retries = -1, enomem_retries = 0;\n@@ -93,7 +91,7 @@ static int insert_retry(struct rhashtable *ht, struct rhash_head *obj,\n \tdo {\n \t\tretries++;\n \t\tcond_resched();\n-\t\terr = rhashtable_insert_fast(ht, obj, params);\n+\t\terr = rhashtable_insert_fast(ht, &obj->node, params);\n \t\tif (err == -ENOMEM && enomem_retry) {\n \t\t\tenomem_retries++;\n \t\t\terr = -EBUSY;\n@@ -107,7 +105,7 @@ static int insert_retry(struct rhashtable *ht, struct rhash_head *obj,\n \treturn err ? : retries;\n }\n \n-static int __init test_rht_lookup(struct rhashtable *ht)\n+static int __init test_rht_lookup(struct rhashtable *ht, struct test_obj *array)\n {\n \tunsigned int i;\n \n@@ -186,7 +184,7 @@ 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)\n+static s64 __init test_rhashtable(struct rhashtable *ht, struct test_obj *array)\n {\n \tstruct test_obj *obj;\n \tint err;\n@@ -203,7 +201,7 @@ static s64 __init test_rhashtable(struct rhashtable *ht)\n \t\tstruct test_obj *obj = &array[i];\n \n \t\tobj->value.id = i * 2;\n-\t\terr = insert_retry(ht, &obj->node, test_rht_params);\n+\t\terr = insert_retry(ht, obj, test_rht_params);\n \t\tif (err > 0)\n \t\t\tinsert_retries += err;\n \t\telse if (err)\n@@ -216,7 +214,7 @@ static s64 __init test_rhashtable(struct rhashtable *ht)\n \n \ttest_bucket_stats(ht);\n \trcu_read_lock();\n-\ttest_rht_lookup(ht);\n+\ttest_rht_lookup(ht, array);\n \trcu_read_unlock();\n \n \ttest_bucket_stats(ht);\n@@ -286,7 +284,7 @@ static int threadfunc(void *data)\n \tfor (i = 0; i < 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].node, test_rht_params);\n+\t\terr = insert_retry(&ht, &tdata->objs[i], test_rht_params);\n \t\tif (err > 0) {\n \t\t\tinsert_retries += err;\n \t\t} else if (err) {\n@@ -349,6 +347,10 @@ static int __init test_rht_init(void)\n \ttest_rht_params.max_size = max_size ? : roundup_pow_of_two(entries);\n \ttest_rht_params.nelem_hint = size;\n \n+\tobjs = vzalloc((test_rht_params.max_size + 1) * sizeof(struct test_obj));\n+\tif (!objs)\n+\t\treturn -ENOMEM;\n+\n \tpr_info(\"Running rhashtable test nelem=%d, max_size=%d, shrinking=%d\\n\",\n \t\tsize, max_size, shrinking);\n \n@@ -356,7 +358,8 @@ static int __init test_rht_init(void)\n \t\ts64 time;\n \n \t\tpr_info(\"Test %02d:\\n\", i);\n-\t\tmemset(&array, 0, sizeof(array));\n+\t\tmemset(objs, 0, test_rht_params.max_size * sizeof(struct test_obj));\n+\n \t\terr = rhashtable_init(&ht, &test_rht_params);\n \t\tif (err < 0) {\n \t\t\tpr_warn(\"Test failed: Unable to initialize hashtable: %d\\n\",\n@@ -364,9 +367,10 @@ static int __init test_rht_init(void)\n \t\t\tcontinue;\n \t\t}\n \n-\t\ttime = test_rhashtable(&ht);\n+\t\ttime = test_rhashtable(&ht, objs);\n \t\trhashtable_destroy(&ht);\n \t\tif (time < 0) {\n+\t\t\tvfree(objs);\n \t\t\tpr_warn(\"Test failed: return code %lld\\n\", time);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -374,6 +378,7 @@ static int __init test_rht_init(void)\n \t\ttotal_time += time;\n \t}\n \n+\tvfree(objs);\n \tdo_div(total_time, runs);\n \tpr_info(\"Average test time: %llu\\n\", total_time);\n \n","prefixes":["net-next","1/4"]}