From patchwork Wed Oct 20 11:12:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102413 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 28DAEA0C43; Wed, 20 Oct 2021 13:12:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A7A40411F2; Wed, 20 Oct 2021 13:12:53 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id 8A2D440142 for ; Wed, 20 Oct 2021 13:12:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uw64sek47AtouJOK5MP0nLD2ecm0VcFibLX+gDzL8pDfUbQSwMUy3t6yAdFTGwwAmODanSBstcu4TpbaR9dLTBEaHO/WY9V3VRXwOn/6aplGkB+FVBHajjQHWf0jpADD1QCMmbGbsQqc9pNwrXuO8NKttVvH0BUCGi4RcykZ/HCrzpHRjF9zpuPIo4gJ41sg/FM+nu0BAXrczdTjtapOkzVn1IcN7JZ4nKBcmF9iEEOE21BqD/WLG71F9u8Zj5p4ylzZ7vU8sAOiQv7QpI7fe/bX5N6b5TvA6j8NfOiPFrhmUYTySaMygqI5ST8H8MAWQdfj5b0tCQKZR0fMLr+dVg== 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=VbNropHHrHvlcuCAkBBydB1I3fw5e4ifoG99jFTVsW4txub3Vnzp92nDO3kS/oHLI26qF8Oshr/1pvKcKWtr6fQm9BCKKvdublcsG1m7o4NuqUCrjtReCC2x09DSy53mOpx8eTC6/fbQ4ldsUd2xYyTOo9dDjQw1piUhODVYHeq0k7mcpMpUHpEaaRTgW8jC1pd08OTTNCihYHMkKDA3mIgLWZWIA0sqHeUsKR9Pc2hVS6Mc5/9+2I7tAN1UB8THAEctYdrwwU8FMuU8tjfTvhzVm8KVxP8UTJX3BP0dXKLtZtzHS+t9wVfpfeAGjqVI9NCr4IiY5Kjj/GyUxpO3mw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com 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=VKKMxG3yr/HADWne5wlKPGepxnh9LxFIdzZf1G+ImO6mQd3+1Xc69okFzeQfjE4dxguCPmUE0MF99hXbBxsYFu839QwF+iaO2QSuYxhX/A9jHr7YsMi+gK665KyPFfUGwXCo8oMChRlaOp33KUiGrlEk2JZ/p9K8bSMyd1mXW/J431Xqws7V7XwpQNZeJkA+fjN4TYpbbENg7kIMwR6bAXXmOtrzeLqokHi7dLXVakK3tl8mkNAnbbMZnrsX5ySbQZqLDWS9Risud85YSbIbUXhWin7eNZYZHDTwxNFq9IvR0++tsKYnzSrN3fSUV3qlgb7+0cOJ7ePUp8BXCrnprA== Received: from MWHPR11CA0026.namprd11.prod.outlook.com (2603:10b6:300:115::12) by MN2PR12MB4552.namprd12.prod.outlook.com (2603:10b6:208:24f::17) 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 11:12:48 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:115:cafe::c1) by MWHPR11CA0026.outlook.office365.com (2603:10b6:300:115::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 11:12:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) 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 11:12:47 +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 11:12:43 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 19:12:28 +0800 Message-ID: <20211020111230.2441949-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020111230.2441949-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020111230.2441949-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 00c07ebb-5905-494e-04d2-08d993ba8c66 X-MS-TrafficTypeDiagnostic: MN2PR12MB4552: 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: JtZXQgfld3Rf2fYzobeO3npL5uum5pBSijBvksQO3s2GncxFJgyBZP78H6Yp8b5fJTG3r8jFFi5tiAsCYK10Sk4okW99AAA3s+BVwc809ehMYE6Pj/qB85o+awckxET67rH4mloXzx2hqmmbMBWEqJyPfjfA1Cup9djZe2gCvUrQ3fyboXcs2zDpNu1tqUyaxJF6srmAcSgVZG2iGA5wJ0fWrDxzk7Vw/yehowEM5sa4C91lXVGUPH3ymtVI+YBkronvRtQmGDfztBXVbXnzKhrTEG7BybiTbvyfY5KLRmgSR7eJ5R28Epopuy87S5G7u1rMQZCnQ0wAI8sS+MruOv4RnCOs3agSqNNCXfnMBqrkR2nruVfJG2UBoc9jWkLYV0YW7huOJz2Vr+l/vkNxVA2TU2yNjWnAZH5BTGdj/3OSOIYVl48RoQlHf84kg1vUzjKHRzabzj3xkVllmYtZy9ue5ExnROnZHfIXsQPVpz6XZqYi/GRmyjjY/pYKZUaykNOh24gyc1c9/+iFVCRJsOYJBYniQAbFVVkb4JB+MndQBNZMa0xGs3Xdrt1MoYSLmTjFd0jDC4paWJ78kYNZFickOjEcPYwExi1avygVygj4Y9Dvue5v+uSSArPgaAe7Hj5FWasGd03IrIj4TF8DMS8zPaMBe5WNkITZGgDgST3bvuvBBG9A7dKOxWga0xNLjcpoghSyDQmMiYB+IN3Xyw== 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)(5660300002)(8936002)(70586007)(36756003)(4326008)(8676002)(110136005)(47076005)(82310400003)(86362001)(26005)(508600001)(70206006)(16526019)(7696005)(6286002)(83380400001)(55016002)(186003)(2906002)(1076003)(356005)(107886003)(36860700001)(54906003)(2616005)(426003)(7636003)(316002)(6666004)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 11:12:47.3255 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00c07ebb-5905-494e-04d2-08d993ba8c66 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: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4552 Subject: [dpdk-dev] [PATCH v4 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 11:12:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102414 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 21355A0C43; Wed, 20 Oct 2021 13:13:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D8A6411F8; Wed, 20 Oct 2021 13:13:01 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2064.outbound.protection.outlook.com [40.107.237.64]) by mails.dpdk.org (Postfix) with ESMTP id E7CC7411F7 for ; Wed, 20 Oct 2021 13:12:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mxpn6J/hhqBpLdO19T+O3rBEgJVgUr1VcXdiNkF/zE6SThqnMIgxAmRStJCjUyTcy9pHpSzpfv/RcgVY0w+gv2UPnG56k8rSr48EOW0XD7tP5y7h7P/f68OxgROv6DuOrrFt+gjyJKOVmrzRjF6DOQ3VeNoaxc0t5YbBoMbC/TT8k6kEUuTabA6HcVYozAiOrQhJPX4QxHD3XCye883XVwhhNTMILT19nsgIWPncFUguNb7Oh8ChA3f30rq/4pMj1B4VwZpioyxjWmTLGlkc4wAoQ6p57vswz04CTmHSvkCHHRj3KrcmIKDUVFQcbaa+lF9TO7utnQh21keB5rmcPA== 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=P08eicn5yliiOJj0q2phMtiXlKzfDQdIkwzzvI+uovG1VX5CSYqUslzPJ8UabJfMjZ26/cprdeef2H/XYeR0FpZgdU42L7MFrO2iCmV1ldlLm5Pokmj1cAD+rWjrEV7yzYsvc0SRVWPZz0Ge7FmtsW2Uv8qK72xPu2FHNnUFC+IYe2zp7z6wFjg2QjB4IlfSDnAbJ1Pla1z1eQDR+0qH8/W3AcHqwwhOwS+QKKg5CLfH5BgE4tHK8oEsqz+j8wS4lObLcvsmgYApKKVHJUXX9ssaV0ECzMVrGi8rbkCJ1TzMKDws7IjsqrbpfOZT+6zSwKFTkSTfyic4pxmqTqGgSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com 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=KoGreNOS0Ut6/5ZCeAx/XB6m9jvvaKjgZ1xf2ExklUJxtyJ9o+pTwxSY0Askyw7x07j/oiAnQIzfPp1LOwI2EtmU6hX3PcloqWzl5unmxIhZDqAsgTX0SjBqQJnJ6YVtUXOI06BVptQYqoPe9m9t1Ojz7g2fEiCLgWX82rnW4la/PxF0FUCjMU6cKXsUnNOJw3tghxIWXg8mJbaLljuUobdCRdGqFbtbjldXmds/DjoPzk2hbCZDi/2OrhIx2cpg2qWZCWZOxm9UPPDn/CwS7sBWDkUrUINfJnDZv3o5DgaCxCGW0SGp8pYC1KQZtt7Kn5Ri00YUBlSLpE/+sCRKMA== Received: from MWHPR11CA0026.namprd11.prod.outlook.com (2603:10b6:300:115::12) by BN8PR12MB3617.namprd12.prod.outlook.com (2603:10b6:408:47::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Wed, 20 Oct 2021 11:12:54 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:115:cafe::c1) by MWHPR11CA0026.outlook.office365.com (2603:10b6:300:115::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 11:12:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) 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 11:12:50 +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 11:12:45 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 19:12:29 +0800 Message-ID: <20211020111230.2441949-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020111230.2441949-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020111230.2441949-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: c763f7e8-4140-4593-55e2-08d993ba8e2a X-MS-TrafficTypeDiagnostic: BN8PR12MB3617: 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: JT4wH0tl60SuMgjhk28HZBW57Xhb5TXlO7Wud53DVdO1UELTtMPXbcq0WhPwPfWh4dIyZYgNydTpxuTrUxxy5ZdAGT1p24EffLUw3Y3kOz4818Wax0pH4RCCvSQQH1DDjS6p3stJlapiZAH8lHn5vnQawqtZhx3Z0nIgiil6Br8RT29Rug0GxYJwRmRKH3heIHwsKH0mjCArZlNi8kpocZOYRulXSzc1sBL9nbZ2J357aNXf91mEm7qHWIRq5ieLRlzYB9dZ71JVU7Gy/s+pqrt9ta+mhNbPjZZkYZHS+0qliYg2wC5tDCkzqh88sdUPs/S3PltehOFLkh6i5g15Byf1iE5weiWFYtPvkKevqvoREhjjOstaUahdmG9AKX6GyADWM2GLZZb638gZGEFobM4czy8NsMmr5+3Qv5FLbo6u5xnf9/5ExfUUhqN3UAohqPgnLNSxE10IAm8e3euv5paF3O12aXs5DotxWNKXX4AplbFC86bwueuRamor3C9Tl0HbS/iv7b8AwnRIZ4XcIDRGC9/KUZjrthcQeWih0hagEMhxOGy3fX0i7veQeJyneNGl5PD0iy0o0P2/1KvmzU49mud3U/r5EaQzon8F54BlanRHuz7Zss/vO/uOEVr0yBd2ZsuMHi/UQe8KDH+ppnjTI3jezPxretT0ai8VYh/KrSHajE7DFK9ATTZCDX7lKeWoIh0fvXyCvEyjDmBE8w== 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)(107886003)(5660300002)(16526019)(6286002)(186003)(110136005)(55016002)(426003)(54906003)(86362001)(2906002)(36756003)(26005)(316002)(36860700001)(8936002)(2616005)(4326008)(83380400001)(1076003)(356005)(6666004)(7696005)(70206006)(82310400003)(70586007)(508600001)(336012)(7636003)(47076005)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 11:12:50.3607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c763f7e8-4140-4593-55e2-08d993ba8e2a 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: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3617 Subject: [dpdk-dev] [PATCH v4 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 11:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102415 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 26EC4A0C43; Wed, 20 Oct 2021 13:13:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 405B741201; Wed, 20 Oct 2021 13:13:02 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2088.outbound.protection.outlook.com [40.107.223.88]) by mails.dpdk.org (Postfix) with ESMTP id 0832A411F8 for ; Wed, 20 Oct 2021 13:12:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M7UuSskOYBkAcUkqzqUerEvWxHtTL9XRopyGtakyGIPBTThI5zuvUP9bbH0y4ZUIISLReLICoIcBOKrKdE1Jrmv8I2Q87Yq0MKVovTEbF18GhFi0vFq4CCDW4m6GON+HU+PgSJYA7uTYcFy9+eYC4jVuTBEBIprOuGXgHaDJHqVsirML/c/lM6JSNY8X8t4H8EecaMw3uqP5Zmf8e08hnQZkdtwRj1YWVfIaxYwHyGkmjEYzpledVB351XuXJhOv1S/LLTfUEhVsCMin+391vkokfUFin80SJA0VlVrVmjJSSdIiux8q2ZEQ+eUQzlbMgQJ9C/NlWhGp49UJhYmJSw== 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=p1Nl3/RPWcdKYf+56PD26YPtTBnf2ajaZ+Rf5GEgG0k=; b=jup7NH4GQxMeeMabdDIcV8kYiMwsZwcdO0mBR/s+cJvbDhvjfUmRiUcDTt1UuXXzvqPQBWCSqJ1LsJ62jLapTVV7RM6x9lZSXDuZviC5LMJ5mA9+Q62UUzmm8/WgJSsjZNoXuxQd5HUbFo6JjlAyJ3eTx/9S3HO89Vjx+EXLqWcr0CGci8UjPfIRPf6FtAQCU+vPrXrsKqkIda20t1qHpqUY0e4W8vQamweoJ2yHcsl+rLMFyuCwLucERiX+Wffv8/i4qs8VfrMoYiQ9HOkBDjgscWNDlG6N/IwfRZbBQ0Mcm8q7EDzTraqT43CM+0TCFRqyZUlLmJPiLuwfwRlXsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com 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=p1Nl3/RPWcdKYf+56PD26YPtTBnf2ajaZ+Rf5GEgG0k=; b=S+HSgVYDvQGZ9Oc/ij0nkYFze4OfSx/LZF8RTKYmij0xU4EISftKFkaavBYtqsG7yWL5f5TeiEDZo0CU1wsIH3NihkQj3FFuEql31UDiByBe6CNAcjCrJHJPToFqFjy4S/bMNGgxm9kU/QBdPMOmye59J2YoXEhf2pu3bcXICHE7LicSykC6VpSLQI/divVw7RlJP3DwRA24wD/sMLwMtZE97FFn7pJ4PtedBHwhqxUo2ipxqPS66xc5Qb6MUE+jZkMQSJQ/0G9kpYpCT5XiIbyXrRkYbAJ42otNk5xUhanvwG6pnq4N+onXdkKKmSa5Pn1nlryDkNrs4afhz9GgDQ== Received: from MWHPR11CA0032.namprd11.prod.outlook.com (2603:10b6:300:115::18) by BN9PR12MB5340.namprd12.prod.outlook.com (2603:10b6:408:105::22) 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 11:12:56 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:115:cafe::c7) by MWHPR11CA0032.outlook.office365.com (2603:10b6:300:115::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 11:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) 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 11:12:55 +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 11:12:47 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 19:12:30 +0800 Message-ID: <20211020111230.2441949-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020111230.2441949-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020111230.2441949-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 99ccf738-d89b-4452-7928-08d993ba9145 X-MS-TrafficTypeDiagnostic: BN9PR12MB5340: 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: IvI+qTBqEIDq5xSy2ZZ2I7HSxUkt4nG3tazNwAlGMp8wqYn9IccHA3ZJJzk2nFUZEByvk9mh945xlZrl8YaaJzc3TOxAh0uTGwG8xFU1MWmpIvTIJNymT/b0ZliJQXgK/QUjQWLPaPh/0QY1yFC0UTjD9wVHH2irEOKvxJksZjS1Wiwn6awfaa/C+bt2nIYU/htqLp0ckQ08oyoOhzKBFn03jSUbniE13Pl/QRIqmg1CL6uqBrM1DaMEyRXdxkhE7/D4D/aurPEE+SJ4aTjPUDbXaBbsgWAe/WwCy41LjLWSVi3uUZRLkI7qoGCCnP2NnX1zpDUTa0PhBJsUKItqxgah102BxSQRiCLElsTaummC60hNweTk1W/rgLXpI+paEbKP+U7jRVNfp/lK07VPwR0D07aiEBvXLrJkGPevDerChVGP/ZdJK1KBj44ZkuZgLQvz3rjS6Iet2wBnP9ZoLtgfQE84seT+z6XRdfvSs5BIaD9VU/PFE5+d/r61KCiWLhzyYAOfL3vF6OP+QnyiMMHrSUNr0t2f5MMmvK6/e9QDsQg1CdMq0DqKF32O4cs0wZRW1HiRHlM7i4ZDPZGxkuPEJ4VTfiwmv9xyjNWbpRbeu0vnzihOLcO01FK0Nslh7hcatV6uQB97MscIVK+JT34s9iH4XDbK5u8xxnQNsfIG5Gn0B2Y7fui+gYElQjTS0adkDUAu6F2kgXqMiQHVww== 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)(86362001)(55016002)(2906002)(1076003)(5660300002)(186003)(36756003)(508600001)(2616005)(336012)(6286002)(426003)(70206006)(70586007)(107886003)(47076005)(8936002)(36860700001)(8676002)(82310400003)(36906005)(7696005)(26005)(54906003)(356005)(316002)(110136005)(7636003)(6666004)(4326008)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 11:12:55.5048 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99ccf738-d89b-4452-7928-08d993ba9145 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: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5340 Subject: [dpdk-dev] [PATCH v4 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 | 5 ++ app/test/test_devargs.c | 184 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 app/test/test_devargs.c diff --git a/app/test/meson.build b/app/test/meson.build index a16374b7a10..c4b0241010d 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -399,6 +399,11 @@ if dpdk_conf.has('RTE_NET_RING') fast_tests += [['latencystats_autotest', true]] fast_tests += [['pdump_autotest', true]] endif +if dpdk_conf.has('RTE_NET_VIRTIO') + test_deps += 'net_virtio' + test_sources += 'test_devargs.c' + fast_tests += [['devargs_autotest', true]] +endif if dpdk_conf.has('RTE_LIB_POWER') test_deps += 'power' 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);