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 F3794A04B6; Tue, 22 Sep 2020 16:32:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B55ED1D6A6; Tue, 22 Sep 2020 16:32:15 +0200 (CEST) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by dpdk.org (Postfix) with ESMTP id A57111D58D for ; Tue, 22 Sep 2020 16:32:11 +0200 (CEST) Received: by mail-pj1-f51.google.com with SMTP id a9so1587530pjg.1 for ; Tue, 22 Sep 2020 07:32:11 -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=lUG5yvUg99M196uQ8IpMWx3GSsU8Pix/t/WJEbyyKtA=; b=u6FLgl491vIn+LxrLwEqIhMFssYIlKPX78FHkNO2Adlo1UNFKn+3xt4ixWzIrbq5PO plfQU4Dk0KWI4VgenjGKqiWsAUinS5WZfbkap59E7TZ8XZwd4pAqfxwL5eggM78pZeTE rkb/51yfPZJfmGPjagRHUjfWjDvyQQ8IfNAhtGPhGEgK5C1GSlUQHT+3S2s7Y+UbUNp2 pusTPIeQTbURyutJDWMIUPRHDpJv5i9HOrLdgR8UBua6Gw6XJKyJTjPnradaSMT0+4oa ZRvIC1pfa0fKADU97iymgoCqJ+cBJw6+PSByTapevO3BXCbW2rYj1PTrgv8ywGsRukjU 0vgg== 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=lUG5yvUg99M196uQ8IpMWx3GSsU8Pix/t/WJEbyyKtA=; b=jHVenrgz/2fcEqV3U5VpsCSHZbf0oErNPQbPBGIUScN8gkGsI6xz/U31Z+FNalJtH4 CWEIHGADCN+4UX/gTTHbrmw1Bp7ab/Qox5KjkkwiVlk8Qb/tSkg2vuQpyOp/DwSO0qv7 e9AArVGze1qKrAqL55Trqyx3gaLN5q1qCscQeaLCWh9N4ewiLHpYLVi1QphCyPRiAl0y wNAahnu/toy14mtkX0+KkHOo2pVQXJFrd2mKQzl0Q4IkN5HhYVhY96vWLwM7eLHWS5xb 03uGsVggmfsj8ALK3ZPa96vxuZDtydDWeDcvaroBKMJnl8i39uWH0P5JJdH4bjikL/Of M0gQ== X-Gm-Message-State: AOAM530nfAfO0Sr9H4XogJuPvfjtvBpXalKLE4ZlOa6GeUCypQ/UJMBE vmDVxxw6BOx8dNHmKnajS8lZDYAetSYXrQ== X-Google-Smtp-Source: ABdhPJz2/T7HyzQv98frdpbBztBooEoxqwx6QSDLS9a2fVlLngaB+KkLp1KphQXGSYb+wknp21TGNA== X-Received: by 2002:a17:90a:62c5:: with SMTP id k5mr3988324pjs.100.1600785130316; Tue, 22 Sep 2020 07:32:10 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id l14sm4786037pfc.170.2020.09.22.07.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 07:32:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Tue, 22 Sep 2020 07:31:58 -0700 Message-Id: <20200922143202.8755-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200922143202.8755-1-stephen@networkplumber.org> References: <20200922143202.8755-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 4/8] eal: replace pci-whitelist/pci-blacklist options 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" Replace -w / --pci-whitelist with -a / --allow options and -b / --pci-blacklist with -b / --block. Allow the old options for now, but print a nag warning since old options are deprecated. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- lib/librte_eal/common/eal_common_options.c | 70 +++++++++++++--------- lib/librte_eal/common/eal_options.h | 9 ++- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index a5426e12346a..4e54512c874c 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -51,7 +51,8 @@ const char eal_short_options[] = - "b:" /* pci-blacklist */ + "a:" /* allow */ + "b:" /* block */ "c:" /* coremask */ "s:" /* service coremask */ "d:" /* driver */ @@ -62,7 +63,7 @@ eal_short_options[] = "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist */ + "w:" /* whitelist (deprecated) */ ; const struct option @@ -87,8 +88,8 @@ eal_long_options[] = { {OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM }, {OPT_NO_SHCONF, 0, NULL, OPT_NO_SHCONF_NUM }, {OPT_IN_MEMORY, 0, NULL, OPT_IN_MEMORY_NUM }, - {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM }, - {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM }, + {OPT_DEV_BLOCK, 1, NULL, OPT_DEV_BLOCK_NUM }, + {OPT_DEV_ALLOW, 1, NULL, OPT_DEV_ALLOW_NUM }, {OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM }, {OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM }, {OPT_SOCKET_LIMIT, 1, NULL, OPT_SOCKET_LIMIT_NUM }, @@ -102,6 +103,11 @@ eal_long_options[] = { {OPT_MATCH_ALLOCATIONS, 0, NULL, OPT_MATCH_ALLOCATIONS_NUM}, {OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM }, {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM }, + + /* legacy options that will be removed in next LTS */ + {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM }, + {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM }, + {0, 0, NULL, 0 } }; @@ -1414,29 +1420,38 @@ int eal_parse_common_option(int opt, const char *optarg, struct internal_config *conf) { - static int b_used; - static int w_used; + static bool x_used, i_used; switch (opt) { - /* blacklist */ + /* deprecated option */ case 'b': - if (w_used) - goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, + fprintf(stderr, + "Option -b, --blacklist is deprecated, use -x, --exclude option instead\n"); + /* fallthrough */ + case 'x': + /* excluded list */ + if (i_used) + goto include_exclude; + if (eal_option_device_add(RTE_DEVTYPE_BLOCKED, optarg) < 0) { return -1; } - b_used = 1; + x_used = true; break; - /* whitelist */ + case 'w': - if (b_used) - goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI, + fprintf(stderr, + "Option -w, --whitelist is deprecated, use -i, --include option instead\n"); + /* fallthrough */ + case 'i': + /* include device list */ + if (x_used) + goto include_exclude; + if (eal_option_device_add(RTE_DEVTYPE_ALLOWED, optarg) < 0) { return -1; } - w_used = 1; + i_used = true; break; /* coremask */ case 'c': { @@ -1715,9 +1730,10 @@ eal_parse_common_option(int opt, const char *optarg, } return 0; -bw_used: - RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) " - "cannot be used at the same time\n"); + +include_exclude: + RTE_LOG(ERR, EAL, + "Options include (-i) and exclude (-x) can't be used at the same time\n"); return -1; } @@ -1926,14 +1942,14 @@ eal_common_usage(void) " -n CHANNELS Number of memory channels\n" " -m MB Memory to allocate (see also --"OPT_SOCKET_MEM")\n" " -r RANKS Force number of memory ranks (don't detect)\n" - " -b, --"OPT_PCI_BLACKLIST" Add a PCI device in black list.\n" - " Prevent EAL from using this PCI device. The argument\n" - " format is .\n" - " -w, --"OPT_PCI_WHITELIST" Add a PCI device in white list.\n" - " Only use the specified PCI devices. The argument format\n" - " is <[domain:]bus:devid.func>. This option can be present\n" - " several times (once per device).\n" - " [NOTE: PCI whitelist cannot be used with -b option]\n" + " -b, --"OPT_DEV_BLOCK" Add a device to the excluded list.\n" + " Prevent EAL from using this device. The argument\n" + " format for PCI devices is .\n" + " -a, --"OPT_DEV_ALLOW" Add a device to the included list.\n" + " Only use the specified devices. The argument format\n" + " for PCI devices is <[domain:]bus:devid.func>.\n" + " This option can be present several times.\n" + " [NOTE: " OPT_DEV_ALLOW " cannot be used with "OPT_DEV_BLOCK" option]\n" " --"OPT_VDEV" Add a virtual device.\n" " The argument format is [,key=val,...]\n" " (ex: --vdev=net_pcap0,iface=eth2).\n" diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h index 89769d48b487..fc0fe2258a32 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -13,8 +13,15 @@ enum { /* long options mapped to a short option */ #define OPT_HELP "help" OPT_HELP_NUM = 'h', +#define OPT_DEV_ALLOW "allow" + OPT_DEV_ALLOW_NUM = 'a', +#define OPT_DEV_BLOCK "block" + OPT_DEV_BLOCK_NUM = 'b', + + /* legacy options that will be removed in next LTS */ #define OPT_PCI_BLACKLIST "pci-blacklist" - OPT_PCI_BLACKLIST_NUM = 'b', +#define OPT_PCI_BLACKLIST_NUM OPT_DEV_BLOCK_NUM + #define OPT_PCI_WHITELIST "pci-whitelist" OPT_PCI_WHITELIST_NUM = 'w', -- 2.27.0