From patchwork Wed Oct 20 07:31:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102343 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71462A0C45; Wed, 20 Oct 2021 09:32:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1D0941176; Wed, 20 Oct 2021 09:32:19 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2055.outbound.protection.outlook.com [40.107.243.55]) by mails.dpdk.org (Postfix) with ESMTP id DDC0A40142 for ; Wed, 20 Oct 2021 09:32:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYK15FNxmF9GzTGTMUDPp7fAz9bQVljMP1/F5K6Vyvv2nKbtgQMi/iCxRJHVFdoB1YPFQlDzdPMD27mNQTXjOeZQ9Oiu7CeJJK0+f2bmMsQOpMIboj3RBPtSgNK/b5iA69GzXv9k6Z9v7wgTzUBtTqwd5F76wJ06Ehi0ztT8iJNv/QEc6ARKs9pMUbLWW4m2Tjo7wC2IpwCOydpwmHVU8drSHe5Kn72Q666tlnBeboqyY2ESX3+iykKG9+43zPoAFztI6W3oHZ+Drn0ic1L4itKmFQjudlyi3PHL9+xDpXBwTVl9duy5VQcD/YzHri6ZicqUA59J/UgiNV3H+4s8Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=swa8jbIpQrxTfDT7BkLjWD0hrutd22uGKN13tVihA4A=; b=m7LyM9NXzOro5lhg5pX2ysEWTnCYZSQSbGOlnT28ZGIoDd7tGn5znfoX04NbjLZOxdFJKCm9bhAeeMxQWsQ7spszjqnpqxmnZykUwhLDv4xeA2cBPJbKzFPOHboWrIsGwa3qLO0Sj58Gzh8kEHblRo8o9rtFa+fKOUH4H9CLGrvTzv0BqE0rj3LjptR5KAod/xxuD6MQH6Eot5pWdEEs2yYDdElK/gdaxMSwHf8trDPHVNiMNQTFrS0msN5ZDXpIoEqTo7pb18qcNSg/kTwBm70oTDWoAZWGwKn9x+eh88Pk3wxVsdU3IjMVVC3FHyreUnpsADecDMsa4hh4dW1ARg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=swa8jbIpQrxTfDT7BkLjWD0hrutd22uGKN13tVihA4A=; b=t+rLCAEah/4na99P2dpRWX3GQb26RynfvBPjZ3I7e42ECuGfLk0Hsn+UMgn7JV5FgCLl1JqejX37pqeBQvae9sPCs227Q06bT1sWqCw4o9klk7lJ0SLCqA6QffPE/Q1Dhk9UNo4jf1lEVBsyooPWSzptQRF+/wP9YAt1qou8MCxlErWXC0rn2c0Kq+1ausHTUnLiV97XfrC6i/hOj1MJzrZee0LvdR0WlPEPHSHavI0VE/+w1w0dunSdrEiXWDIVEM7Pm333wIpOg8lCTvDH7GIOVQ2TwoghEeJ69pKYpPiBfi2UoWz6l7cNdn92c394q39q1uq/nEjG8nO5W0VG0Q== Received: from DM6PR06CA0004.namprd06.prod.outlook.com (2603:10b6:5:120::17) by BN8PR12MB3217.namprd12.prod.outlook.com (2603:10b6:408:6e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Wed, 20 Oct 2021 07:32:16 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::a5) by DM6PR06CA0004.outlook.office365.com (2603:10b6:5:120::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 20 Oct 2021 07:32:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 07:32:15 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 07:32:11 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 15:31:49 +0800 Message-ID: <20211020073151.2374674-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020073151.2374674-1-xuemingl@nvidia.com> References: <20211005155435.279043-1-xuemingl@nvidia.com> <20211020073151.2374674-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e780f6c-e722-46de-8f5b-08d9939bbdae X-MS-TrafficTypeDiagnostic: BN8PR12MB3217: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +5V0mCNTLZV0ukBeRl11pYhDfmDs3Ad8TMuWTpXsvpMeqY9+3U7agnZAyW5HRNvJBuPU8XN5ordvRsQzg8SgjUNdVaorH4+rFPebPy2jalIVUM94RleyhZqHhi3hcO6V8biyTE6QW8cNUn/QXG1f1y5iG9NO2WOWwCJn9HuN2fR/VSEF4zoJMtLpXFdm6vhGLR2znzNR0L8w9rpnAZFBvyCbG5EuhDGytCAjSNN9mT+mLUgr4d3h4qfooSskmU5qQSJHRAPHbmut4uDVI1BlOHUs704O+PttusONb9kIaNkaR6TqWBGG4OaMd4FmLdyZjdJqJlt1bDXhkpZsyi8yK5UkqIWmHxzEuv3S1CpK15GSdhteDEL35Q1MaHSCSHa4GPZt5WvYaena9vmnD+n3syRGK5T22HHeYKC39284Ls2mvCBI2Jrw9E9lnp6udzx/JroxrdkHpYlrijsHSVev9SgOSwlK+HiQzuoivH7nDPHewJDzhfwwRrR0Vp8rxj5xUf9o6FkoJ/W7uGHl5lza5EDdN8htF1ESw1/UHkK3Nlduv8MC+O2t23XXuRhi5YKyfuyZpMUlVvVKx25jgVX0VbYoOOlpfP4sOR9xbRVxIKdE4r12rFUT1mk/FH4vlRGHBgBKRRnf5NXgXTE+tPMEDFnt+oBH1UymrwiG8+eBYF1tvsDkGMbYw1+EjB/qYx2dXUeTwZumW3imV/igkmd7dw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6286002)(26005)(47076005)(36756003)(1076003)(8936002)(70206006)(316002)(2616005)(5660300002)(110136005)(336012)(508600001)(8676002)(7696005)(426003)(70586007)(4326008)(36860700001)(2906002)(82310400003)(54906003)(86362001)(83380400001)(55016002)(356005)(7636003)(107886003)(6666004)(186003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 07:32:15.8205 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e780f6c-e722-46de-8f5b-08d9939bbdae X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3217 Subject: [dpdk-dev] [PATCH v2 1/3] devargs: support path value for global device arguments X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Slash is used to split global device arguments. To support path value which contains slash, this patch parses devargs by locating both slash and layer name key: bus=a,name=/some/path/class=b,k1=v1/driver=c,k2=v2 "/class=" and "/driver" are valid start of a layer. Signed-off-by: Xueming Li Reviewed-by: Gaetan Rivet --- lib/eal/common/eal_common_devargs.c | 117 ++++++++++------------------ 1 file changed, 43 insertions(+), 74 deletions(-) diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index 411dd6a75f6..d673598032d 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -29,18 +29,6 @@ TAILQ_HEAD(rte_devargs_list, rte_devargs); static struct rte_devargs_list devargs_list = TAILQ_HEAD_INITIALIZER(devargs_list); -static size_t -devargs_layer_count(const char *s) -{ - size_t i = s ? 1 : 0; - - while (s != NULL && s[0] != '\0') { - i += s[0] == '/'; - s++; - } - return i; -} - /* Resolve devargs name from bus arguments. */ static int devargs_bus_parse_default(struct rte_devargs *devargs, @@ -77,23 +65,13 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, { RTE_DEVARGS_KEY_DRIVER "=", NULL, NULL, }, }; struct rte_kvargs_pair *kv = NULL; - struct rte_class *cls = NULL; - struct rte_bus *bus = NULL; - const char *s = devstr; - size_t nblayer; - size_t i = 0; + struct rte_kvargs *bus_kvlist = NULL; + char *s; + size_t nblayer = 0; + size_t i; int ret = 0; bool allocated_data = false; - /* Split each sub-lists. */ - nblayer = devargs_layer_count(devstr); - if (nblayer > RTE_DIM(layers)) { - RTE_LOG(ERR, EAL, "Invalid format: too many layers (%zu)\n", - nblayer); - ret = -E2BIG; - goto get_out; - } - /* If the devargs points the devstr * as source data, then it should not allocate * anything and keep referring only to it. @@ -106,33 +84,41 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, goto get_out; } allocated_data = true; - s = devargs->data; } + s = devargs->data; while (s != NULL) { - if (i >= RTE_DIM(layers)) { - RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s); - ret = -EINVAL; + if (nblayer > RTE_DIM(layers)) { + ret = -E2BIG; goto get_out; } - /* - * The last layer is free-form. - * The "driver" key is not required (but accepted). - */ - if (strncmp(layers[i].key, s, strlen(layers[i].key)) && - i != RTE_DIM(layers) - 1) - goto next_layer; - layers[i].str = s; - layers[i].kvlist = rte_kvargs_parse_delim(s, NULL, "/"); - if (layers[i].kvlist == NULL) { + layers[nblayer].str = s; + + /* Locate next layer starts with valid layer key. */ + while (s != NULL) { + s = strchr(s, '/'); + if (s == NULL) + break; + for (i = 0; i < RTE_DIM(layers); i++) { + if (strncmp(s + 1, layers[i].key, + strlen(layers[i].key)) == 0) { + *s = '\0'; + break; + } + } + s++; + if (i < RTE_DIM(layers)) + break; + } + + layers[nblayer].kvlist = rte_kvargs_parse + (layers[nblayer].str, NULL); + if (layers[nblayer].kvlist == NULL) { ret = -EINVAL; goto get_out; } - s = strchr(s, '/'); - if (s != NULL) - s++; -next_layer: - i++; + + nblayer++; } /* Parse each sub-list. */ @@ -143,52 +129,35 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, if (kv->key == NULL) continue; if (strcmp(kv->key, RTE_DEVARGS_KEY_BUS) == 0) { - bus = rte_bus_find_by_name(kv->value); - if (bus == NULL) { + bus_kvlist = layers[i].kvlist; + devargs->bus_str = layers[i].str; + devargs->bus = rte_bus_find_by_name(kv->value); + if (devargs->bus == NULL) { RTE_LOG(ERR, EAL, "Could not find bus \"%s\"\n", kv->value); ret = -EFAULT; goto get_out; } } else if (strcmp(kv->key, RTE_DEVARGS_KEY_CLASS) == 0) { - cls = rte_class_find_by_name(kv->value); - if (cls == NULL) { + devargs->cls_str = layers[i].str; + devargs->cls = rte_class_find_by_name(kv->value); + if (devargs->cls == NULL) { RTE_LOG(ERR, EAL, "Could not find class \"%s\"\n", kv->value); ret = -EFAULT; goto get_out; } } else if (strcmp(kv->key, RTE_DEVARGS_KEY_DRIVER) == 0) { - /* Ignore */ + devargs->drv_str = layers[i].str; continue; } } - /* Fill devargs fields. */ - devargs->bus_str = layers[0].str; - devargs->cls_str = layers[1].str; - devargs->drv_str = layers[2].str; - devargs->bus = bus; - devargs->cls = cls; - - /* If we own the data, clean up a bit - * the several layers string, to ease - * their parsing afterward. - */ - if (devargs->data != devstr) { - char *s = devargs->data; - - while ((s = strchr(s, '/'))) { - *s = '\0'; - s++; - } - } - /* Resolve devargs name. */ - if (bus != NULL && bus->devargs_parse != NULL) - ret = bus->devargs_parse(devargs); - else if (layers[0].kvlist != NULL) - ret = devargs_bus_parse_default(devargs, layers[0].kvlist); + if (devargs->bus != NULL && devargs->bus->devargs_parse != NULL) + ret = devargs->bus->devargs_parse(devargs); + else if (bus_kvlist != NULL) + ret = devargs_bus_parse_default(devargs, bus_kvlist); get_out: for (i = 0; i < RTE_DIM(layers); i++) { From patchwork Wed Oct 20 07:31:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102344 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E340DA0C45; Wed, 20 Oct 2021 09:32:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37B4341175; Wed, 20 Oct 2021 09:32:28 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2083.outbound.protection.outlook.com [40.107.212.83]) by mails.dpdk.org (Postfix) with ESMTP id 770D440E6E for ; Wed, 20 Oct 2021 09:32:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B0JBEv6TbvrPj61JnDInKvHh8usyCIGiyzHKCvUFh1chPKZek3gufbAKTUG0pD4pSN7zCOQ42uZhPVUvc9Rk+O8/ABKIP36FKKABIaJJ8Sm9hBfbk3jtEIV2ulzFbU+zI8jyJacjg20Y1+dB0diJaGYdtl0RpYINOatFIxCpWYUl9JaZBgWchnOeCi3zP77u1UvmjezvTePaKQvmvTtt7tpTFPiHjPKvruXtoF4Nw24gUyfHBqxqzhwsdWm9r+fpRpwtZPTCvx22c5r19Qw65MOiV5z8/is1bdY74bwPbEdlk0kexDGIrDdbF6uO+Lsm/qw+3exwiSnBDhnudGh1aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4KAr2LwsyxrUUvrTws8k1F5IP+hGZvUFWm83+R5viwk=; b=FNRR6In54HCAgnNJMEYj4IIO4sH0bTkNystDQ+59hu7GaLSRGs8Fm+5Q9niGiDgZjAXYdRvpjyPrQykB8nV0NWfoldxAxJAkbXq2wuWtiNh5AYFPNYxpTYpzlNZOoROXokiED5Hrz1WqZkDPbQ/CmOsIGl7dZCeZNIwUJDmLByj6CIBE+OB4NTciMP4MkTb1aX8fwrkEf8TSCyRgCTYHqPbPE2+fJuPhUlAQmINFZS1wEM3yEmavkMz7kRXTquTVZdo0P9RmC6+0dTQ2FVM4alKhnzVm7c9Ne1YGLuuFqrQW12O2sGiEIP0riGWV+ourl7vDPTZpR7nlFKvQqAp8kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4KAr2LwsyxrUUvrTws8k1F5IP+hGZvUFWm83+R5viwk=; b=arJU0/bGW+P3Xzai6loQki/uNzjBPrxR84oq5UCH6wiE8OUS/JGKmKKhTTWMt4E9pe637GoXR3cI9FaxKvFh/SbY1cQusc4+d7ITUpdXpnBPkTZrdA3leVX/IWYHxQNp5CZ+wrNGn7/yDO9yK3qPN1QOz4VYhn11RIUmRPhZXuJP4BtOKNF2Voz6qIlXpFtXmrpV+G0zwMe98k7NubqCFdEkpiZJ0NTZED4i2VVdu2ekY7+V/ugh1eEdi3fp51SiHSJHLfJ39/D6LSouyeQWQnHoBCMv04KdvnmAuMwfHB8CZ3CslERf4dkS/pPpmEb3P75ATyXPo1D2d17sedTOjQ== Received: from DM6PR06CA0001.namprd06.prod.outlook.com (2603:10b6:5:120::14) by SN6PR12MB2623.namprd12.prod.outlook.com (2603:10b6:805:6f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Wed, 20 Oct 2021 07:32:18 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::24) by DM6PR06CA0001.outlook.office365.com (2603:10b6:5:120::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Wed, 20 Oct 2021 07:32:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 07:32:17 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 07:32:13 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 15:31:50 +0800 Message-ID: <20211020073151.2374674-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020073151.2374674-1-xuemingl@nvidia.com> References: <20211005155435.279043-1-xuemingl@nvidia.com> <20211020073151.2374674-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 597dbb51-b062-4432-f8ac-08d9939bbe96 X-MS-TrafficTypeDiagnostic: SN6PR12MB2623: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1443; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8d+HynTv/+//Mo4TdU0BTuKTWHOb0aqfebDMyiKvZtBNyFriZOaYmvSHO5qRQfQClfQqubhOouZrZvHQyYu1gGzM9zea/L1o3blWhxQAgR0tlLI5OZMJdqhiCSUdMjTCu2A2lX8wAJqvUITedhZmYIPaqAMz6QQHi5SzNHgStn9eR0VynKxCcncwr2ElsK610shPlguurk4m1NR4OsVlaCwf4K3hw05zFWY+M38tcIi1T3dM1ftCyIU8OAZEP7k3tZaQDQxY+j5mryjj02OxAL7LbN421IjDHTvD1VLzm8w4i1XWAxHU8fn11Bsn0UrSZ/fJD246jv5hwYQZ70lwhg37WlBtHPWkC5l3XgLzB3S7rDMfkdtydeVVMBznVQHgS+JNN9b8jsLoinL1FwFUKdJrBSq4dRr+c4FX1AOeCapNbJ1vlv6CgavSKumtM9iNCIMSjuziHKTFJuEElFkGkwj3n0qoxGWLlWlFz5H6Jw/+24d+dISOf29BCSelPo1BTPmw8/8iJq/JPfKanhddTNj4aUPFGu4owCxexKIlcBdOZ64+MQ5Skn3F08KqdamhEB181x4xtd0f8jAH1S9wCGh0cxhCzsDA4pCn2pNYp7ABxnrEBmwP9KinJYCI4SjHFrmHQMJaNKZ0cQMd93XEA9K54ynZ+c1PDqtbXKs70EJZrzIZWstLeKKqM48XdeBU6eWHtMfv3yzeY6VTpI6T0g== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(82310400003)(36860700001)(336012)(426003)(186003)(16526019)(6666004)(2616005)(86362001)(70586007)(316002)(83380400001)(6286002)(7696005)(107886003)(8936002)(508600001)(7636003)(54906003)(110136005)(70206006)(4326008)(55016002)(26005)(1076003)(47076005)(8676002)(36756003)(5660300002)(356005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 07:32:17.3846 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 597dbb51-b062-4432-f8ac-08d9939bbe96 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2623 Subject: [dpdk-dev] [PATCH v2 2/3] devargs: make bus key parsing optional X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Global devargs syntax is used as device iteration filter like "class=vdpa", a devargs without bus args is valid from parsing perspective. This patch makes bus args optional. Fixes: d2a66ad79480 ("bus: add device arguments name parsing") Signed-off-by: Xueming Li Reviewed-by: Gaetan Rivet --- drivers/bus/pci/pci_params.c | 8 +++----- lib/eal/common/eal_common_devargs.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 21c2e1d0368..60b424b8297 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -87,11 +87,10 @@ rte_pci_devargs_parse(struct rte_devargs *da) struct rte_kvargs *kvargs; const char *addr_str; struct rte_pci_addr addr; - int ret; + int ret = 0; - if (da == NULL) + if (da == NULL || da->bus_str == NULL) return 0; - RTE_ASSERT(da->bus_str != NULL); kvargs = rte_kvargs_parse(da->bus_str, NULL); if (kvargs == NULL) { @@ -103,9 +102,8 @@ rte_pci_devargs_parse(struct rte_devargs *da) addr_str = rte_kvargs_get(kvargs, pci_params_keys[RTE_PCI_PARAM_ADDR]); if (addr_str == NULL) { - RTE_LOG(ERR, EAL, "No PCI address specified using '%s=' in: %s\n", + RTE_LOG(DEBUG, EAL, "No PCI address specified using '%s=' in: %s\n", pci_params_keys[RTE_PCI_PARAM_ADDR], da->bus_str); - ret = -ENODEV; goto out; } diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index d673598032d..8c7650cf6c2 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -39,7 +39,7 @@ devargs_bus_parse_default(struct rte_devargs *devargs, /* Parse devargs name from bus key-value list. */ name = rte_kvargs_get(bus_args, "name"); if (name == NULL) { - RTE_LOG(INFO, EAL, "devargs name not found: %s\n", + RTE_LOG(DEBUG, EAL, "devargs name not found: %s\n", devargs->data); return 0; } From patchwork Wed Oct 20 07:31:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102345 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 04E99A0C45; Wed, 20 Oct 2021 09:32:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EE7441182; Wed, 20 Oct 2021 09:32:29 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2052.outbound.protection.outlook.com [40.107.101.52]) by mails.dpdk.org (Postfix) with ESMTP id AF30A4117B for ; Wed, 20 Oct 2021 09:32:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3CWnU137xmbiA7+OiR7I/JjqF4r8VwHuG4FdfBWtIuid4EpQCzQIe59al9B2cApuyiu0Oz0ygNPOsGIw0VD9D2FR6GcT9MBKia8kxwsYXTew4a3IVAycgtJEVVdKeyoPJpAAAtvdxXJ7PakOhe3XB76OMqm44E0gwmok0zCS2Pey3JYr27mszPBt9CFnMi37F6bHVkkwCVO+6IICFxEZV7sh18iGAmXt7w+fdSTEpS8yaZUcJt61SlPXcLs8tUB2WmAbddHOsBSKR/mLiArBDcnecYH86mmap25HBxjZWKmOQtWlXD5GjNjwWebX6lrKHfMx9X7v0aHS4oVbUIazQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5h65FyPoGGqt+ZO2zf6v7Jd+eTpDH3U2bKTNJkmhSsU=; b=a78RJDIHfBTJOhHRrwv2hg2PZjb2WBHpQqU+KAL1PQyP/ji1JJ8MfpRj8BuVJy/mRQE1o9wp5+LPJRyR3d0ig3IphVBtW1D2XwYrbW0odxsBRgoHZpwu4lWp5pvkExrM96+FQJ5SjykLbth03rSQo+dDt9efwMLHwSCZP5pjlf3KZ//Y0wBg+FQSug31WSW1pTx4XFuDXniNd+kQAD9VDqG8bgEc7intNZs2sG6P/nln6tGxe+KPQ8pvqAt5ea4P7JNAgAOEKZ0jW1NXLtTX8th8j6sLP2J3xdbxrUYUtpQ9SynWHp5tPDDSYxKvEnGG98YpKr2cerkpsG4yeZy/Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5h65FyPoGGqt+ZO2zf6v7Jd+eTpDH3U2bKTNJkmhSsU=; b=PWQV3wqCcC4bnY55mpPQY2EL2s8EAeDV6ds+ieNzU1ExvKO0Z8UTOFXCljdV2lP7xb6LIZOBLXxZFPCRshbRelgApd5MPPFPR/bK7qrB+TmRDf9PotJ4fHPn6up3Zx6iLCWCFGLmnDf7nksDJKu/P3i4l65Owe1JhgAJAZS4O4HZZyTjcfAiTDuctvjK/SUQWjqcxwBDVp5ysoIJikUDqtd0ep0l0L/e6cgxxiIxvT9KLR6UuGbZFFUAM7cLtpQdkxcEZHS1K7xUX3d34X+DdN7Ll2kw81MfFUlpbb1tumkM41H8vJiGb2GQSm9YfAJ8RP9RmikKcXV+L3VEZBYMpA== Received: from DM6PR06CA0004.namprd06.prod.outlook.com (2603:10b6:5:120::17) by BN8PR12MB3217.namprd12.prod.outlook.com (2603:10b6:408:6e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Wed, 20 Oct 2021 07:32:19 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::a5) by DM6PR06CA0004.outlook.office365.com (2603:10b6:5:120::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 20 Oct 2021 07:32:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 07:32:18 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 07:32:15 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 15:31:51 +0800 Message-ID: <20211020073151.2374674-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020073151.2374674-1-xuemingl@nvidia.com> References: <20211005155435.279043-1-xuemingl@nvidia.com> <20211020073151.2374674-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c3f9a42-3970-48e2-cc36-08d9939bbf61 X-MS-TrafficTypeDiagnostic: BN8PR12MB3217: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:94; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VXiDHb6dWwjQg4O94cM6bzV/K7sq2ICFja5sYV/VE6bpEwPSbysm9ChQrr3w8iyL99i5N3vUOdsWJKFu8QUj3kUNjjfAxEQWLaWJIJr4s2q+v6B7zByrhEwnAaEgplz87UYpnYP6dGubeXhB9l1beQaL63Mz+U0VcwiQzZaYzLWpY9bOI7YxwFc001bzcHmQojY67AMVbkgL91h+vLdV4xPCN9VH32fsdkvOxSpdQC9psjBedQYLgeR458yPmt1vXGGFJ9dbIZjUYFssV6cWaTmMtzgYwGujca8PMKTHFh7HhwfYNCIsFBABk38HwBmH+J/zBk2LVuQdoYhAsczHnLpqaRON4eCH/0X/8hvoBK7sZf43ypSHhPQ5uQZ3D3LVjU7Fwp+PuDT6aY8Co3sZuwlp3qoa7Ao7HmJYOGS4ahScOSxHS/q9tG/jx7CM3dElXLpAen9FD4eA5CwG7sB0/lieR2VI0LTJfOEYoVlqz9nRyD4am7I9BGk5FobnXUyg++TFjZT4+PIX/dn7miG/I2WtxHaFwOolaOp1E9HjFhx0WqCrxFwVKU5jLggU8iccnf42aOPhaWUYBGJvNU5FoUyN7hpe0QjTR8adsziEihcltairMH5fTgIpTXnRbaMlg46F04WIJ0wL4JT7SVc8ig79k1c5nIwoyTa2ran4eyXp9ViAuBp7J3bepkM53QTOnUJMm0LzBXJY35Ub3jCyZw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6286002)(30864003)(26005)(47076005)(36756003)(1076003)(8936002)(70206006)(316002)(2616005)(5660300002)(110136005)(336012)(508600001)(8676002)(7696005)(426003)(70586007)(4326008)(36860700001)(2906002)(82310400003)(54906003)(86362001)(83380400001)(55016002)(356005)(7636003)(107886003)(6666004)(186003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 07:32:18.7778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c3f9a42-3970-48e2-cc36-08d9939bbf61 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3217 Subject: [dpdk-dev] [PATCH v2 3/3] test/devargs: add devargs test cases X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Initial version to test Global devargs syntax. Signed-off-by: Xueming Li --- app/test/autotest_data.py | 803 ++++++++++++++++++++++++++++++++++++++ app/test/meson.build | 2 + app/test/test_devargs.c | 184 +++++++++ 3 files changed, 989 insertions(+) create mode 100644 app/test/autotest_data.py create mode 100644 app/test/test_devargs.c diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py new file mode 100644 index 00000000000..3b841e71918 --- /dev/null +++ b/app/test/autotest_data.py @@ -0,0 +1,803 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation + +# Test data for autotests + +from autotest_test_funcs import * + +# groups of tests that can be run in parallel +# the grouping has been found largely empirically +parallel_test_list = [ + { + "Name": "Timer autotest", + "Command": "timer_autotest", + "Func": timer_autotest, + "Report": None, + }, + { + "Name": "Debug autotest", + "Command": "debug_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Errno autotest", + "Command": "errno_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Meter autotest", + "Command": "meter_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Common autotest", + "Command": "common_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Resource autotest", + "Command": "resource_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Memory autotest", + "Command": "memory_autotest", + "Func": memory_autotest, + "Report": None, + }, + { + "Name": "Read/write lock autotest", + "Command": "rwlock_autotest", + "Func": rwlock_autotest, + "Report": None, + }, + { + "Name": "Lcores autotest", + "Command": "lcores_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Logs autotest", + "Command": "logs_autotest", + "Func": logs_autotest, + "Report": None, + }, + { + "Name": "CPU flags autotest", + "Command": "cpuflags_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Version autotest", + "Command": "version_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "EAL filesystem autotest", + "Command": "eal_fs_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "EAL flags autotest", + "Command": "eal_flags_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash autotest", + "Command": "hash_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "LPM autotest", + "Command": "lpm_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "LPM6 autotest", + "Command": "lpm6_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RIB autotest", + "Command": "rib_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RIB slow autotest", + "Command": "rib_slow_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RIB6 autotest", + "Command": "rib6_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RIB6 slow autotest", + "Command": "rib6_slow_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB autotest", + "Command": "fib_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB slow autotest", + "Command": "fib_slow_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB6 autotest", + "Command": "fib6_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB6 slow autotest", + "Command": "fib6_slow_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Memcpy autotest", + "Command": "memcpy_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Memzone autotest", + "Command": "memzone_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "String autotest", + "Command": "string_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Malloc autotest", + "Command": "malloc_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Multi-process autotest", + "Command": "multiprocess_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Mbuf autotest", + "Command": "mbuf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Per-lcore autotest", + "Command": "per_lcore_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Ring autotest", + "Command": "ring_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Spinlock autotest", + "Command": "spinlock_autotest", + "Func": spinlock_autotest, + "Report": None, + }, + { + "Name": "Ticketlock autotest", + "Command": "ticketlock_autotest", + "Func": ticketlock_autotest, + "Report": None, + }, + { + "Name": "MCSlock autotest", + "Command": "mcslock_autotest", + "Func": mcslock_autotest, + "Report": None, + }, + { + "Name": "Byte order autotest", + "Command": "byteorder_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "TAILQ autotest", + "Command": "tailq_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Command-line autotest", + "Command": "cmdline_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Interrupts autotest", + "Command": "interrupt_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Function reentrancy autotest", + "Command": "func_reentrancy_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Mempool autotest", + "Command": "mempool_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Atomics autotest", + "Command": "atomic_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Prefetch autotest", + "Command": "prefetch_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Red autotest", + "Command": "red_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "PMD ring autotest", + "Command": "ring_pmd_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Access list control autotest", + "Command": "acl_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Sched autotest", + "Command": "sched_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Eventdev selftest octeontx", + "Command": "eventdev_selftest_octeontx", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Event ring autotest", + "Command": "event_ring_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Table autotest", + "Command": "table_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Flow classify autotest", + "Command": "flow_classify_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Event eth rx adapter autotest", + "Command": "event_eth_rx_adapter_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "User delay", + "Command": "user_delay_us", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Rawdev autotest", + "Command": "rawdev_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Kvargs autotest", + "Command": "kvargs_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Link bonding autotest", + "Command": "link_bonding_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Link bonding mode4 autotest", + "Command": "link_bonding_mode4_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Link bonding rssconf autotest", + "Command": "link_bonding_rssconf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Crc autotest", + "Command": "crc_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Distributor autotest", + "Command": "distributor_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Reorder autotest", + "Command": "reorder_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Barrier autotest", + "Command": "barrier_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Bitmap test", + "Command": "bitmap_test", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Bitops test", + "Command": "bitops_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash multiwriter autotest", + "Command": "hash_multiwriter_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Service autotest", + "Command": "service_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Timer racecond autotest", + "Command": "timer_racecond_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Member autotest", + "Command": "member_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Efd_autotest", + "Command": "efd_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Thash autotest", + "Command": "thash_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash function autotest", + "Command": "hash_functions_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev sw mvsam autotest", + "Command": "cryptodev_sw_mvsam_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev dpaa2 sec autotest", + "Command": "cryptodev_dpaa2_sec_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev dpaa sec autotest", + "Command": "cryptodev_dpaa_sec_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev qat autotest", + "Command": "cryptodev_qat_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev aesni mb autotest", + "Command": "cryptodev_aesni_mb_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev openssl autotest", + "Command": "cryptodev_openssl_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev scheduler autotest", + "Command": "cryptodev_scheduler_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev aesni gcm autotest", + "Command": "cryptodev_aesni_gcm_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev null autotest", + "Command": "cryptodev_null_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev sw snow3g autotest", + "Command": "cryptodev_sw_snow3g_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev sw kasumi autotest", + "Command": "cryptodev_sw_kasumi_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Cryptodev_sw_zuc_autotest", + "Command": "cryptodev_sw_zuc_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Reciprocal division", + "Command": "reciprocal_division", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Red all", + "Command": "red_all", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Fbarray autotest", + "Command": "fbarray_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "External memory autotest", + "Command": "external_mem_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Metrics autotest", + "Command": "metrics_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Bitratestats autotest", + "Command": "bitratestats_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Latencystats autotest", + "Command": "latencystats_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Pdump autotest", + "Command": "pdump_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "IPsec_SAD", + "Command": "ipsec_sad_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Checksum autotest", + "Command": "cksum_autotest", + "Func": default_autotest, + "Report": None, + }, + # + #Please always keep all dump tests at the end and together! + # + { + "Name": "Dump physmem", + "Command": "dump_physmem", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump memzone", + "Command": "dump_memzone", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump struct sizes", + "Command": "dump_struct_sizes", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump mempool", + "Command": "dump_mempool", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump malloc stats", + "Command": "dump_malloc_stats", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump devargs", + "Command": "dump_devargs", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump log types", + "Command": "dump_log_types", + "Func": dump_autotest, + "Report": None, + }, + { + "Name": "Dump_ring", + "Command": "dump_ring", + "Func": dump_autotest, + "Report": None, + }, +] + +# tests that should not be run when any other tests are running +non_parallel_test_list = [ + { + "Name": "Eventdev common autotest", + "Command": "eventdev_common_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Eventdev selftest sw", + "Command": "eventdev_selftest_sw", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "KNI autotest", + "Command": "kni_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Mempool performance autotest", + "Command": "mempool_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Memcpy performance autotest", + "Command": "memcpy_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash performance autotest", + "Command": "hash_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash read-write concurrency functional autotest", + "Command": "hash_readwrite_func_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash read-write concurrency perf autotest", + "Command": "hash_readwrite_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Hash read-write lock-free concurrency perf autotest", + "Command": "hash_readwrite_lf_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Power autotest", + "Command": "power_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Power cpufreq autotest", + "Command": "power_cpufreq_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Power KVM VM autotest", + "Command": "power_kvm_vm_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Timer performance autotest", + "Command": "timer_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + + "Name": "Pmd perf autotest", + "Command": "pmd_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Ring pmd perf autotest", + "Command": "ring_pmd_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Distributor perf autotest", + "Command": "distributor_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Red_perf", + "Command": "red_perf", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Lpm6 perf autotest", + "Command": "lpm6_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Lpm perf autotest", + "Command": "lpm_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB perf autotest", + "Command": "fib_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "FIB6 perf autotest", + "Command": "fib6_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Efd perf autotest", + "Command": "efd_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Member perf autotest", + "Command": "member_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Reciprocal division perf", + "Command": "reciprocal_division_perf", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RCU QSBR autotest", + "Command": "rcu_qsbr_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "RCU QSBR performance autotest", + "Command": "rcu_qsbr_perf_autotest", + "Func": default_autotest, + "Report": None, + }, + { + "Name": "Devargs autotest", + "Command": "devargs_autotest", + "Func": default_autotest, + "Report": None, + }, + # + # Please always make sure that ring_perf is the last test! + # + { + "Name": "Ring performance autotest", + "Command": "ring_perf_autotest", + "Func": default_autotest, + "Report": None, + }, +] diff --git a/app/test/meson.build b/app/test/meson.build index a16374b7a10..842388b0d32 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -42,6 +42,7 @@ test_sources = files( 'test_cryptodev_security_pdcp.c', 'test_cycles.c', 'test_debug.c', + 'test_devargs.c', 'test_distributor.c', 'test_distributor_perf.c', 'test_dmadev.c', @@ -204,6 +205,7 @@ fast_tests = [ ['common_autotest', true], ['cpuflags_autotest', true], ['debug_autotest', true], + ['devargs_autotest', true], ['eal_flags_c_opt_autotest', false], ['eal_flags_main_opt_autotest', false], ['eal_flags_n_opt_autotest', false], diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c new file mode 100644 index 00000000000..13e95f052b0 --- /dev/null +++ b/app/test/test_devargs.c @@ -0,0 +1,184 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "test.h" + +/* Check layer arguments. */ +static int +test_args(const char *devargs, const char *layer, const char *args, const int n) +{ + struct rte_kvargs *kvlist; + + if (n == 0) { + if (args != NULL && strlen(args) > 0) { + printf("rte_devargs_parse(%s) %s args parsed (not expected)\n", + devargs, layer); + return -1; + } else { + return 0; + } + } + if (args == NULL) { + printf("rte_devargs_parse(%s) %s args not parsed\n", + devargs, layer); + return -1; + } + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_devargs_parse(%s) %s_str: %s not parsed\n", + devargs, layer, args); + return -1; + } + if ((int)kvlist->count != n) { + printf("rte_devargs_parse(%s) %s_str: %s kv number %u, not %d\n", + devargs, layer, args, kvlist->count, n); + return -1; + } + return 0; +} + +/* Test several valid cases */ +static int +test_valid_devargs(void) +{ + static const struct { + const char *devargs; + int bus_kv; + int class_kv; + int driver_kv; + const char *bus; + const char *name; + const char *class; + } list[] = { + /* Global devargs syntax: */ + { "bus=pci", + 1, 0, 0, "pci", NULL, NULL}, + { "class=eth", + 0, 1, 0, NULL, NULL, "eth" }, + { "bus=pci,addr=1:2.3/class=eth/driver=abc,k0=v0", + 2, 1, 2, "pci", "0000:01:02.3", "eth" }, + { "bus=vdev,name=/dev/file/name/class=eth", + 2, 1, 0, "vdev", "/dev/file/name", "eth" }, + { "bus=vdev,name=/class/bus/path/class=eth", + 2, 1, 0, "vdev", "/class/bus/path", "eth" }, + { "bus=vdev,name=///dblslsh/class=eth", + 2, 1, 0, "vdev", "///dblslsh", "eth" }, + /* Legacy devargs syntax: */ + { "1:2.3", 0, 0, 0, + "pci", "1:2.3", NULL }, + { "pci:1:2.3,k0=v0", + 0, 0, 1, "pci", "1:2.3", NULL }, + { "net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1", + 0, 0, 3, "vdev", "net_virtio_user0", NULL }, + { "net_virtio_user0,iface=test,path=/class/bus/,queues=1", + 0, 0, 3, "vdev", "net_virtio_user0", NULL }, + }; + struct rte_devargs da; + uint32_t i; + int ret; + int fail = 0; + + for (i = 0; i < RTE_DIM(list); i++) { + memset(&da, 0, sizeof(da)); + ret = rte_devargs_parse(&da, list[i].devargs); + if (ret < 0) { + printf("rte_devargs_parse(%s) returned %d (but should not)\n", + list[i].devargs, ret); + goto fail; + } + if ((list[i].bus_kv > 0 || list[i].bus != NULL) && + da.bus == NULL) { + printf("rte_devargs_parse(%s) bus not parsed\n", + list[i].devargs); + goto fail; + } + if (test_args(list[i].devargs, "bus", da.bus_str, + list[i].bus_kv) != 0) + goto fail; + if (list[i].bus != NULL && + strcmp(da.bus->name, list[i].bus) != 0) { + printf("rte_devargs_parse(%s) bus name (%s) not expected (%s)\n", + list[i].devargs, da.bus->name, list[i].bus); + goto fail; + } + if ((list[i].class_kv > 0 || list[i].class != NULL) && + da.cls == NULL) { + printf("rte_devargs_parse(%s) class not parsed\n", + list[i].devargs); + goto fail; + } + if (test_args(list[i].devargs, "class", da.cls_str, + list[i].class_kv) != 0) + goto fail; + if (list[i].class != NULL && + strcmp(da.cls->name, list[i].class) != 0) { + printf("rte_devargs_parse(%s) class name (%s) not expected (%s)\n", + list[i].devargs, da.cls->name, list[i].class); + goto fail; + } + if (test_args(list[i].devargs, "driver", da.drv_str, + list[i].driver_kv) != 0) + goto fail; + if (list[i].name != NULL && + strcmp(da.name, list[i].name) != 0) { + printf("rte_devargs_parse(%s) device name (%s) not expected (%s)\n", + list[i].devargs, da.name, list[i].name); + goto fail; + } + goto cleanup; +fail: + fail = -1; +cleanup: + rte_devargs_reset(&da); + } + return fail; +} + +/* Test several invalid cases */ +static int +test_invalid_devargs(void) +{ + static const char * const list[] = { + "bus=wrong-bus", + "class=wrong-class"}; + struct rte_devargs da; + uint32_t i; + int ret; + int fail = 0; + + for (i = 0; i < RTE_DIM(list); i++) { + ret = rte_devargs_parse(&da, list[i]); + if (ret >= 0) { + printf("rte_devargs_parse(%s) returned %d (but should not)\n", + list[i], ret); + fail = ret; + } + rte_devargs_reset(&da); + } + return fail; +} + +static int +test_devargs(void) +{ + printf("== test valid case ==\n"); + if (test_valid_devargs() < 0) + return -1; + printf("== test invalid case ==\n"); + if (test_invalid_devargs() < 0) + return -1; + return 0; +} + +REGISTER_TEST_COMMAND(devargs_autotest, test_devargs);