From patchwork Tue Oct 5 12:30:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 100507 X-Patchwork-Delegate: thomas@monjalon.net 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 49039A0C47; Tue, 5 Oct 2021 14:31:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8070141380; Tue, 5 Oct 2021 14:30:59 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id 21BA74137D for ; Tue, 5 Oct 2021 14:30:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=atnTe/MZUdPTd7dd+OjSBO20F6Deqv+jugof0vDHq2YWQ2RGUnjxXELy6NBluSpWM95WPn7DB2WjVCu9j5T4M/fBQpaHjmHcGb0+nz5SX9Z2Js/1DGrKecd6IyCV5TDC30F8JlA/hF+BBMQ5ECU2n8T6T9U/S6qYAY8ZfVetUbBEqB2p3BACg7+9pB7VkED8EZBYZntClOSc72w2XOF2jWj5Yvv4gJC5uiMHmoJ9ws5F9Cs0VhXLzxzcH6O3Tg1Ri3nuCREpiy7dtCIaPZnTXvV1IQqXvDs8lGGXe0JjNESS63eZHkm9xEOrAJBowELqcemLoj9iQquWPfZV9q9+7w== 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=Sg7/RnavcRaI39PstSKuvtlICr4z+e9rtvy44p2Z3FE=; b=PvBsJwJCNmkWV6gutrbsuLTp1kz30oSXIa0hBrU2wYWh75QErJkpuPwXQ0Ilw1fN6p8rOGOmBrZ0vb+lu/7MP7+FhgUFPg6k6jXHujVOpK+w57qa5mrFpKjFTl5gmVvTdYJ8dao/NfjaxIe9+2ZauCkkuhRl5iaW4c9RAVI6znm+9LHhHOQq0cylA5ZiRIe5exwrxkt5evglnhYYjEX1gOD9TKFH/u0dvb6sKf/HzFWGhPl+k9HAwVQKddmkmlYxpUp0v1a36vhiYysr48DK9Qv+JK5Qa1eUWmWFro562umqJeIkOS4wFOvAqe+fM58HTB4Aky0zy4SUTohQvwRdrg== 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=none 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=Sg7/RnavcRaI39PstSKuvtlICr4z+e9rtvy44p2Z3FE=; b=bhmhnXxDSiz6Q6saekpybhuMqetJzZ26eg41CJWVW7ZjfUDDDTch5iihw5hDZa6SdnT3LqOORntfxq6UvSLxNic4PhNZECKELZ80RCOuLwzXCIUJjXJAwm2x1VplM0rtW4zThp4cgz7V4yaRgqjHJJpOsKes2QrVH6q2yxn63Q57EmNRIeDCe8B3HJ+YRKjspzva6uwjOsJP3WFQMH2qStiaHsIYGZzw5g8cvTICYG8LV+akmDdP0Se7ymDi7OdcAjqm1EB9f7ERNDTH5tkAyS+ycJi/k3tdSNmkQ5bhJHSIZ7oB4cPnd11tssn1yipwBWaldBzwOM8jPK+LtEVzAA== Received: from DM5PR07CA0087.namprd07.prod.outlook.com (2603:10b6:4:ae::16) by BN6PR1201MB0193.namprd12.prod.outlook.com (2603:10b6:405:56::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Tue, 5 Oct 2021 12:30:53 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::79) by DM5PR07CA0087.outlook.office365.com (2603:10b6:4:ae::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 5 Oct 2021 12:30: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 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.4566.14 via Frontend Transport; Tue, 5 Oct 2021 12:30:53 +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; Tue, 5 Oct 2021 12:30:50 +0000 From: Xueming Li To: CC: , Thomas Monjalon , "David Marchand" Date: Tue, 5 Oct 2021 20:30:10 +0800 Message-ID: <20211005123012.264727-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8af5be96-4daa-4e9c-03fc-08d987fbf8e4 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0193: 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: /85tbVA16guKiZEhmQYQ+rJo01uGlvWkttLO0NDSvOQNK9wVAYHC2Kxc7TIeKo5GezcHUp9NEm11kQuAWR+78FEXDb98slIZi6V8WgKmsGhx1KqoT6hOeUPdKfZwnG0SnDHLewQsdgvrGyLs5E5w+0OHOmrOrA/FlzW6DPhjWN34Toqwar63ZeT6oZ7kbA+Gvydux97S5Y793YvYtJcNbfBcXmyfrWN3SLRlZWULlHWCsGJ9RFdpT3HmnCmApx0kPY8V8itlIpcP9r73Fv4hocTHPbDpU8fnSsd2aBjirSpcx4p5vNjh6XIqFZnJTXD8oZr6fMp5sfmm4bbEy9eQ1t+HHPzMz1qnWRi1ISy1dE6M3N4VKE4j41usc2p0rNM6OkbAoAAKlM3kBl2igYGwA/aJXrdd4UhqWak2PtnKWfCMpDsMbWLz4uFEzV5gwHEjnv45qpRIHdzbxvwDZbsHnavzXIW42qb5PT8x8KC9dnBP3piddem9qCrg53k8Xksx5fwUGkC50dxSB+g4Lg74f3UmRjiATPJGVhVd+rxhXGWVmtQ3fy5Ir2Y4rwCxwBI71R6khhln+IEyaRCafDtAKu2kMLlgBvEQY4Sbs5LwP0mD3jepjahv/Evf8oqZ5E1kbQkEiLtl+k06YoVFQKpESmQMlIZNCkP1u1lRV5M8SCYfnzg1BL6wwV5o/hMiwscxIgKD5YoW/V+zDl+/lkyvcg== 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)(6666004)(356005)(86362001)(8936002)(5660300002)(83380400001)(7636003)(2616005)(6286002)(70206006)(2906002)(4326008)(70586007)(426003)(82310400003)(16526019)(55016002)(1076003)(8676002)(7696005)(336012)(47076005)(36860700001)(186003)(36756003)(26005)(508600001)(54906003)(316002)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 12:30:53.0781 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8af5be96-4daa-4e9c-03fc-08d987fbf8e4 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: BN6PR1201MB0193 Subject: [dpdk-dev] [PATCH 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 --- 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 7ab9e71b2a3..e3786c6c02a 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 Tue Oct 5 12:30:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 100506 X-Patchwork-Delegate: thomas@monjalon.net 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 2701FA0C47; Tue, 5 Oct 2021 14:30:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 158684134A; Tue, 5 Oct 2021 14:30:57 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2056.outbound.protection.outlook.com [40.107.92.56]) by mails.dpdk.org (Postfix) with ESMTP id 3FA8F41346; Tue, 5 Oct 2021 14:30:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvBmB3tCHnXGTj55o2mi67FQdDIiFgXY8IOTBArLvipRM/9o8oi4Pl/faYEu80Vz5ZXlQEVEVwUSr2uXcnpCwJuLQxKEzh9V1jUKeUZBCbLXVdoAao6Lo6YzUsLUg4+rVDjqMFw0bNAvRCbEMIDuskNhq7KEBbKBMZc4R0ZEb6DLmdFs3sI9feE520gxnnEtK0rpAkzyIeGukQ3czFxIWdALPckN6LSK15GRglw+evD4qnETUQJKIn1nsWmvX00Lu01wzMSSeyTWKZMaxcdl4zf/wQCmdjE45NDmyguYrHUJ6agaqed4rAhISNLRdu4bH27slj4Xso2Ocin4vY2oTw== 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=VNMiCvRuHzlWIOIZLFBxHRFlYh/Hdi5AU91tIz6MXhc=; b=AQ0QOIRZ1BvzzCFeRCuV6+WkyVc+t+WYVlFbIfYJcYlAkYBPL1HV0R9zvmNcDPUEG3hTY4QELBaMVRzPqTAWsbDLyKppaNvQtv26x141uSkN9ah24PW17GsqwWRTxClmBEOM+NFhPsxz9efOvWD8Vitfv+mPXRKCkZ0HiDaAPZ1I0w2ODtD5Ea3KyYpzl7q/B6esbcUJVlhHcM/KTMdLNAZy4Gjn4PcxIv0iF2Ue29AqUApnIJkAZT89UFfIPsaIcEn8EVJhkf7RhIldbT1yRr866rrYTXZA4FoUDZZBxHRiidvvf7r9Ge99z5uG37nR18D5egYJ/yxJtPsz6lg6/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=VNMiCvRuHzlWIOIZLFBxHRFlYh/Hdi5AU91tIz6MXhc=; b=V6brkICV00iCy5RPrMOvcDvROHZOBDPyuAiYDgXE3Hd8s6Ra59jKRA1qO5WlR2q5liARA46qYGESdYR3z48zfps9T+Mqf1sTOxNmMkIjfQ60kLcK2a8aXZi/ZFabo1oTRVvqsDJtU65jUs4RTBrPyjfCcQnbBERx6IsnlYXQ5poPXeuv6fNxU9Yir0dZJyKV/C75/uWJOcACo0gmUswX0HXnnF36KzN9PD+USIyJlvMYAHNwW0OfHFIKDBFbNfGCByza69JWeRev8srFCKH1xqi+osMtJCDt3xDxp2++UKdi7/AuE0NdEEL4L8iTIKabpN06Kr90sTYdMP/x57M9AA== Received: from DM5PR07CA0095.namprd07.prod.outlook.com (2603:10b6:4:ae::24) by BY5PR12MB4227.namprd12.prod.outlook.com (2603:10b6:a03:206::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.19; Tue, 5 Oct 2021 12:30:54 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::ce) by DM5PR07CA0095.outlook.office365.com (2603:10b6:4:ae::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 5 Oct 2021 12:30:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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.4566.14 via Frontend Transport; Tue, 5 Oct 2021 12:30:54 +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; Tue, 5 Oct 2021 12:30:52 +0000 From: Xueming Li To: CC: , Thomas Monjalon , "David Marchand" , , Gaetan Rivet Date: Tue, 5 Oct 2021 20:30:11 +0800 Message-ID: <20211005123012.264727-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211005123012.264727-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 55d14eb4-d8c5-45d1-a6f9-08d987fbf9a7 X-MS-TrafficTypeDiagnostic: BY5PR12MB4227: 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: DQ8Yh9ZUkZaSOK8vp9qaaqku0TTULEd3+pd6w7qyuuXG37LbMX2wHqwvjHfGQ15Pij5PYOxICoDYLyzTPPAzeDI74Ub7zZ9ux7AKtx81BDfgYIORcV/5JcHsZwCTKWVm/nxVKArjwa/c+uVivpes70wSTF6la0udXUxT1QsHduZy5i2JQ4psyM0MYMhTen/sUAqaEEVjGA8XRywKqmYfpzu8js3CTynHgqJp6XthzfMBXEQDhCMDpAo7Ni1WPql8C71pL9oqNrlEyceCtkKiOKMDNM1McjW/UmqzJg4y3wj8cR4HMZcfYa8hOviloL96JhIqRJp0oUvkylqu4VKODmO2yhIfMjhM9CGXQhNd71OMVL08tL6tVvaqU0ZypZxqKD783D3UHmLNtPXHD+km3NfESVVTH3H+MwqX/JD6AMPuO2auOofIfPUpBR2sJWjQI0pKzII8gUoll0QDNROnxYJFs5U6UINu2sdUAF+fnlgz/VT5oRkBksl04fmCO2IYo+kavS40vHEv76By7QmcwhNE7LcUpQV/SWK+QKGZ5aLJQdz1y2YVaL5Wb6ymU4FGvpru9DA0gyy25P6cXDf0VtIWM7BUeorJmSIOMMEFkW5nWh4FQ3cZ6yw1IR5ABV5ZLKc9jzj40dFVHVT+90vKALAfnETMfwGBeDn9D0bubY2ZOmKsX/J/IgXHAAUw4AighUmmDAmRQl4AGpad5NII9A== 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)(6666004)(86362001)(426003)(82310400003)(1076003)(508600001)(54906003)(36756003)(8936002)(70586007)(70206006)(316002)(356005)(8676002)(7636003)(6916009)(336012)(7696005)(36860700001)(26005)(83380400001)(55016002)(4326008)(186003)(16526019)(47076005)(6286002)(2906002)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 12:30:54.3607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55d14eb4-d8c5-45d1-a6f9-08d987fbf9a7 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: BY5PR12MB4227 Subject: [dpdk-dev] [PATCH 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") Cc: stable@dpdk.org Signed-off-by: Xueming Li --- 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 691b5ea0180..f6fa3a5d6ce 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -85,11 +85,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) { @@ -101,9 +100,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 e3786c6c02a..616cf77f229 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 Tue Oct 5 12:30:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 100508 X-Patchwork-Delegate: thomas@monjalon.net 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 E0653A0C47; Tue, 5 Oct 2021 14:31:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FD7C4138B; Tue, 5 Oct 2021 14:31:00 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2047.outbound.protection.outlook.com [40.107.102.47]) by mails.dpdk.org (Postfix) with ESMTP id 8021F4137D for ; Tue, 5 Oct 2021 14:30:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pjh7eaeEAv1zJdsaTqoB9B8v9p1DRGX1uwt69YSifpEQl363Tbn/efphkwHyaEJgoqdgJIzn+lgqJkZ0wlsaCkf2ALBzMKU4jVPhzarA+vKZjPetaLB0O+j3ieLmL5Oyl6uO1Cwk7gGrBHlRfpyovyjDS2SrOqnwVqBLPRLZYM6i2AUX0KRRtx+gkv6mzsjvhfH2tRzBjuhzgGfitBnWNG8kTwTDTm3PVyBDafoXR1+csLRWHE3EdsknWS21bX6IBYx9Or6RToLPyugIyZZCdtPdWmTM37YeE+H4Uqn97AXukoSAVb00h4iBYlEYHHCVNfxUfjyv2v+GR1LGwLvQ5Q== 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=zYjAxqEQybQAx5xqSU3Qfo6rVc3avj+BPN7IPu5CY5c=; b=b8vN7zaWcGE2/blU7PkAn5CevgwMVPrP7/bvs8wO9y1ow8CkKk5VJ7MH6+yrXriHG3kcx1iNnm/VVuYSnUxKHaiA8ncMM9bIaenIu64R+/Oti5ZB7Lf6Mc780Tf53smQaMcFq9jtJg+F1E+WXtWZXxvOLnZUZA0Vq3KC8l7fefSNKYRlkN6HP/1V+W4e+2GdrYtWGqUlV2vdKApHwies8J9MoSK1rO8YhwhTrCDTWwZiQb1YLxZEtGx0uAPwuV7IdhtZGV+Z+Fu31oIYVeH3/+BqztbbOXty9x996i3HzfHYYSRsZCPI6RfYtxHwsAkcfWbdnqwg82OI2V9uFNz0FA== 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=none 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=zYjAxqEQybQAx5xqSU3Qfo6rVc3avj+BPN7IPu5CY5c=; b=o96FoCfBTBU+F3trgBwz/rjOaPLiIeu083m1EnKbreH0Pfebwe4QNvvoD5KiUQ2SPQnBvlqdiTuxMw/CW/T8c0VzOORhdqFaFI2bAmkeVyODR1FP5auxwxiXeIyvWF1sstdjfaLG8gGXlhTe1i1O6gZEDdj6LEahic5vUVWshfJfBuZiTUQ5sTU6d1WyuMtqPD5bd/MlaeJeX3aI6gosceKxl21ZAM4si9W8OOnOQuUfis5XAnO4RVSelcjjxA3cbSIuUVMOANCTfNiqLvF1NC9p1X5KZVT4guibXScDAbdNb4plBArw8IcaY1Pz+3l5UBIoh0i7zp+IHLMiT5W4mQ== Received: from DM5PR07CA0085.namprd07.prod.outlook.com (2603:10b6:4:ae::14) by MN2PR12MB3680.namprd12.prod.outlook.com (2603:10b6:208:169::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Tue, 5 Oct 2021 12:30:56 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::7f) by DM5PR07CA0085.outlook.office365.com (2603:10b6:4:ae::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Tue, 5 Oct 2021 12:30: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 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.4566.14 via Frontend Transport; Tue, 5 Oct 2021 12:30:56 +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; Tue, 5 Oct 2021 12:30:54 +0000 From: Xueming Li To: CC: , Thomas Monjalon , "David Marchand" Date: Tue, 5 Oct 2021 20:30:12 +0800 Message-ID: <20211005123012.264727-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211005123012.264727-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7945e94e-ec31-4b22-5257-08d987fbfac3 X-MS-TrafficTypeDiagnostic: MN2PR12MB3680: 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: f4y00nXgkix2opNFbyYNfh09/TUODYPYJLxpFPceiSjBFc1XJo+x0yjkscwOzczLOXLUjBoHOaFOAVoyuaOJglUQeoh5XGer4i0iTO3jjaA6AqfaAkgP+VdeA+6j4OJ+sT3XSdAj0Qq5bg5q9ZavtossEX+8i8RLCDoKg7b48Ps8nrN5CvdAxY25bdlZthcCL8vvdv3McWQXK5EkU2uRdTkjwZYvYBsM3dPVNyTUv8aA4/pXRESpFwrNLu0lSyiQx5kj2eOvn+qPNMiBt0zyDD4DQZ8QqFFeIrT+fsIXv0nuUFy1tXCAq/2kEDEXvXuLLWQ29gHIlfn/hunJr9PjQxIeoUTKNneqqNR6EDkOHqL+XE4O6aXNdw+rV/G9HrAL3MVsk6HrSPJQ/bug3hEM3KUYg7LPK7aYQ46rROb/SVI3wisrJXVDsXsSh0C/SckYSxEVW5QTzxJ1C73nAPGHsTBw61bQGTG43Fjskkh9YI4+2vy8P6HLUgPwDw4ijx4RTo6DlK8IUe+qKj0jJuiE08PGX59r/pQvndhLm2KZGGgwxrR9h+iN/hcqPsN3yHEKIPqnaPCN4uscTn7g3FrzNwlrm/tePyiocVWK7vq2t34KIu3KE2CX+8LHFjthpWYV142HvMfzixl8yDzEXLLRoHWBYz1FZchtQb0S33F68LR/E6axWjD1RFkti7ZKxeU/EOXyis2Wwjg+pVnWKs2sYQ== 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)(426003)(6916009)(7636003)(2616005)(47076005)(26005)(6666004)(7696005)(508600001)(2906002)(83380400001)(356005)(5660300002)(36756003)(55016002)(316002)(1076003)(8936002)(8676002)(86362001)(16526019)(4326008)(36860700001)(6286002)(70206006)(186003)(54906003)(82310400003)(336012)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 12:30:56.2203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7945e94e-ec31-4b22-5257-08d987fbfac3 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: MN2PR12MB3680 Subject: [dpdk-dev] [PATCH 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 | 1 + app/test/test_devargs.c | 147 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 app/test/test_devargs.c diff --git a/app/test/meson.build b/app/test/meson.build index f144d8b8ed6..c688ba2b70a 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_eal_flags.c', diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c new file mode 100644 index 00000000000..8a173368347 --- /dev/null +++ b/app/test/test_devargs.c @@ -0,0 +1,147 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#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; + } list[] = { + /* Global devargs syntax: */ + { "bus=pci", 1, 0, 0 }, + { "class=eth", 0, 1, 0 }, + { "bus=pci,addr=1:2.3/class=eth/driver=abc,k0=v0", 2, 1, 2 }, + { "bus=vdev,name=/dev/file/name/class=eth", 2, 1, 0 }, + /* Legacy devargs syntax: */ + { "1:2.3", 0, 0, 0 }, + { "pci:1:2.3,k0=v0", 0, 0, 1 }, + { "net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1", + 0, 0, 3 }, + }; + 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 && 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].class_kv > 0 && 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 (test_args(list[i].devargs, "driver", da.drv_str, + list[i].driver_kv) != 0) + 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);