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 BE792A10DA for ; Fri, 2 Aug 2019 04:58:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C4751C203; Fri, 2 Aug 2019 04:58:33 +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 AF7A61C1F1 for ; Fri, 2 Aug 2019 04:58:30 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id f5so26463451pgu.5 for ; Thu, 01 Aug 2019 19:58:30 -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=zc5wLVYzGdBzMnqa1CvBFKrqffPTJWatPwgXmOWAuj4=; b=zL6Quq7+CyS1AGwVYUCnS6LOjTsCa0FwNcoe1p34uKrMYfGxDCjDYWhznK9gbVucDW rOA7Z97fxtWX6UPiHxRXzgUXQClwKn7+wkdyraFKt+3YE+9XtbiUtbe0x0xqkXz/vqdo RDtVD2p9roFBqnLJZuBKGx/mGFHPKN8ZE6s1LN8B+GBiFrZOEBF1zffDNLCkXoW9I0EU NJK5on+/VuyCReJ85DOOzOM2/Ots4qiIP72l04vowfgM76WGIluNGiXTeQvihe1zl/Sx uvI0Ytjhbn+zDce71FjV77akgz4jYLQaBPcniKTvl7pYg/WFHZVevkhWGIK7Y/DfJnIa wiRA== 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=zc5wLVYzGdBzMnqa1CvBFKrqffPTJWatPwgXmOWAuj4=; b=BXzhWh/9skUmvJE1frsoyUslxXIXeLQ//EV2RMbkJXy1ArdKMCSm1L2Z3G1RGL/YRz qAFwxBpuVggQkgrmfrbpIsbg8ud3yH8oEF7K45wg7dDw+TxSYGTr/c++nIDOzwYyjUkN wfDuJCGtboctRMV5aSY+AyRUEIumHuaaz3MoID5OpAEsvT7Jiy5oByOPnnwykQPHtb1j GbV6eNcTxYbXg2j4MfIi+YKpnUOeKEePPn2FhwPgGgwh7U8WZWiLVSwBz0ncnji/I3BE P8vf8+4JhZZM6UsoXVn/lTwRrvC2pOh9KyP3TcWuVv9FF71ndmZiifI82y0xHY04lP/C H68Q== X-Gm-Message-State: APjAAAXPTZe8tlZGDL8M4Teu8oxWY+J7EeCLWBDEPJP577pm6BOtmtwP wlqhxOxbuudI8gd5nU0PXaTDnOM6 X-Google-Smtp-Source: APXvYqzdvvvOR5Prqc6TblvlYVFc9WxltU5/EShM+daoh51zGz7lLYQ+db+d7sWFupvL+3lYAwA8Dg== X-Received: by 2002:a17:90a:9bc5:: with SMTP id b5mr1993643pjw.109.1564714709545; Thu, 01 Aug 2019 19:58:29 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id a20sm5788738pjo.0.2019.08.01.19.58.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:58:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger 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> <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: 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. Fixes: 5b7ba31148a8 ("ethdev: add port ownership") Signed-off-by: Stephen Hemminger --- .../client_server_mp/mp_server/args.c | 35 ++++++++++--------- .../client_server_mp/mp_server/args.h | 2 +- .../client_server_mp/mp_server/init.c | 7 ++-- 3 files changed, 22 insertions(+), 22 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..fdc008b3d677 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" @@ -41,31 +42,33 @@ 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 id; 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; - } - pm = (pm >> 1); - count++; + RTE_ETH_FOREACH_DEV(id) { + unsigned long msk = 1u << id; + + if ((pm & msk) == 0) + continue; + + pm &= ~msk; + ports->id[ports->num_ports++] = id; + } + + if (pm != 0) { + printf("WARNING: leftover ports in mask %#lx - ignoring\n", + pm); } return 0; @@ -99,7 +102,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 +115,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