From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2D34DA00E6 for ; Tue, 9 Jul 2019 17:09:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 223DC1B9A0; Tue, 9 Jul 2019 17:09:51 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id AE2CA1B953 for ; Tue, 9 Jul 2019 17:09:48 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id i8so9573717pgm.13 for ; Tue, 09 Jul 2019 08:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NEwn2g5KMCliJZJpH/uXb4rAe7OM6z/ENb5rgyMvqLk=; b=hZvO3g+6Bm5PV00iIjxPEC57eq6kf+xMjuBvAJzezjlPayisMSC70VbU4cX6yB8xCV 6iPZMFR1RikRKPEL76CAdFpzoZ3zNWVQFlqxl9oXgzKXrHPRcmIyoKGv+umh7Q9B/0WQ OyYEcSi1pXszyQkGwxwpGSswV7pWlXhepZrkgDS/v5879bGk2s8Olmu6UIWqzAO2/7vD CIUv+bvMOa8abMFErzGekGR5O7KN3440NF9qZATeVdmnl29VXR/LaBZtfyrP+/3eEwO7 AnMwpA3fIUm7eeQUbz+6S5L8mYi4qrROw95v8ExkVuAJCy5NLaxUVF9Wy1iIrQGBoL60 eWpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NEwn2g5KMCliJZJpH/uXb4rAe7OM6z/ENb5rgyMvqLk=; b=aw98TZM0UJKoCOUowXRNabi6L6+Xr5lMno3jDVMqx1CO9UDM8U99mvt0ecT3ppQBlL in8OgLgJQ0rKmzMrVK+xN4o8tD7uBvrEZ+YC5tDchyl5bcGrifBV8VvII/IsoDPuMTgz QkogiCL5ZMEESFKWmncEdKW81LDgYbGBZT9JXDcjLM+8phNw7spZ7pKIDHweXTIrv2+z Hvh81DFQ5Ovv4dVrCDh74iyrjHXSr/3lIGOu8NMlMsTc9HGUw82EEi97YQjYun1i73LO 2ZXPrCrtlGRgyzc3Skfrr7c97+WlmlsP3Jjbxxifwin8p1Rpair5+20bazloxIBBhRCt wcgA== X-Gm-Message-State: APjAAAVy5kZXySQGlLGHfVxBxKyEToswNRNyIwflRgKPTrW3F1jMNlVy ZHXFCioLPpg8S/w7HzPurP1zV2sO8YQ= X-Google-Smtp-Source: APXvYqwkeKX85KZo8Ef32lEEi5h9nUENZ3Fth4Nv8+QIXZb8tH0cpWPG57QhB8uAH5/GHFZ69S3VYA== X-Received: by 2002:a17:90a:270f:: with SMTP id o15mr669855pje.56.1562684987618; Tue, 09 Jul 2019 08:09:47 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id u134sm20151651pfc.19.2019.07.09.08.09.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 08:09:46 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger 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: check port validity X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger The mp_server incorrectly allows a port mask that included hidden ports and which later caused either lost packets or failed initialization. This fixes explicitly checking that each bit in portmask is a valid port before using it. The max_ports parameter is no longer necessary, so remove it from the caller. Fixes: 5b7ba31148a8 ("ethdev: add port ownership") Signed-off-by: Stephen Hemminger --- .../client_server_mp/mp_server/args.c | 46 +++++++++++++------ .../client_server_mp/mp_server/args.h | 2 +- .../client_server_mp/mp_server/init.c | 7 +-- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/examples/multi_process/client_server_mp/mp_server/args.c b/examples/multi_process/client_server_mp/mp_server/args.c index b0d8d7665c85..1d52489347df 100644 --- a/examples/multi_process/client_server_mp/mp_server/args.c +++ b/examples/multi_process/client_server_mp/mp_server/args.c @@ -10,6 +10,7 @@ #include #include +#include #include #include "common.h" @@ -34,6 +35,22 @@ usage(void) , progname); } +/** + * Check if port is present in the system + * It maybe owned by a device and should not be used. + */ +static int +port_is_present(uint16_t portid) +{ + uint16_t id; + + RTE_ETH_FOREACH_DEV(id) { + if (id == portid) + return 1; + } + return 0; +} + /** * The ports to be used by the application are passed in * the form of a bitmask. This function parses the bitmask @@ -41,31 +58,32 @@ usage(void) * array variable */ static int -parse_portmask(uint8_t max_ports, const char *portmask) +parse_portmask(const char *portmask) { char *end = NULL; unsigned long pm; - uint16_t count = 0; + uint16_t count; if (portmask == NULL || *portmask == '\0') return -1; /* convert parameter to a number and verify */ pm = strtoul(portmask, &end, 16); - if (end == NULL || *end != '\0' || pm == 0) + if (end == NULL || *end != '\0' || pm > UINT16_MAX || pm == 0) return -1; /* loop through bits of the mask and mark ports */ - while (pm != 0){ - if (pm & 0x01){ /* bit is set in mask, use port */ - if (count >= max_ports) - printf("WARNING: requested port %u not present" - " - ignoring\n", (unsigned)count); - else - ports->id[ports->num_ports++] = count; + for (count = 0; pm != 0; pm >>= 1, ++count) { + if ((pm & 0x1) == 0) + continue; + + if (!port_is_present(count)) { + printf("WARNING: requested port %u not present - ignoring\n", + count); + continue; } - pm = (pm >> 1); - count++; + + ports->id[ports->num_ports++] = count; } return 0; @@ -99,7 +117,7 @@ parse_num_clients(const char *clients) * on error. */ int -parse_app_args(uint16_t max_ports, int argc, char *argv[]) +parse_app_args(int argc, char *argv[]) { int option_index, opt; char **argvopt = argv; @@ -112,7 +130,7 @@ parse_app_args(uint16_t max_ports, int argc, char *argv[]) &option_index)) != EOF){ switch (opt){ case 'p': - if (parse_portmask(max_ports, optarg) != 0){ + if (parse_portmask(optarg) != 0){ usage(); return -1; } diff --git a/examples/multi_process/client_server_mp/mp_server/args.h b/examples/multi_process/client_server_mp/mp_server/args.h index 79c190a33a37..52c8cc86e6f0 100644 --- a/examples/multi_process/client_server_mp/mp_server/args.h +++ b/examples/multi_process/client_server_mp/mp_server/args.h @@ -5,6 +5,6 @@ #ifndef _ARGS_H_ #define _ARGS_H_ -int parse_app_args(uint16_t max_ports, int argc, char *argv[]); +int parse_app_args(int argc, char *argv[]); #endif /* ifndef _ARGS_H_ */ diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c index 3af5dc6994bf..1b0569937b51 100644 --- a/examples/multi_process/client_server_mp/mp_server/init.c +++ b/examples/multi_process/client_server_mp/mp_server/init.c @@ -238,7 +238,7 @@ init(int argc, char *argv[]) { int retval; const struct rte_memzone *mz; - uint16_t i, total_ports; + uint16_t i; /* init EAL, parsing EAL args */ retval = rte_eal_init(argc, argv); @@ -247,9 +247,6 @@ init(int argc, char *argv[]) argc -= retval; argv += retval; - /* get total number of ports */ - total_ports = rte_eth_dev_count_total(); - /* set up array for port data */ mz = rte_memzone_reserve(MZ_PORT_INFO, sizeof(*ports), rte_socket_id(), NO_FLAGS); @@ -259,7 +256,7 @@ init(int argc, char *argv[]) ports = mz->addr; /* parse additional, application arguments */ - retval = parse_app_args(total_ports, argc, argv); + retval = parse_app_args(argc, argv); if (retval != 0) return -1; -- 2.20.1