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 919B1A04B5; Sun, 25 Oct 2020 22:16:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AAD802BD0; Sun, 25 Oct 2020 22:15:38 +0100 (CET) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 7171B2B87 for ; Sun, 25 Oct 2020 22:15:33 +0100 (CET) Received: by mail-pf1-f194.google.com with SMTP id b3so1700246pfo.2 for ; Sun, 25 Oct 2020 14:15:33 -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=WWdmMtc3MOOPMZ+AkQQgeZMIAVXjMdSbyl6cG/CEyGs=; b=lx1PPsdhSP+ZZt1IPr+lkBiDubhepWAKEVDvin1g5oknFkcMCKxcS7qtadWf59No3C DN68c13NlX7sCzAWmm+yHL8cKw258tSIQJdbkXcP4TbZyRy8934q9bjJyLNHOBfQKVmK NmB+vv+KCIDP1jtIandqPMIb+nuKHdIhvHp5KOzWntarx0n4ktLm/ryPYU7WmrBXVp41 B1XqPmRbNNlRs4SikBZi+zdStgHpTGVdf15JA1pWIYvlYdcwNwPjvtwv4rZXmP7harXK pGxpH+gQnK6mXdCF5TTPxkLuUuRsJFa42RrNsJ/Yls8O7Z9cj2AJFQ41AyJA4R8B6Q0F aaFg== 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=WWdmMtc3MOOPMZ+AkQQgeZMIAVXjMdSbyl6cG/CEyGs=; b=MUY70LPLjJNGw7lSGT4SdvDobQarmGF5Exa1+ajqrwUwAa0zXxefwcFRWuyCym2p3b DWiem9R8KPsgbBkKkuCMHfuvjT/QU1RCQaD9AkNOV8YAsv7RWBbG/CNFpsIcC5J/cvBN Q5hLSa/Yuz1Vk00xLt6180h96hRyxVDkaCtNQgcKWsJGVVhF2HzGkYfC3a+yaW9bHuB3 fsRK+Dg9/0F5z4Bx1ygHABts6zeTQEMO6sBmwPWEH1J7bq538H5U/y9GixrJ96l+Fztw wgPKg4q2pUcplfMfDP5wRxLEhEZ0QWhgUJ2EIh1vc9saDCXPV5+q5CGc4X50El7SW/DU otCg== X-Gm-Message-State: AOAM533fz7lpWOF/TtWOyKTSwXgDAbcU23/E5DoW5KjlC5YZeXSZj44U /8jYNVAlsRlt7yHiAKY6mxOFS9w1ePyfKzx7 X-Google-Smtp-Source: ABdhPJyUpQXL0uja6W7jiOOTVXHPpV94C2mnZUzHEluuJWbx7/XjFitx3nP7KUlY8OTKns6eXugwNQ== X-Received: by 2002:a65:5809:: with SMTP id g9mr13395197pgr.35.1603660531213; Sun, 25 Oct 2020 14:15:31 -0700 (PDT) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id l129sm2178074pgl.3.2020.10.25.14.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2020 14:15:30 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Sun, 25 Oct 2020 14:15:16 -0700 Message-Id: <20201025211518.531-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201025211518.531-1-stephen@networkplumber.org> References: <20200922143202.8755-1-stephen@networkplumber.org> <20201025211518.531-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v8 3/5] 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 --pci-blacklist with --block. The -b short option remains unchanged. 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 | 66 +++++++++++++--------- lib/librte_eal/common/eal_options.h | 13 ++++- 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 7b3341683662..8fb2d4a09312 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -52,7 +52,8 @@ const char eal_short_options[] = - "b:" /* pci-blacklist */ + "a:" /* allow */ + "b:" /* block */ "c:" /* coremask */ "s:" /* service coremask */ "d:" /* driver */ @@ -63,7 +64,7 @@ eal_short_options[] = "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist */ + "w:" /* pci-whitelist (deprecated) */ ; const struct option @@ -89,8 +90,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 }, @@ -105,6 +106,11 @@ eal_long_options[] = { {OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM }, {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM }, {OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_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 } }; @@ -1448,28 +1454,35 @@ eal_parse_common_option(int opt, const char *optarg, struct internal_config *conf) { static int b_used; - static int w_used; + static int a_used; switch (opt) { - /* blacklist */ + case OPT_PCI_BLACKLIST_NUM: + fprintf(stderr, + "Option --pci-blacklist is deprecated, use -b, --block instead\n"); + /* fallthrough */ case 'b': - if (w_used) - goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, - optarg) < 0) { + /* excluded list */ + if (a_used) + goto ba_conflict; + if (eal_option_device_add(RTE_DEVTYPE_BLOCKED, optarg) < 0) { return -1; } b_used = 1; break; - /* whitelist */ + case 'w': + fprintf(stderr, + "Option -w, --pci-whitelist is deprecated, use -a, --allow option instead\n"); + /* fallthrough */ + case 'a': + /* include device list */ if (b_used) - goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI, - optarg) < 0) { + goto ba_conflict; + if (eal_option_device_add(RTE_DEVTYPE_ALLOWED, optarg) < 0) { return -1; } - w_used = 1; + a_used = 1; break; /* coremask */ case 'c': { @@ -1760,9 +1773,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"); + +ba_conflict: + RTE_LOG(ERR, EAL, + "Options allow (-a) and block (-b) can't be used at the same time\n"); return -1; } @@ -1997,14 +2011,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, --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, --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 aec8a17d722e..d9d26c962590 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -13,8 +13,12 @@ enum { /* long options mapped to a short option */ #define OPT_HELP "help" OPT_HELP_NUM = 'h', -#define OPT_PCI_BLACKLIST "pci-blacklist" - OPT_PCI_BLACKLIST_NUM = 'b', +#define OPT_DEV_ALLOW "allow" + OPT_DEV_ALLOW_NUM = 'a', +#define OPT_DEV_BLOCK "block" + OPT_DEV_BLOCK_NUM = 'b', + + /* legacy option that will be removed in next LTS */ #define OPT_PCI_WHITELIST "pci-whitelist" OPT_PCI_WHITELIST_NUM = 'w', @@ -89,6 +93,11 @@ enum { OPT_NO_TELEMETRY_NUM, #define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth" OPT_FORCE_MAX_SIMD_BITWIDTH_NUM, + + /* legacy option that will be removed in next LTS */ +#define OPT_PCI_BLACKLIST "pci-blacklist" + OPT_PCI_BLACKLIST_NUM, + OPT_LONG_MAX_NUM }; -- 2.27.0