Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/57376/?format=api
{ "id": 57376, "url": "https://patches.dpdk.org/api/patches/57376/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190802025826.1174-2-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190802025826.1174-2-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190802025826.1174-2-stephen@networkplumber.org", "date": "2019-08-02T02:58:23", "name": "[v5,1/4] examples/multi_process/client_server_mp: check port validity", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1224855f9e65c83cedf04ba01a4ec1873c0a570c", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190802025826.1174-2-stephen@networkplumber.org/mbox/", "series": [ { "id": 5881, "url": "https://patches.dpdk.org/api/series/5881/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5881", "date": "2019-08-02T02:58:22", "name": "examples/client_server_mp: port id fixes", "version": 5, "mbox": "https://patches.dpdk.org/series/5881/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/57376/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/57376/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9C4751C203;\n\tFri, 2 Aug 2019 04:58:33 +0200 (CEST)", "from mail-pg1-f196.google.com (mail-pg1-f196.google.com\n\t[209.85.215.196]) by dpdk.org (Postfix) with ESMTP id AF7A61C1F1\n\tfor <dev@dpdk.org>; Fri, 2 Aug 2019 04:58:30 +0200 (CEST)", "by mail-pg1-f196.google.com with SMTP id f5so26463451pgu.5\n\tfor <dev@dpdk.org>; Thu, 01 Aug 2019 19:58:30 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\ta20sm5788738pjo.0.2019.08.01.19.58.28\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tThu, 01 Aug 2019 19:58:28 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=zc5wLVYzGdBzMnqa1CvBFKrqffPTJWatPwgXmOWAuj4=;\n\tb=zL6Quq7+CyS1AGwVYUCnS6LOjTsCa0FwNcoe1p34uKrMYfGxDCjDYWhznK9gbVucDW\n\trOA7Z97fxtWX6UPiHxRXzgUXQClwKn7+wkdyraFKt+3YE+9XtbiUtbe0x0xqkXz/vqdo\n\tRDtVD2p9roFBqnLJZuBKGx/mGFHPKN8ZE6s1LN8B+GBiFrZOEBF1zffDNLCkXoW9I0EU\n\tNJK5on+/VuyCReJ85DOOzOM2/Ots4qiIP72l04vowfgM76WGIluNGiXTeQvihe1zl/Sx\n\tuvI0Ytjhbn+zDce71FjV77akgz4jYLQaBPcniKTvl7pYg/WFHZVevkhWGIK7Y/DfJnIa\n\twiRA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=zc5wLVYzGdBzMnqa1CvBFKrqffPTJWatPwgXmOWAuj4=;\n\tb=BXzhWh/9skUmvJE1frsoyUslxXIXeLQ//EV2RMbkJXy1ArdKMCSm1L2Z3G1RGL/YRz\n\tqAFwxBpuVggQkgrmfrbpIsbg8ud3yH8oEF7K45wg7dDw+TxSYGTr/c++nIDOzwYyjUkN\n\twfDuJCGtboctRMV5aSY+AyRUEIumHuaaz3MoID5OpAEsvT7Jiy5oByOPnnwykQPHtb1j\n\tGbV6eNcTxYbXg2j4MfIi+YKpnUOeKEePPn2FhwPgGgwh7U8WZWiLVSwBz0ncnji/I3BE\n\tP8vf8+4JhZZM6UsoXVn/lTwRrvC2pOh9KyP3TcWuVv9FF71ndmZiifI82y0xHY04lP/C\n\tH68Q==", "X-Gm-Message-State": "APjAAAXPTZe8tlZGDL8M4Teu8oxWY+J7EeCLWBDEPJP577pm6BOtmtwP\n\twlqhxOxbuudI8gd5nU0PXaTDnOM6", "X-Google-Smtp-Source": "APXvYqzdvvvOR5Prqc6TblvlYVFc9WxltU5/EShM+daoh51zGz7lLYQ+db+d7sWFupvL+3lYAwA8Dg==", "X-Received": "by 2002:a17:90a:9bc5:: with SMTP id\n\tb5mr1993643pjw.109.1564714709545; \n\tThu, 01 Aug 2019 19:58:29 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <sthemmin@microsoft.com>", "Date": "Thu, 1 Aug 2019 19:58:23 -0700", "Message-Id": "<20190802025826.1174-2-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190802025826.1174-1-stephen@networkplumber.org>", "References": "<20190726165054.24078-1-stephen@networkplumber.org>\n\t<20190802025826.1174-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v5 1/4] examples/multi_process/client_server_mp:\n\tcheck port validity", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Stephen Hemminger <sthemmin@microsoft.com>\n\nThe mp_server incorrectly allows a port mask that included hidden\nports and which later caused either lost packets or failed initialization.\n\nThis fixes explicitly checking that each bit in portmask is a\nvalid port before using it.\n\nFixes: 5b7ba31148a8 (\"ethdev: add port ownership\")\nSigned-off-by: Stephen Hemminger <sthemmin@microsoft.com>\n---\n .../client_server_mp/mp_server/args.c | 35 ++++++++++---------\n .../client_server_mp/mp_server/args.h | 2 +-\n .../client_server_mp/mp_server/init.c | 7 ++--\n 3 files changed, 22 insertions(+), 22 deletions(-)", "diff": "diff --git a/examples/multi_process/client_server_mp/mp_server/args.c b/examples/multi_process/client_server_mp/mp_server/args.c\nindex b0d8d7665c85..fdc008b3d677 100644\n--- a/examples/multi_process/client_server_mp/mp_server/args.c\n+++ b/examples/multi_process/client_server_mp/mp_server/args.c\n@@ -10,6 +10,7 @@\n #include <errno.h>\n \n #include <rte_memory.h>\n+#include <rte_ethdev.h>\n #include <rte_string_fns.h>\n \n #include \"common.h\"\n@@ -41,31 +42,33 @@ usage(void)\n * array variable\n */\n static int\n-parse_portmask(uint8_t max_ports, const char *portmask)\n+parse_portmask(const char *portmask)\n {\n \tchar *end = NULL;\n \tunsigned long pm;\n-\tuint16_t count = 0;\n+\tuint16_t id;\n \n \tif (portmask == NULL || *portmask == '\\0')\n \t\treturn -1;\n \n \t/* convert parameter to a number and verify */\n \tpm = strtoul(portmask, &end, 16);\n-\tif (end == NULL || *end != '\\0' || pm == 0)\n+\tif (end == NULL || *end != '\\0' || pm > UINT16_MAX || pm == 0)\n \t\treturn -1;\n \n-\t/* loop through bits of the mask and mark ports */\n-\twhile (pm != 0){\n-\t\tif (pm & 0x01){ /* bit is set in mask, use port */\n-\t\t\tif (count >= max_ports)\n-\t\t\t\tprintf(\"WARNING: requested port %u not present\"\n-\t\t\t\t\" - ignoring\\n\", (unsigned)count);\n-\t\t\telse\n-\t\t\t ports->id[ports->num_ports++] = count;\n-\t\t}\n-\t\tpm = (pm >> 1);\n-\t\tcount++;\n+\tRTE_ETH_FOREACH_DEV(id) {\n+\t\tunsigned long msk = 1u << id;\n+\n+\t\tif ((pm & msk) == 0)\n+\t\t\tcontinue;\n+\n+\t\tpm &= ~msk;\n+\t\tports->id[ports->num_ports++] = id;\n+\t}\n+\n+\tif (pm != 0) {\n+\t\tprintf(\"WARNING: leftover ports in mask %#lx - ignoring\\n\",\n+\t\t pm);\n \t}\n \n \treturn 0;\n@@ -99,7 +102,7 @@ parse_num_clients(const char *clients)\n * on error.\n */\n int\n-parse_app_args(uint16_t max_ports, int argc, char *argv[])\n+parse_app_args(int argc, char *argv[])\n {\n \tint option_index, opt;\n \tchar **argvopt = argv;\n@@ -112,7 +115,7 @@ parse_app_args(uint16_t max_ports, int argc, char *argv[])\n \t\t&option_index)) != EOF){\n \t\tswitch (opt){\n \t\t\tcase 'p':\n-\t\t\t\tif (parse_portmask(max_ports, optarg) != 0){\n+\t\t\t\tif (parse_portmask(optarg) != 0) {\n \t\t\t\t\tusage();\n \t\t\t\t\treturn -1;\n \t\t\t\t}\ndiff --git a/examples/multi_process/client_server_mp/mp_server/args.h b/examples/multi_process/client_server_mp/mp_server/args.h\nindex 79c190a33a37..52c8cc86e6f0 100644\n--- a/examples/multi_process/client_server_mp/mp_server/args.h\n+++ b/examples/multi_process/client_server_mp/mp_server/args.h\n@@ -5,6 +5,6 @@\n #ifndef _ARGS_H_\n #define _ARGS_H_\n \n-int parse_app_args(uint16_t max_ports, int argc, char *argv[]);\n+int parse_app_args(int argc, char *argv[]);\n \n #endif /* ifndef _ARGS_H_ */\ndiff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c\nindex 3af5dc6994bf..1b0569937b51 100644\n--- a/examples/multi_process/client_server_mp/mp_server/init.c\n+++ b/examples/multi_process/client_server_mp/mp_server/init.c\n@@ -238,7 +238,7 @@ init(int argc, char *argv[])\n {\n \tint retval;\n \tconst struct rte_memzone *mz;\n-\tuint16_t i, total_ports;\n+\tuint16_t i;\n \n \t/* init EAL, parsing EAL args */\n \tretval = rte_eal_init(argc, argv);\n@@ -247,9 +247,6 @@ init(int argc, char *argv[])\n \targc -= retval;\n \targv += retval;\n \n-\t/* get total number of ports */\n-\ttotal_ports = rte_eth_dev_count_total();\n-\n \t/* set up array for port data */\n \tmz = rte_memzone_reserve(MZ_PORT_INFO, sizeof(*ports),\n \t\t\t\trte_socket_id(), NO_FLAGS);\n@@ -259,7 +256,7 @@ init(int argc, char *argv[])\n \tports = mz->addr;\n \n \t/* parse additional, application arguments */\n-\tretval = parse_app_args(total_ports, argc, argv);\n+\tretval = parse_app_args(argc, argv);\n \tif (retval != 0)\n \t\treturn -1;\n \n", "prefixes": [ "v5", "1/4" ] }