From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71462A0C45; Wed, 20 Oct 2021 09:32:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1D0941176; Wed, 20 Oct 2021 09:32:19 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2055.outbound.protection.outlook.com [40.107.243.55]) by mails.dpdk.org (Postfix) with ESMTP id DDC0A40142 for ; Wed, 20 Oct 2021 09:32:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYK15FNxmF9GzTGTMUDPp7fAz9bQVljMP1/F5K6Vyvv2nKbtgQMi/iCxRJHVFdoB1YPFQlDzdPMD27mNQTXjOeZQ9Oiu7CeJJK0+f2bmMsQOpMIboj3RBPtSgNK/b5iA69GzXv9k6Z9v7wgTzUBtTqwd5F76wJ06Ehi0ztT8iJNv/QEc6ARKs9pMUbLWW4m2Tjo7wC2IpwCOydpwmHVU8drSHe5Kn72Q666tlnBeboqyY2ESX3+iykKG9+43zPoAFztI6W3oHZ+Drn0ic1L4itKmFQjudlyi3PHL9+xDpXBwTVl9duy5VQcD/YzHri6ZicqUA59J/UgiNV3H+4s8Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=swa8jbIpQrxTfDT7BkLjWD0hrutd22uGKN13tVihA4A=; b=m7LyM9NXzOro5lhg5pX2ysEWTnCYZSQSbGOlnT28ZGIoDd7tGn5znfoX04NbjLZOxdFJKCm9bhAeeMxQWsQ7spszjqnpqxmnZykUwhLDv4xeA2cBPJbKzFPOHboWrIsGwa3qLO0Sj58Gzh8kEHblRo8o9rtFa+fKOUH4H9CLGrvTzv0BqE0rj3LjptR5KAod/xxuD6MQH6Eot5pWdEEs2yYDdElK/gdaxMSwHf8trDPHVNiMNQTFrS0msN5ZDXpIoEqTo7pb18qcNSg/kTwBm70oTDWoAZWGwKn9x+eh88Pk3wxVsdU3IjMVVC3FHyreUnpsADecDMsa4hh4dW1ARg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=swa8jbIpQrxTfDT7BkLjWD0hrutd22uGKN13tVihA4A=; b=t+rLCAEah/4na99P2dpRWX3GQb26RynfvBPjZ3I7e42ECuGfLk0Hsn+UMgn7JV5FgCLl1JqejX37pqeBQvae9sPCs227Q06bT1sWqCw4o9klk7lJ0SLCqA6QffPE/Q1Dhk9UNo4jf1lEVBsyooPWSzptQRF+/wP9YAt1qou8MCxlErWXC0rn2c0Kq+1ausHTUnLiV97XfrC6i/hOj1MJzrZee0LvdR0WlPEPHSHavI0VE/+w1w0dunSdrEiXWDIVEM7Pm333wIpOg8lCTvDH7GIOVQ2TwoghEeJ69pKYpPiBfi2UoWz6l7cNdn92c394q39q1uq/nEjG8nO5W0VG0Q== Received: from DM6PR06CA0004.namprd06.prod.outlook.com (2603:10b6:5:120::17) by BN8PR12MB3217.namprd12.prod.outlook.com (2603:10b6:408:6e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Wed, 20 Oct 2021 07:32:16 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::a5) by DM6PR06CA0004.outlook.office365.com (2603:10b6:5:120::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 20 Oct 2021 07:32:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 07:32:15 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 07:32:11 +0000 From: Xueming Li To: , Gaetan Rivet CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 15:31:49 +0800 Message-ID: <20211020073151.2374674-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020073151.2374674-1-xuemingl@nvidia.com> References: <20211005155435.279043-1-xuemingl@nvidia.com> <20211020073151.2374674-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e780f6c-e722-46de-8f5b-08d9939bbdae X-MS-TrafficTypeDiagnostic: BN8PR12MB3217: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +5V0mCNTLZV0ukBeRl11pYhDfmDs3Ad8TMuWTpXsvpMeqY9+3U7agnZAyW5HRNvJBuPU8XN5ordvRsQzg8SgjUNdVaorH4+rFPebPy2jalIVUM94RleyhZqHhi3hcO6V8biyTE6QW8cNUn/QXG1f1y5iG9NO2WOWwCJn9HuN2fR/VSEF4zoJMtLpXFdm6vhGLR2znzNR0L8w9rpnAZFBvyCbG5EuhDGytCAjSNN9mT+mLUgr4d3h4qfooSskmU5qQSJHRAPHbmut4uDVI1BlOHUs704O+PttusONb9kIaNkaR6TqWBGG4OaMd4FmLdyZjdJqJlt1bDXhkpZsyi8yK5UkqIWmHxzEuv3S1CpK15GSdhteDEL35Q1MaHSCSHa4GPZt5WvYaena9vmnD+n3syRGK5T22HHeYKC39284Ls2mvCBI2Jrw9E9lnp6udzx/JroxrdkHpYlrijsHSVev9SgOSwlK+HiQzuoivH7nDPHewJDzhfwwRrR0Vp8rxj5xUf9o6FkoJ/W7uGHl5lza5EDdN8htF1ESw1/UHkK3Nlduv8MC+O2t23XXuRhi5YKyfuyZpMUlVvVKx25jgVX0VbYoOOlpfP4sOR9xbRVxIKdE4r12rFUT1mk/FH4vlRGHBgBKRRnf5NXgXTE+tPMEDFnt+oBH1UymrwiG8+eBYF1tvsDkGMbYw1+EjB/qYx2dXUeTwZumW3imV/igkmd7dw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6286002)(26005)(47076005)(36756003)(1076003)(8936002)(70206006)(316002)(2616005)(5660300002)(110136005)(336012)(508600001)(8676002)(7696005)(426003)(70586007)(4326008)(36860700001)(2906002)(82310400003)(54906003)(86362001)(83380400001)(55016002)(356005)(7636003)(107886003)(6666004)(186003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 07:32:15.8205 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e780f6c-e722-46de-8f5b-08d9939bbdae X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3217 Subject: [dpdk-dev] [PATCH v2 1/3] devargs: support path value for global device arguments X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Slash is used to split global device arguments. To support path value which contains slash, this patch parses devargs by locating both slash and layer name key: bus=a,name=/some/path/class=b,k1=v1/driver=c,k2=v2 "/class=" and "/driver" are valid start of a layer. Signed-off-by: Xueming Li Reviewed-by: Gaetan Rivet --- lib/eal/common/eal_common_devargs.c | 117 ++++++++++------------------ 1 file changed, 43 insertions(+), 74 deletions(-) diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index 411dd6a75f6..d673598032d 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -29,18 +29,6 @@ TAILQ_HEAD(rte_devargs_list, rte_devargs); static struct rte_devargs_list devargs_list = TAILQ_HEAD_INITIALIZER(devargs_list); -static size_t -devargs_layer_count(const char *s) -{ - size_t i = s ? 1 : 0; - - while (s != NULL && s[0] != '\0') { - i += s[0] == '/'; - s++; - } - return i; -} - /* Resolve devargs name from bus arguments. */ static int devargs_bus_parse_default(struct rte_devargs *devargs, @@ -77,23 +65,13 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, { RTE_DEVARGS_KEY_DRIVER "=", NULL, NULL, }, }; struct rte_kvargs_pair *kv = NULL; - struct rte_class *cls = NULL; - struct rte_bus *bus = NULL; - const char *s = devstr; - size_t nblayer; - size_t i = 0; + struct rte_kvargs *bus_kvlist = NULL; + char *s; + size_t nblayer = 0; + size_t i; int ret = 0; bool allocated_data = false; - /* Split each sub-lists. */ - nblayer = devargs_layer_count(devstr); - if (nblayer > RTE_DIM(layers)) { - RTE_LOG(ERR, EAL, "Invalid format: too many layers (%zu)\n", - nblayer); - ret = -E2BIG; - goto get_out; - } - /* If the devargs points the devstr * as source data, then it should not allocate * anything and keep referring only to it. @@ -106,33 +84,41 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, goto get_out; } allocated_data = true; - s = devargs->data; } + s = devargs->data; while (s != NULL) { - if (i >= RTE_DIM(layers)) { - RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s); - ret = -EINVAL; + if (nblayer > RTE_DIM(layers)) { + ret = -E2BIG; goto get_out; } - /* - * The last layer is free-form. - * The "driver" key is not required (but accepted). - */ - if (strncmp(layers[i].key, s, strlen(layers[i].key)) && - i != RTE_DIM(layers) - 1) - goto next_layer; - layers[i].str = s; - layers[i].kvlist = rte_kvargs_parse_delim(s, NULL, "/"); - if (layers[i].kvlist == NULL) { + layers[nblayer].str = s; + + /* Locate next layer starts with valid layer key. */ + while (s != NULL) { + s = strchr(s, '/'); + if (s == NULL) + break; + for (i = 0; i < RTE_DIM(layers); i++) { + if (strncmp(s + 1, layers[i].key, + strlen(layers[i].key)) == 0) { + *s = '\0'; + break; + } + } + s++; + if (i < RTE_DIM(layers)) + break; + } + + layers[nblayer].kvlist = rte_kvargs_parse + (layers[nblayer].str, NULL); + if (layers[nblayer].kvlist == NULL) { ret = -EINVAL; goto get_out; } - s = strchr(s, '/'); - if (s != NULL) - s++; -next_layer: - i++; + + nblayer++; } /* Parse each sub-list. */ @@ -143,52 +129,35 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, if (kv->key == NULL) continue; if (strcmp(kv->key, RTE_DEVARGS_KEY_BUS) == 0) { - bus = rte_bus_find_by_name(kv->value); - if (bus == NULL) { + bus_kvlist = layers[i].kvlist; + devargs->bus_str = layers[i].str; + devargs->bus = rte_bus_find_by_name(kv->value); + if (devargs->bus == NULL) { RTE_LOG(ERR, EAL, "Could not find bus \"%s\"\n", kv->value); ret = -EFAULT; goto get_out; } } else if (strcmp(kv->key, RTE_DEVARGS_KEY_CLASS) == 0) { - cls = rte_class_find_by_name(kv->value); - if (cls == NULL) { + devargs->cls_str = layers[i].str; + devargs->cls = rte_class_find_by_name(kv->value); + if (devargs->cls == NULL) { RTE_LOG(ERR, EAL, "Could not find class \"%s\"\n", kv->value); ret = -EFAULT; goto get_out; } } else if (strcmp(kv->key, RTE_DEVARGS_KEY_DRIVER) == 0) { - /* Ignore */ + devargs->drv_str = layers[i].str; continue; } } - /* Fill devargs fields. */ - devargs->bus_str = layers[0].str; - devargs->cls_str = layers[1].str; - devargs->drv_str = layers[2].str; - devargs->bus = bus; - devargs->cls = cls; - - /* If we own the data, clean up a bit - * the several layers string, to ease - * their parsing afterward. - */ - if (devargs->data != devstr) { - char *s = devargs->data; - - while ((s = strchr(s, '/'))) { - *s = '\0'; - s++; - } - } - /* Resolve devargs name. */ - if (bus != NULL && bus->devargs_parse != NULL) - ret = bus->devargs_parse(devargs); - else if (layers[0].kvlist != NULL) - ret = devargs_bus_parse_default(devargs, layers[0].kvlist); + if (devargs->bus != NULL && devargs->bus->devargs_parse != NULL) + ret = devargs->bus->devargs_parse(devargs); + else if (bus_kvlist != NULL) + ret = devargs_bus_parse_default(devargs, bus_kvlist); get_out: for (i = 0; i < RTE_DIM(layers); i++) { -- 2.33.0