{"id":806599,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806599/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/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},"msgid":"<20170828141241.14143.90704.stgit@john-Precision-Tower-5810>","date":"2017-08-28T14:12:41","name":"[net-next,9/9] bpf: test_maps add sockmap stress test","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"17349304131fb9763e7b94fc56f2ee7778425a78","submitter":{"id":20028,"url":"http://patchwork.ozlabs.org/api/1.0/people/20028/?format=json","name":"John Fastabend","email":"john.fastabend@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828141241.14143.90704.stgit@john-Precision-Tower-5810/mbox/","series":[{"id":179,"url":"http://patchwork.ozlabs.org/api/1.0/series/179/?format=json","date":"2017-08-28T14:09:45","name":"sockmap UAPI updates and fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/179/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806599/checks/","tags":{},"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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"I5kNtbgx\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgtyg4xb2z9s7m\n\tfor ;\n\tTue, 29 Aug 2017 00:12:59 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751391AbdH1OM5 (ORCPT );\n\tMon, 28 Aug 2017 10:12:57 -0400","from mail-pg0-f67.google.com ([74.125.83.67]:36501 \"EHLO\n\tmail-pg0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751170AbdH1OM4 (ORCPT\n\t); Mon, 28 Aug 2017 10:12:56 -0400","by mail-pg0-f67.google.com with SMTP id 83so458599pgb.3\n\tfor ; Mon, 28 Aug 2017 07:12:56 -0700 (PDT)","from [127.0.1.1] ([72.168.144.1]) by smtp.gmail.com with ESMTPSA id\n\tg5sm840144pgc.94.2017.08.28.07.12.48\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 07:12:55 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=subject:from:to:cc:date:message-id:in-reply-to:references\n\t:user-agent:mime-version:content-transfer-encoding;\n\tbh=yiBxN4/7hl3sVUfvSf2U1M/tcC988BTyT/i1bYkFkoU=;\n\tb=I5kNtbgx38b5i2NG7/t4tv/0yoauDD1/4hKwzRBEvBuNktoRivIRSDbmII0/BMQIyM\n\tGB4dfm18U8GJ/LxMpTEr+uqgUwW2FI7SdXnMe52EZN2kLVn76JSxvMZBY5wI2HMO8i1z\n\tkP/mANr2f0Sb1WbQ3OsCYQ8bqtj1IQx+ZmG5cWm3CWEfuz4Vv12+DDhCaDcX/lBqihPd\n\t1cv1z7EQnxrYjCQCJRTY8fJgrKWAyZsq8yrrlpVz2QWg2ndaPs9hSblmsq0uAytv+AxO\n\tlMtlIBCoQcTa5q2Nq5vjU7PSc4tQ4gVzxVTcR7G1xsORKCnQqYaJDRHSqcXlzScsQBRz\n\t2Zmg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-transfer-encoding;\n\tbh=yiBxN4/7hl3sVUfvSf2U1M/tcC988BTyT/i1bYkFkoU=;\n\tb=jc+66zV0UeI/VczEGVGOlRKqEYIzE2a4tFFqtVcV7Iv1x3d/fCL5VBVuFNQBQi6dQP\n\t/avTJ5qhB4L5lRy3BZ/9v6dOGXiTGX7tkkOe/jOYkS6IaekatDc7cRHjGRhrnSbWAYqc\n\tE/Ko5lWXOySHuSvtr14qZPTCfezeZP3V7BYXMySUzAQXoXL+2h6qKl3LrYo8CL+AL8zi\n\tQb5DA869hEzFXgx0gZXso6uMMlEyvPM/mADmxtVtOlGTSMtMX+kFQ/JBOpWIDf1qg0yn\n\t25KjkoH67GPj1ltFnZQ+le/rzCG/6AEg0cBxxzAlKAvk3KqB/9DrucN0/m0FFG7rg88b\n\t1kHw==","X-Gm-Message-State":"AHYfb5iNoAvxoWbk76J6ramosL2XNssJ27DH/YDNGW6CdHc2DuCExXjq\n\tPr9WZpRhazXHmCBL","X-Received":"by 10.84.224.70 with SMTP id a6mr909360plt.96.1503929576062;\n\tMon, 28 Aug 2017 07:12:56 -0700 (PDT)","Subject":"[net-next PATCH 9/9] bpf: test_maps add sockmap stress test","From":"John Fastabend ","To":"ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net","Cc":"netdev@vger.kernel.org, john.fastabend@gmail.com","Date":"Mon, 28 Aug 2017 07:12:41 -0700","Message-ID":"<20170828141241.14143.90704.stgit@john-Precision-Tower-5810>","In-Reply-To":"<20170828140850.14143.83953.stgit@john-Precision-Tower-5810>","References":"<20170828140850.14143.83953.stgit@john-Precision-Tower-5810>","User-Agent":"StGit/0.17.1-dirty","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Sockmap is a bit different than normal stress tests that can run\nin parallel as is. We need to reuse the same socket pool and map\npool to get good stress test cases.\n\nSigned-off-by: John Fastabend \n---\n tools/testing/selftests/bpf/test_maps.c | 29 ++++++++++++++++++++++++++++-\n 1 file changed, 28 insertions(+), 1 deletion(-)","diff":"diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c\nindex 0c4b56d..7059bb3 100644\n--- a/tools/testing/selftests/bpf/test_maps.c\n+++ b/tools/testing/selftests/bpf/test_maps.c\n@@ -461,7 +461,7 @@ static void test_devmap(int task, void *data)\n #include \n #define SOCKMAP_PARSE_PROG \"./sockmap_parse_prog.o\"\n #define SOCKMAP_VERDICT_PROG \"./sockmap_verdict_prog.o\"\n-static void test_sockmap(int task, void *data)\n+static void test_sockmap(int tasks, void *data)\n {\n \tint one = 1, map_fd_rx, map_fd_tx, map_fd_break, s, sc, rc;\n \tstruct bpf_map *bpf_map_rx, *bpf_map_tx, *bpf_map_break;\n@@ -473,6 +473,7 @@ static void test_sockmap(int task, void *data)\n \tstruct bpf_object *obj;\n \tstruct timeval to;\n \t__u32 key, value;\n+\tpid_t pid[tasks];\n \tfd_set w;\n \n \t/* Create some sockets to use with sockmap */\n@@ -782,6 +783,32 @@ static void test_sockmap(int task, void *data)\n \t\t}\n \t}\n \n+\t/* Test tasks number of forked operations */\n+\tfor (i = 0; i < tasks; i++) {\n+\t\tpid[i] = fork();\n+\t\tif (pid[i] == 0) {\n+\t\t\tfor (i = 0; i < 6; i++) {\n+\t\t\t\tbpf_map_delete_elem(map_fd_tx, &i);\n+\t\t\t\tbpf_map_delete_elem(map_fd_rx, &i);\n+\t\t\t\tbpf_map_update_elem(map_fd_tx, &i,\n+\t\t\t\t\t\t &sfd[i], BPF_ANY);\n+\t\t\t\tbpf_map_update_elem(map_fd_rx, &i,\n+\t\t\t\t\t\t &sfd[i], BPF_ANY);\n+\t\t\t}\n+\t\t\texit(0);\n+\t\t} else if (pid[i] == -1) {\n+\t\t\tprintf(\"Couldn't spawn #%d process!\\n\", i);\n+\t\t\texit(1);\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < tasks; i++) {\n+\t\tint status;\n+\n+\t\tassert(waitpid(pid[i], &status, 0) == pid[i]);\n+\t\tassert(status == 0);\n+\t}\n+\n \t/* Test map close sockets */\n \tfor (i = 0; i < 6; i++)\n \t\tclose(sfd[i]);\n","prefixes":["net-next","9/9"]}