Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56274/?format=api
{ "id": 56274, "url": "https://patches.dpdk.org/api/patches/56274/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190709150939.31338-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": "<20190709150939.31338-2-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190709150939.31338-2-stephen@networkplumber.org", "date": "2019-07-09T15:09:38", "name": "[v3,1/2] examples/multi_process/client_server_mp: check port validity", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2dd965b8e4429af620e57ef9bb0e4b751243f851", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190709150939.31338-2-stephen@networkplumber.org/mbox/", "series": [ { "id": 5415, "url": "https://patches.dpdk.org/api/series/5415/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5415", "date": "2019-07-09T15:09:37", "name": "examples/client_server_mp: fix port issues", "version": 3, "mbox": "https://patches.dpdk.org/series/5415/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/56274/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/56274/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 223DC1B9A0;\n\tTue, 9 Jul 2019 17:09:51 +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 AE2CA1B953\n\tfor <dev@dpdk.org>; Tue, 9 Jul 2019 17:09:48 +0200 (CEST)", "by mail-pg1-f196.google.com with SMTP id i8so9573717pgm.13\n\tfor <dev@dpdk.org>; Tue, 09 Jul 2019 08:09:48 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\tu134sm20151651pfc.19.2019.07.09.08.09.46\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tTue, 09 Jul 2019 08:09:46 -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=NEwn2g5KMCliJZJpH/uXb4rAe7OM6z/ENb5rgyMvqLk=;\n\tb=hZvO3g+6Bm5PV00iIjxPEC57eq6kf+xMjuBvAJzezjlPayisMSC70VbU4cX6yB8xCV\n\t6iPZMFR1RikRKPEL76CAdFpzoZ3zNWVQFlqxl9oXgzKXrHPRcmIyoKGv+umh7Q9B/0WQ\n\tOyYEcSi1pXszyQkGwxwpGSswV7pWlXhepZrkgDS/v5879bGk2s8Olmu6UIWqzAO2/7vD\n\tCIUv+bvMOa8abMFErzGekGR5O7KN3440NF9qZATeVdmnl29VXR/LaBZtfyrP+/3eEwO7\n\tAnMwpA3fIUm7eeQUbz+6S5L8mYi4qrROw95v8ExkVuAJCy5NLaxUVF9Wy1iIrQGBoL60\n\teWpw==", "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=NEwn2g5KMCliJZJpH/uXb4rAe7OM6z/ENb5rgyMvqLk=;\n\tb=aw98TZM0UJKoCOUowXRNabi6L6+Xr5lMno3jDVMqx1CO9UDM8U99mvt0ecT3ppQBlL\n\tin8OgLgJQ0rKmzMrVK+xN4o8tD7uBvrEZ+YC5tDchyl5bcGrifBV8VvII/IsoDPuMTgz\n\tQkogiCL5ZMEESFKWmncEdKW81LDgYbGBZT9JXDcjLM+8phNw7spZ7pKIDHweXTIrv2+z\n\tHvh81DFQ5Ovv4dVrCDh74iyrjHXSr/3lIGOu8NMlMsTc9HGUw82EEi97YQjYun1i73LO\n\t2ZXPrCrtlGRgyzc3Skfrr7c97+WlmlsP3Jjbxxifwin8p1Rpair5+20bazloxIBBhRCt\n\twcgA==", "X-Gm-Message-State": "APjAAAVy5kZXySQGlLGHfVxBxKyEToswNRNyIwflRgKPTrW3F1jMNlVy\n\tZHXFCioLPpg8S/w7HzPurP1zV2sO8YQ=", "X-Google-Smtp-Source": "APXvYqwkeKX85KZo8Ef32lEEi5h9nUENZ3Fth4Nv8+QIXZb8tH0cpWPG57QhB8uAH5/GHFZ69S3VYA==", "X-Received": "by 2002:a17:90a:270f:: with SMTP id\n\to15mr669855pje.56.1562684987618; \n\tTue, 09 Jul 2019 08:09:47 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <sthemmin@microsoft.com>", "Date": "Tue, 9 Jul 2019 08:09:38 -0700", "Message-Id": "<20190709150939.31338-2-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190709150939.31338-1-stephen@networkplumber.org>", "References": "<20190709150939.31338-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 1/2] 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\nThe max_ports parameter is no longer necessary, so remove it\nfrom the caller.\n\nFixes: 5b7ba31148a8 (\"ethdev: add port ownership\")\nSigned-off-by: Stephen Hemminger <sthemmin@microsoft.com>\n---\n .../client_server_mp/mp_server/args.c | 46 +++++++++++++------\n .../client_server_mp/mp_server/args.h | 2 +-\n .../client_server_mp/mp_server/init.c | 7 +--\n 3 files changed, 35 insertions(+), 20 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..1d52489347df 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@@ -34,6 +35,22 @@ usage(void)\n \t , progname);\n }\n \n+/**\n+ * Check if port is present in the system\n+ * It maybe owned by a device and should not be used.\n+ */\n+static int\n+port_is_present(uint16_t portid)\n+{\n+\tuint16_t id;\n+\n+\tRTE_ETH_FOREACH_DEV(id) {\n+\t\tif (id == portid)\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n /**\n * The ports to be used by the application are passed in\n * the form of a bitmask. This function parses the bitmask\n@@ -41,31 +58,32 @@ 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 count;\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+\tfor (count = 0; pm != 0; pm >>= 1, ++count) {\n+\t\tif ((pm & 0x1) == 0)\n+\t\t\tcontinue;\n+\n+\t\tif (!port_is_present(count)) {\n+\t\t\tprintf(\"WARNING: requested port %u not present - ignoring\\n\",\n+\t\t\t\tcount);\n+\t\t\tcontinue;\n \t\t}\n-\t\tpm = (pm >> 1);\n-\t\tcount++;\n+\n+\t\tports->id[ports->num_ports++] = count;\n \t}\n \n \treturn 0;\n@@ -99,7 +117,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 +130,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": [ "v3", "1/2" ] }