From patchwork Wed Oct 20 15:47:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102455 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 13A5FA0C43; Wed, 20 Oct 2021 17:48:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 260E541242; Wed, 20 Oct 2021 17:48:05 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2048.outbound.protection.outlook.com [40.107.236.48]) by mails.dpdk.org (Postfix) with ESMTP id 78ED84123C for ; Wed, 20 Oct 2021 17:48:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KesZYviqSsLWRy95Ifwkq8uVwQwknPkqdB329HlynWo0eAWkHyI4nVq73vfoiO/mGE+SuX7k0qA96e2GXMrW6C9zn5mxhQgJDVkkq9IgK7Y7v6FQo1sLmCdtBncWtcRzUdGl7JYIT0jY/T0Lrav8/ffoMY56eVA0HTFAdV85aGwlBu+y8PaFXOgnIBTA/RElpeVE1Udv0aD96leG3lz93AUbAHeqTCnmikkyArJuOm0+Rpbxb3KT0lEu0NfR5Os/Djyu1F3bwiDtVtIASYMeSUqOtCCsCadJRDIMWHnBA2oB8745H4+6MqHPcgp0AKgFtbEAqD02QGZ2xTgMOCfLZw== 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=TeII8IGksqDVRxIUqkJsfBlMxX6+5bEjUkN4KS0/J3y6WqSfZh8iDgSApA0lxASqYcalk1hG4V3r9FQ2G6WNnnc6mrd4jSKM+j84DrXbNqCk7RsBz611iiWDk5THLmBM9DucSdUvUVa1MbNUBKhCulkT3lW3iM80osMDgeq+pcRNy50aslOJRON/9RdgxWeB4uOa3KHCVxIqbsL4nihPIvEiqOl9hHc56SR7iUDRlPE+T4Ce8fO8uB699e6d72R/zdvWD0OcOJcD9tgu3k56RxjSV5JwjAbUaQnM1RSjnrV7NIaQxMZwRle2Ugh/gClul/K8wsfhGcHtqqBSn1PLQA== 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=BsLEwxeyO99nfJGDYk9M16gqRgZN+FV3SQBrRPFfrzlFgC9Wpm8YW2TNHBUgk+eH5f38z/O/UyrfDp+1ETt9UZ88eDwt1R+8U74skZLchH7qnC7SauBfI0rOxctK+21MMzGdKEaD8argNUl2jfhVdyNSFSt+tkvlJOW8cZkIos6atWr4ws9lP0apI5GVOZmJqyoAMOss8oOMz4RAtVxraeoOQ1TssDrWnvz0iW/QslVavZgMAlSoo8vF555c9+KcFZ7s84HbXkKCE/WWYYC8vBfqgZ7JibibFAoaepKgRg+JjFBkzct0LLqJjMlllMHB5ZmUemcRvkJQ1vOed+Tt3A== Received: from MW4PR03CA0299.namprd03.prod.outlook.com (2603:10b6:303:b5::34) by BY5PR12MB3651.namprd12.prod.outlook.com (2603:10b6:a03:1a9::11) 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 15:47:56 +0000 Received: from CO1NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::b4) by MW4PR03CA0299.outlook.office365.com (2603:10b6:303:b5::34) 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 15:47: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 CO1NAM11FT030.mail.protection.outlook.com (10.13.174.125) 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 15:47:53 +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 15:47:51 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 23:47:37 +0800 Message-ID: <20211020154739.2514499-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020154739.2514499-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020154739.2514499-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: 795ec730-e3f9-47d1-2669-08d993e0fabc X-MS-TrafficTypeDiagnostic: BY5PR12MB3651: 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: 2/YqDAn3wBByT+WrP5b7xSkokpP5wMaIqZ5ZrdF+o807MAwDYX3Eqd4tMFGWvYN3GY10anM6pp6EwseoWIEu9xF7Ge0j6uGu3/JawRnIb9WdjZPva8pqzLl1DYQJtJHxJCEu1m+DjXs+1GGTXYqKMEegK0Kvn4TTlzziqZe2wZreYPewgq8XWn7C58FZxPQ42GeIQgrmOPhXo1pnHymF0xj7Q7XHCwZACvn355/gACVFDQay5iJt3HKYRyBpwEOUiGCybXvUgUb4WgfLlARbod6J6Mkuu7KbRu3LZULwU3ugtZE6sCBAfa3pGRvMB0DjXxpyKRMhETwpp/swn2pfx85jxDHy9CA3H8cjm2TCas7oTM1fhEvD2dyS9H3boAkb/mdybS5pS/jkuetCMkTOcDFSscG9iMCPBMaAgh6+9WoDxr60XTqFqTMrt/kZ0SljrlVt7O24ltc5jn1sKEoiBuOzj4m3roeDyPd3H/kUJYfNF4WlzEnhVtsB1tCWHEnydcfPGKT/QsDvzcpRyB/oc2CmupJoRorNw1vJXk43aoDAgCgkmwRF4vOTlQRlcH6YX5LymsbpyHFDDIm4PztIxrvDX+w3R8qRK2VxQ8/PPHRopd4R9daMarG2D2CA/l8nBHFIiHetDD0zD1BtOxUdJlQ3wenPWQMf/unhnqo9VlzG8mo52YZ+SYy8VDfIrWCYYK7so1vjpALYWnCLC//ykw== 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)(107886003)(55016002)(7696005)(6286002)(2906002)(110136005)(508600001)(186003)(54906003)(16526019)(356005)(6666004)(316002)(426003)(336012)(86362001)(2616005)(5660300002)(83380400001)(47076005)(36756003)(70586007)(8936002)(8676002)(26005)(36860700001)(7636003)(82310400003)(70206006)(4326008)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 15:47:53.5289 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 795ec730-e3f9-47d1-2669-08d993e0fabc 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: CO1NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3651 Subject: [dpdk-dev] [PATCH v5 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 15:47:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102456 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 D5D94A0C43; Wed, 20 Oct 2021 17:48:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31504411FA; Wed, 20 Oct 2021 17:48:10 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2050.outbound.protection.outlook.com [40.107.236.50]) by mails.dpdk.org (Postfix) with ESMTP id DEC7541247 for ; Wed, 20 Oct 2021 17:48:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OnSd9C1sUJ4zqIUzz+aTdxCjs7VAMtDAmZBZPpuyUz8psD4KeJpnkBMTXpzMfzef2zdSQxK8ypAazWgxM+DIT3uQPqVrmTrGOh+ZA0UVmZEBHZoeBAJSpvKuEsGW6F8Nlx42rhWJkMQvOCRSQmuTAFqwIuHxJNK8QlLeAZ25GIzSLolWlnP2xOn77CebIOskZY74cljrVhOPrWLBWPP2CtGhxvDIJmDjrmFKg0m+kmCrfUqpKtvx9KrDNmt3NUb/lk8TfF9qOEzE2nio/tkUrqaTdgtnCMA5KfR3xv5CvdVE4B0L7EcZ5ZPWfYvRSyrLCRm6sXEtWFdxoHu5W7Iotw== 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=UBqMJ/gEawu6iP7ibXeOBdgpsPRlNf7COp7nAtfOjwaB0SbWS3wWhyDk05GoydE5ibpcGUG66M4FO465D+bARvpL67WUSCMRwb1LDGaXUg4TNKObZg4TO4ZqrAuRqhpaG0Hk6muWqFTEMohc833E+qAvNMov3ympuKkqZuIZWp7lijuqf+8ryrQCkbLCLOnW5+vklb31kIC1y4aSpPQtFwjmEdMTXq2jCSFT+W7stop7pG5UuLUpoQ1HO3Tw+HQjMT/MPkjuL7d4JRZ/SQYwdsYn6qu5+WQzeAUSiWniE/SG7uChFtyApSuMypulJbj83waS/SrOttZ8IngRSJqA6A== 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=KJ9sM7+9EIlZUbl31apNXO/JF4/qFua7A9xAG3jTKBI/nAV9WbaBvCFju4q0LZIntL+yDiJjck17vDF4WmZC0ea+nwpfEOBFZwzUc4tz3b3fKt2VmrUU5MVuu7oT/qBR/MABa+OeL7DM0vJlky+dl8cPTD1g7L1UMnajHnlE+pSvYXN8gAd1D5R3ate1sKxgDBepohYJquxKP49BYQ+xVSh/Ar+J1+Ye+5KObrq6guBc5d606SvwhnAHgWu3Jlx9wDNYZXOlstpsvxz/zJ+NaSdEyQHoNCFl7j1zoakSmQSCL/jpi+IuDPRMndWZxXl88+/tTdSuHmuahr+T2TXC+Q== Received: from MWHPR08CA0050.namprd08.prod.outlook.com (2603:10b6:300:c0::24) by BL0PR12MB5521.namprd12.prod.outlook.com (2603:10b6:208:1c7::12) 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 15:48:03 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c0:cafe::2d) by MWHPR08CA0050.outlook.office365.com (2603:10b6:300:c0::24) 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 15:48:03 +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 CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) 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 15:48:02 +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 15:47:53 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 23:47:38 +0800 Message-ID: <20211020154739.2514499-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020154739.2514499-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020154739.2514499-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: 448b1113-b565-4f88-a099-08d993e1007d X-MS-TrafficTypeDiagnostic: BL0PR12MB5521: 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: jGQCQQ+2dztdhlbtvcf+7VYKx2zQq9BqUhcLm8ZiFkuCGZKVfq/1N8BjroaWMMXXaKrNNW88SUyk631xciE5x2SV4EduGhzWN3AFtYwSd1o+l97xBut+kiJF+oDV+o67HCrBakBCwKy0pawoWOg+vrep3TmIMilRkAPCImZ5YIQ5o4cDrMwSJTyADafY6DqB/broFIGfuZxktYd+j3EMYOEB71io3HJlRps+0n3wpr8nEEUdW7YUe3G2qgFEKi1jEaWg4pykswY2uS3b4OOolGs/Xu2xMAoYieDD2FR35Wu7foJRawJOI605M2XwQmI++osCdDb+umI2s8xgWsx7yATwTho7x+h+7NaN9bkkQjIjl2+sU5OqJnnymMLxnY6cJaXhNZeoxorZNMtM4Nrp8KJ7o4fvkyWF4En7CK7sfjsytUnE8/VbIe/2ao5pqVIscG1BeB/ALzawYaRbjnFACqv08eOG8ZAyDydHyYXVWbX70zrHxu8QXoCICvtCRg2RiiBgIfoDzx88qB0HoHyQOi/yrS6/0AM4flHm91uumQ0ZInsBbBSswl130qj1jqGZp2BXs9WpZQc/MUgnNcrF3U5+zTmn2sGPAsfovu9wWL+kiKI9SDzrC2H3idbGekNTdAgTWHSk9/Q4BH7WNlaZlArXz+hJDOzswZ1jyZgxqp3ZJRxcumqpefCNiX9iUpS7DCzp3Qs31MG7Au2yD5oAug== 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)(356005)(82310400003)(8676002)(2906002)(70586007)(70206006)(83380400001)(508600001)(7636003)(2616005)(1076003)(5660300002)(426003)(6286002)(6666004)(26005)(107886003)(36756003)(336012)(7696005)(36860700001)(47076005)(186003)(54906003)(16526019)(36906005)(316002)(8936002)(4326008)(55016002)(86362001)(110136005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 15:48:02.9866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 448b1113-b565-4f88-a099-08d993e1007d 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: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB5521 Subject: [dpdk-dev] [PATCH v5 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 15:47:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102457 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 9688EA0C43; Wed, 20 Oct 2021 17:48:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 27EF44124E; Wed, 20 Oct 2021 17:48:11 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2045.outbound.protection.outlook.com [40.107.236.45]) by mails.dpdk.org (Postfix) with ESMTP id 0603B41247 for ; Wed, 20 Oct 2021 17:48:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VEn4c9OGd6q0U3hiAIgKatbSgafDKyvn4yFlF2UXO+GdbMzpHprj5IJyCozxr8E00raR/tZn2Az+YAMN9uHKg6tsnZ+kowrojpYvSaB7483maG7ONd4spLsj+J+RRbbxwEi/lOxeeCkLfuaN5gMARR6p/NS24p/WvDr2M23g7ym85Im4UTAlEx3CvhimRxQPmqdtVC9cP0A9KwoEctwQ9VwWVg2DAg/7B7Romcer9eCf/k4jv2uGvceGhjq/AfsYvKqMo0EAOxQEu4vJvBaiuhUMRZPajJFhjoHHaFDckEHOJ/jeVLfozcQTN+b2vHCl4/tyct2xt6hYp3h2A5XUHQ== 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=OXEw+N4yBRV2h7NoOmYBJtlaeOddEdvqUwcNEZix9FY=; b=acDjLOLP21AKGwKWIMprPMnKucmQXjOva0jHic/d/yRrWSOKQdzJAjw0T7nH44MVsCaJALlPNU6gfeGZHP18dOwwHyzKCckRBvS5ohmMZPULxeGl4bbZ/yJGVbtQy/zEgLZNtC6KOQ6A794XfV6ccWlxuXuHr2ImPP/jXATgNNCkFsPtevv2JEOcATmm/fKO+YzQHi0iTqTIzf/tn47VvtrmDx+nlEP7PzhvYnwyFKQi5VO3QADdcTxwJ5AX+aYmWo9eWQq3s2RxKX41hc+3PMkeebVOqw7/XLRFCa/DL5bFXEGTaRqL3kUD8qiR4mZJt9il1YhZaJ7+oi6PDUsuyA== 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=OXEw+N4yBRV2h7NoOmYBJtlaeOddEdvqUwcNEZix9FY=; b=AWBemxkbFGmj40qZgHsJ84Z7nPMovd52P0FDp0LPPCFvdWLlmCiP2YZk9K8fyblGI0J7+SrJoLKlDPLH4Uktda0AOYOWxcWqpc29+MYDtfhAquNhZVkPpMlcPDYmmGAhPhVa9X+rjliN8OoZtDp4JVQHlygLkka+twWljSLnBlv7pkrce4JKmnv+8zQSf5EEC9Kpg9JNpsUZWgREavZ38fTE1ThhfhTflCGW3avX3a7leU49V3OW3UKJOIRqtLe1Gg67GoEi4W1ywcScLtieirvktnLO7zoTMNn1lNLiFS5J2cOlKL3i63f4nOPxkMuDELfw0i7rG0lDR6PJ99fjNQ== Received: from MWHPR08CA0046.namprd08.prod.outlook.com (2603:10b6:300:c0::20) by BN6PR12MB1364.namprd12.prod.outlook.com (2603:10b6:404:1e::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 15:48:05 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c0:cafe::1) by MWHPR08CA0046.outlook.office365.com (2603:10b6:300:c0::20) 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 15:48:04 +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 CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) 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 15:48:04 +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 15:47:55 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 23:47:39 +0800 Message-ID: <20211020154739.2514499-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020154739.2514499-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020154739.2514499-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: 3a3a6515-5b83-4de5-1e1c-08d993e1013a X-MS-TrafficTypeDiagnostic: BN6PR12MB1364: 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: u8VNgTsKH0N+ysSlQHmU10cDsZjvv+Vq9BgkXkHmYpXjaSbeBnU9HgWE5KQyHOf+S/SKrVVGEPEHN3//6cQjyDAwhCptP6jMVqqZ6347JOf5CP/UdzRuDwlTmLFBlINr9Qu5pOVMVOcgmDEQ1x6MeeYQtF1vKms2W8NUDTQWeImppn9DZWROKgtxxExHnbLI+H5o07CUAmV3+mqsy3vO71gnigCenEbDMVrmF6Vb6pq8rKdreZlA7TTfiV2mP5qwrLa5816FsxACQB82YzpUDTLPEDpsid82TgPbohOVX6+ViZw6UgVGO7lp3wertAgB86pN2z4XokmGyF9fVTtdbQ2WG1oJlFnmuG+hiogDtP8+y52HIkqmg5wqDfXTrxREH6DGKKYgpkJfxLeST5JFWXs5h/oH33wrlz92sOgZYGF8ja0UkZcRr7X0XuEW16vkzOIQVTHcBhYlUqjGRwh7KQh3FV33W7g+kScS28GfixH8HJCMasJBzGLUaPYynhJj2DRrBH4w7KIwAtvhJO3AGNizHCAU5sqsShewNkD3fzl93feUziJn2lsJBAfds9C9qA1kg391iY3wS7ZHvRv/iGxWoJcJM8sOH7Q+2x+sYz351YvCasBtoL2wOni89OYp4paijTGki8qgK30hwncRBN+z4b3QKj0fkoxwxRswUi3/8bLu7eZt/xcT0H1uKBnoP1Eu5XVlf9vFU5hcMlnSAw== 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)(55016002)(8936002)(1076003)(2906002)(356005)(7696005)(508600001)(82310400003)(8676002)(47076005)(83380400001)(2616005)(86362001)(4326008)(70206006)(70586007)(36756003)(107886003)(5660300002)(336012)(54906003)(316002)(36906005)(6666004)(110136005)(426003)(186003)(26005)(36860700001)(7636003)(16526019)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 15:48:04.2109 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a3a6515-5b83-4de5-1e1c-08d993e1013a 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: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1364 Subject: [dpdk-dev] [PATCH v5 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 Reviewed-by: Gaetan Rivet --- app/test/meson.build | 2 + app/test/test_devargs.c | 214 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 app/test/test_devargs.c diff --git a/app/test/meson.build b/app/test/meson.build index a16374b7a10..16f4ff14ee8 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..19036716bf7 --- /dev/null +++ b/app/test/test_devargs.c @@ -0,0 +1,214 @@ +/* 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; +} + +struct devargs_case { + const char *devargs; + int bus_kv; + int class_kv; + int driver_kv; + const char *bus; + const char *name; + const char *class; +}; + +static int +test_valid_devargs_cases(const struct devargs_case *list, size_t n) +{ + struct rte_devargs da; + uint32_t i; + int ret; + int fail = TEST_SUCCESS; + struct rte_bus *pci_bus = rte_bus_find_by_name("pci"); + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + struct rte_class *eth_class = rte_class_find_by_name("eth"); + + for (i = 0; i < n; i++) { + if (pci_bus == NULL && list[i].bus != NULL && + strcmp(list[i].bus, "pci") == 0) + continue; + if (vdev_bus == NULL && list[i].bus != NULL && + strcmp(list[i].bus, "vdev") == 0) + continue; + if (eth_class == NULL && list[i].class != NULL && + strcmp(list[i].class, "eth") == 0) + continue; + 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 = TEST_FAILED; +cleanup: + rte_devargs_reset(&da); + } + return fail; +} + +/* Test several valid cases */ +static int +test_valid_devargs(void) +{ + static const struct devargs_case 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 }, + }; + static const struct devargs_case legacy_ring_list[] = { + { "net_ring0", + 0, 0, 0, "vdev", "net_ring0", NULL }, + { "net_ring0,iface=test,path=/class/bus/,queues=1", + 0, 0, 3, "vdev", "net_ring0", NULL }, + }; + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + int ret; + + ret = test_valid_devargs_cases(list, RTE_DIM(list)); + if (vdev_bus != NULL && vdev_bus->parse("net_ring0", NULL) == 0) + /* Ring vdev driver enabled. */ + ret |= test_valid_devargs_cases(legacy_ring_list, + RTE_DIM(legacy_ring_list)); + return ret; +} + +/* 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);