From patchwork Wed Oct 20 08:21:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102386 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 533A0A0547; Wed, 20 Oct 2021 10:22:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44A8840687; Wed, 20 Oct 2021 10:22:24 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2051.outbound.protection.outlook.com [40.107.93.51]) by mails.dpdk.org (Postfix) with ESMTP id 432D040142 for ; Wed, 20 Oct 2021 10:22:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ULRnFsB9llzbCrOlAJG/PJQdyyxRgyBpFc0TzDZIIl+XETZxQy+l0za/CKDwTlSGFtAGR9Q+BYV27b0f0E7YFc3NR908IE3RTcGx6ZAUAluKxiHLNF0bjoAr1j6iQrmHQ3KtOlKDvpqit/L5gVcyRU8mRlX0b2LaD/IkLZzXEV+/5NzX1z6bJGsELaPUp6BlZ6i+4VNOrvAnC8I7dfEed9ceUwlf/75eWPfMnrxK8etiSziMDV0/S9pTI0TAFO9LrDe9gMbPOgS20vWKH3KqfQtQuOzFVFNcKU/qwRp2KtrV+Dqw+zY+cg+hFJQOStLBRH+OG+1OC6Pi1aYU2VJK1w== 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=BBRq0Y5jUiIJJbv+3GAivFd6S2lyleTdvGF/FXKkI0U/VGQL9UVtyb9uCkzpWyxklZmeyG/NOobKpgvbYzpreO5yYB1uEsBX+DqQEQMIFQloYxRP9nP/flS3EcJ+nDKLiLAbhuyvbq7AXt+nFjMOH6hBg+0lqAHKRq9nLUDz/Muo/twjgA/952XLfcZXTEvBn74QSWjuOcjRD/EQ8CZH9S725AIONH0tvzo6GXo8FCO1P87nXixT3YN1Dc0QGDFR9PtCKqkiztQZYoTDag5ltWUORI0lc3Cprtflsk0zu0noN7NyJe8j10KOyGJW4kWsfr1PJ1IuGW5l25fKVeEnqg== 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=ok9hlGk+cEPNU6DSEGh/Qu0QigCya8dqSmTsY+9Vb6moUsuUfEP7f3jIj8lRaZ8UM+Y+yM4r2+XvYGgXhLpPg0rgGOYOb+l02Z0gGCXz7ga+xnf1ln2vi796sVRH7Lm/Ci84JbXwFoC4N3q56OSJfqbZp9rkskRpU/S4mjClBUsILiMQReP2XehNjOkljIS93QSJrGfyJ/92utuCTW0A+jFdaVox3JhyMzFCQl1dHiHvw8FLO2zvTZGgMmaZyQQ3JpoC/GgpIT7uUb72Rbzw4anWAqdM8aPrKpZgAWsg133XxywfiyTbctu0CxJ7F4z0imM9ZUUUwkN8JOzo2lR8Yg== Received: from DM5PR07CA0115.namprd07.prod.outlook.com (2603:10b6:4:ae::44) by DM6PR12MB2940.namprd12.prod.outlook.com (2603:10b6:5:15f::19) 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 08:22:18 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::86) by DM5PR07CA0115.outlook.office365.com (2603:10b6:4:ae::44) 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 08:22: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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) 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 08:22:18 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 08:22:13 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 16:21:58 +0800 Message-ID: <20211020082200.2412189-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020082200.2412189-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020082200.2412189-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00fd3a6e-4209-457b-6c83-08d993a2bb72 X-MS-TrafficTypeDiagnostic: DM6PR12MB2940: 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: BQDu3ZHbLTsrruQ4KX4sJQgUWba2an3Je0qbYH6Jh0RZuAKnkIqaXKNfrnV+TMqo7zDcGhoKMxyljlRUYeiyvUIA7hjQefGVMQKGIEs672Q0grlmblRYxh06YW1DuLTn+VAXGDDPPDTwB4TWIweyB4Du8nMnEou5WN/nPA8bS2xC+nt9yv7i++qN3Y6PAYTH68+fRWlXRB1LvcoiY+ZqHp1oB5xwl0juuUCJqCRBRufDMNTzA/SvksrW8/KsgjZOhh090dnZY0m54TRCpa3Z4OIC7k97vGAFAm4msNlNRZ+ztK5xdzfC11OsfB2c/A/3S5vH3/vqsA4zxKdcTGr6vyeJ6N20NgWBGHYXThvxBfoui5Wz51IQh/4vqhl03qnMeMRioDYgMjnviwiIRz4+Apl1mJzYvOfMtJk7HD/79UOFnDU7Ljpv1GpWZXYgWmYFVExjSTeNHaPfcuZU66CEufRUzDRERaJQVvlGMs85AiX9LJj9rxpIeM029VouSvQ6KqE2/uK1ljskI0bIHx1+xOdVHzMGix5FH94KyQeOAEcoCe4/2zmBh5yp0Hln+JHBMXXwY5woOEvNXTZd91glhEgLvsjoUv9p0E8KOwrXI4132XvACCm/nUEtfXYAb2AO7i/YBpNN5jn8hbH8SOr81cn54b8w57R1jvpk+1Omzdpj2ZCjeat5hf05MKCVfinKknAv5AHSIOGydYhbZz3f2A== 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)(86362001)(47076005)(5660300002)(8936002)(36756003)(55016002)(316002)(83380400001)(82310400003)(7696005)(7636003)(107886003)(26005)(336012)(36860700001)(36906005)(2616005)(356005)(70206006)(186003)(54906003)(508600001)(8676002)(2906002)(110136005)(16526019)(1076003)(70586007)(426003)(4326008)(6666004)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 08:22:18.3662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00fd3a6e-4209-457b-6c83-08d993a2bb72 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2940 Subject: [dpdk-dev] [PATCH v3 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 08:21:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102387 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 1BC8AA0547; Wed, 20 Oct 2021 10:22:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C9A7411A6; Wed, 20 Oct 2021 10:22:25 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2089.outbound.protection.outlook.com [40.107.220.89]) by mails.dpdk.org (Postfix) with ESMTP id AEA1240683 for ; Wed, 20 Oct 2021 10:22:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cTdXgmy4pVxQtHSoGuhZRSIPmq5U/i0DjQfT5OeP2dQGKQ8WjM7cJ2n5nQuiiHVjzqJsOA5rpmFNKFOqycMsC54Oog+hs0oG/j2Q5f8/aEFE8KFl0CwnFAW+0PwZ1n2fRyTQwABo0Uq0Wet8cqzeNgWEMc+26c3ymscFuvV8HDePTohN92tjJrGMY2sc2K2Jo4/lnGhiccbCTyqaJy605Nf/1Kk/0mPf5PhoHnCu3kGt71TlZSV/4D6md5Mo0Ze7Q2aSFT++xW8JQ+AW01/euRWFiYfhXilqXC4DzUYVpeq4Vm+IMt4GxSXZ8QumuiBPwmItHl6tXl2shqTCEk/HDw== 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=YbsFn4WtmCbjcsTj22jbJZIroA6Q1s8EIs2qdWEi9VFdCRiy6b9ZUyDbq7KXrCgnS4/9LaMjyZ+QH6B0n+FrRtReEGFgB3U4eDu4Au9CBhaAxsIt58VxT7hFgYLWqTGMIEckaW/VlSL2irnCbHbHTO03Ae9wkQFA6ep6t2mn1pHNDcGiDxJKGKMroa1q1bz10qLFBEqBzdRSjHTdqpuF5PlEBeALnDbD4eyiSFF4dquK18stJMn3oCDAJij6pDaG/3ZpYgk+91OvhLV6pc0Jg04syZgdEXBMtWLuF1zuKFhl8oYca+b3q5daUKqiL2HlsI6kNrigvtaGltSOY+/s0w== 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=JHcX3lEJneELXMe0T1LqmDJB8RnFFmyGDtwx1jOr33F3euHQD4WRVoyane63Le8WNYTJScxw0ZmCGlyTQoUuzwhBxrYPaNbXlL+JgBMRltsavzorWRZXu1M4sHxpV66Q7ZExIl52NJYB4f6qzVDhnmIX4PHDDlpYQOeD6vOOkvV01f7dvX0O/2csfYXuq9+MXPeO+UJrK42/GWrZ8M0DiiEIp37IqeDCx4QUMpZzjlyALilMUb3y4dVdhaQM+mmwcdYCJxnUQ0JjOCcPucg9SVGpJtQ4qpQbW0aZCrlBaUJ7nmTPNcdHwzIcEOt3ahFQEV1h1YwUrARInl0cw0HBxQ== Received: from DM5PR07CA0101.namprd07.prod.outlook.com (2603:10b6:4:ae::30) by SN1PR12MB2478.namprd12.prod.outlook.com (2603:10b6:802:23::16) 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 08:22:19 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::af) by DM5PR07CA0101.outlook.office365.com (2603:10b6:4:ae::30) 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 08:22: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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) 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 08:22:19 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 08:22:15 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 16:21:59 +0800 Message-ID: <20211020082200.2412189-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020082200.2412189-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020082200.2412189-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9ddd884-0b79-4b53-52ed-08d993a2bc08 X-MS-TrafficTypeDiagnostic: SN1PR12MB2478: 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: WYK3kGQv960Q2A1SQMB5ni2VmmUf9RJpQna/jiahhFMhgPm4BPxzp0HKhY2dJILL5EspwM2MUBEvXIxGoJm/xqAPw+CX68zKqUnisz5BHEQSFi9R2aQj2/w+dZJZoJBBBdfnOZtBuuolYZQWFLaEAeM6CmjL4TlVMVcFot0ycl/XksaMMtf49iXc+b5G+7f+GHpxWd0XzD8hxk8+CcGKBshWuE4NTV8SRU+apAGI8Az+YkzJa28o3OyuIsHLuvR1SlFYuy+05UEM0i0ajwMamSSCZp87U+HrH4uth3+Oe8//5QQODA+tBs3atY5SzK4Xf3fQTU+z0Sk+tn1vjmnfw5Js7Llxwc0UsZo1Z/2Pn23jQU72dhNCihLFSdUukPOtwX0zplrZSSJX+qj0amSPS+tjzwcEvIxpv4hD/30ZG1rOqU/ZAAHfyRxUradjryTCqob7QXfBbzW19qydJrwdNdvwLA+debWmUoZTlrFBHBZVq6Fk4BpaCUa1S4eBqgu4UkWNEl5cBhmlj0TGe/45B6SswZTYfCOrjAFk6mZ7q4lyr+lkFPccwDohXXDrE/bDBC3OoVY0r2SavEdOzn+Tm0i+Fe4DF2kaIR2ISbEcNg5M+/6Inj5VAPoqzguWbNjPI7mTI47tSAK7TfhjBGfIOzOGdryAkl19MmtFjOe/S/ZLIJfQ1xOHPIce8qU8dPXt5pimY7cR3LHkmQVCTDIeqw== 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)(47076005)(336012)(7696005)(26005)(186003)(508600001)(1076003)(16526019)(83380400001)(70206006)(6286002)(316002)(36906005)(110136005)(5660300002)(70586007)(86362001)(107886003)(2906002)(8676002)(6666004)(7636003)(8936002)(356005)(82310400003)(4326008)(54906003)(36860700001)(2616005)(55016002)(36756003)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 08:22:19.3346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e9ddd884-0b79-4b53-52ed-08d993a2bc08 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2478 Subject: [dpdk-dev] [PATCH v3 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 08:22:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102388 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 D732CA0547; Wed, 20 Oct 2021 10:22:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D0EF411BB; Wed, 20 Oct 2021 10:22:33 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2085.outbound.protection.outlook.com [40.107.92.85]) by mails.dpdk.org (Postfix) with ESMTP id B8F7140683 for ; Wed, 20 Oct 2021 10:22:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IjoB3ymd8xg70ML6y9265esxyz1ZuraAlREh6Lblzzc7xya3hkgmB7Cr6hfdPksjZhJblsUh71+fWkNbjr95mXDJUxHrKcE2hUSKDMQFmlBAufv4LwVE8XqmBY6H/PLXF/5LVyxfUbOM8ImTD5cvIrK1brsWmJyphshNq724T3PqPxH3r1RPA9S5L7lET1cbpYxbVgQ3+yqB45qNxoKM9kvNmMuvuU5uuv4J54nfT7quCaZYZ0Q0ykqbQhSVdxh+WGKw0Iy38n/P3oYmQj/ZVmP0nCIvoB0aXdaZLfnCxmD57VdaeoizFtXSJvhYAJoWpwr82W4+ltwrCp/mSPE5rw== 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=RMngUD/DhjNgde+VVAeZnZyV5dI+nE2n/WwXl2gl/1c=; b=fbzvyibUcEd+oxq9uNMCFGITbbJ01zV8T7pPfxYczwq282tre1nal5KjD/t2kiZe3EAa39Sd1COLPQX2B9B3j/dKFz5CBqXtMh489GQ1i+NJUbZ75qgUTiRcEFi+f/1z56JabMPE/IQmOt8sMIVX/2MfsejnfiR+ZtysIiWErxdDtUnUEEKusajnwxM0sFRxVs7I3fE7p+Kqo/qY5y9FcCS0w/+taLqRj+Nj6ajpS6kUnmXCTf1CpC56kkTtwhS/a/uYPUceV/dzkBwEZd0LZyaNNyyho/golSKIZvN+DuXYDbNkyZ7LbkfpCHp+s7nD1fBZKixAG0iEieo4txnOpQ== 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=RMngUD/DhjNgde+VVAeZnZyV5dI+nE2n/WwXl2gl/1c=; b=BWZPWK3AuyysWx0EWjKVByy+q8Fk8QtcDAco0+uqXYjEY/cBlSZJKSDDM4fjnmAf265CLBu8GAPfy7uri7x9ZGyEm+NDQ895MqUPinxTIo2dYlCGvH+VLHl3EZeytW+FBW5X/PwRUvJnwCnjKad63JcSJSnxBJPTsp0NPRURrGo8gcqOZWTgad5M0pTb0TKIv/PqFaAxCccqZZryYjOVJ2WHvGx3bezIXFRWpFb8Mxe3C4SxfhFbBAIRV/Xy1c7HJ8/ls9hI3RkOiuPSal4a/Qa1GbruL+qailU5U+JZmGoDEkPBTmztVNdoqrD+cqav8SfUNO23Mkjz6tpCkU1EhA== Received: from DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) by DM6PR12MB2987.namprd12.prod.outlook.com (2603:10b6:5:3b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15; Wed, 20 Oct 2021 08:22:22 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::72) by DM5PR07CA0113.outlook.office365.com (2603:10b6:4:ae::42) 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 08:22:22 +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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) 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 08:22:21 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 08:22:18 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 16:22:00 +0800 Message-ID: <20211020082200.2412189-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020082200.2412189-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020082200.2412189-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67f75303-1fc1-458f-d574-08d993a2bd6e X-MS-TrafficTypeDiagnostic: DM6PR12MB2987: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c+5dx9CUApqVuweXEm96Sn/UJfVMuMswQvPrORoqR9Eyf7j6UNm4R9mjlHVMi2Z0y3gLl+v+wu1r2q5+bEqq4gTLc9sbit2adc3L5y1F0afB8zxzzXbAWExcmDUraM/Lznu1Q2VZZkNK4t34S2nxb+bW8ythn+UV6BwknktCbHRpHfYplT10koCVb5rGK10TDlWCa/rZ7rUcUXMgG6PFXYltR4datdV2mwsBJBU56Kupx+uD8CFzSC7iQ1RpwfLcJrPFJjWiRJbYBPLYKjaFvtV+xkluh6SNXw49eDUvuiYbVJhBLZm5IcTv6kFd5MGrQkHMd/ZpwPQ4AlM8E4/lsnnyobZt9ceG1/gf81bfxMe9F0mbA3xPH5BhlFAJ8NkB/Ha7QhdJwoJOQ5asd7VVKVR1xO84zmi8xAMK9izvcrhlZorcmgBna6O4M2APAmgL0wWRTZsBBxm2KYYvilLwUJslENyWW43fyzZCgiCACEGMsidlDsJQuI9zVHASRnlZDa8nzOpjVEIySM34NKYMO/ha5XY/WVSKCPrEMLILu4y7cYoKL2BqwTlwrcQBEp7qqjt1t3cnwjNS8uYvxWs7wX0QiEjZSfASeuR0DT+1gbFpFEZFQ6C1dv2Sfyf6yMP40v2vGnboYBX5XnD6mf4eO4zplWqTD3qjD6IOtgcaPW0mS5XKVjOKRX7pS5QE+02GpOJNbBsKkAz8jZ+4n/7BQw== 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)(36756003)(83380400001)(7636003)(356005)(2906002)(508600001)(6666004)(107886003)(1076003)(86362001)(36860700001)(82310400003)(70586007)(47076005)(2616005)(6286002)(426003)(336012)(8676002)(186003)(16526019)(8936002)(4326008)(26005)(54906003)(110136005)(7696005)(55016002)(70206006)(5660300002)(36906005)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 08:22:21.7181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67f75303-1fc1-458f-d574-08d993a2bd6e 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2987 Subject: [dpdk-dev] [PATCH v3 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/meson.build | 2 + app/test/test_devargs.c | 184 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100644 app/test/test_devargs.c 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);