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++) {