From patchwork Wed Oct 20 11:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 102415 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26EC4A0C43; Wed, 20 Oct 2021 13:13:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 405B741201; Wed, 20 Oct 2021 13:13:02 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2088.outbound.protection.outlook.com [40.107.223.88]) by mails.dpdk.org (Postfix) with ESMTP id 0832A411F8 for ; Wed, 20 Oct 2021 13:12:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M7UuSskOYBkAcUkqzqUerEvWxHtTL9XRopyGtakyGIPBTThI5zuvUP9bbH0y4ZUIISLReLICoIcBOKrKdE1Jrmv8I2Q87Yq0MKVovTEbF18GhFi0vFq4CCDW4m6GON+HU+PgSJYA7uTYcFy9+eYC4jVuTBEBIprOuGXgHaDJHqVsirML/c/lM6JSNY8X8t4H8EecaMw3uqP5Zmf8e08hnQZkdtwRj1YWVfIaxYwHyGkmjEYzpledVB351XuXJhOv1S/LLTfUEhVsCMin+391vkokfUFin80SJA0VlVrVmjJSSdIiux8q2ZEQ+eUQzlbMgQJ9C/NlWhGp49UJhYmJSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p1Nl3/RPWcdKYf+56PD26YPtTBnf2ajaZ+Rf5GEgG0k=; b=jup7NH4GQxMeeMabdDIcV8kYiMwsZwcdO0mBR/s+cJvbDhvjfUmRiUcDTt1UuXXzvqPQBWCSqJ1LsJ62jLapTVV7RM6x9lZSXDuZviC5LMJ5mA9+Q62UUzmm8/WgJSsjZNoXuxQd5HUbFo6JjlAyJ3eTx/9S3HO89Vjx+EXLqWcr0CGci8UjPfIRPf6FtAQCU+vPrXrsKqkIda20t1qHpqUY0e4W8vQamweoJ2yHcsl+rLMFyuCwLucERiX+Wffv8/i4qs8VfrMoYiQ9HOkBDjgscWNDlG6N/IwfRZbBQ0Mcm8q7EDzTraqT43CM+0TCFRqyZUlLmJPiLuwfwRlXsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p1Nl3/RPWcdKYf+56PD26YPtTBnf2ajaZ+Rf5GEgG0k=; b=S+HSgVYDvQGZ9Oc/ij0nkYFze4OfSx/LZF8RTKYmij0xU4EISftKFkaavBYtqsG7yWL5f5TeiEDZo0CU1wsIH3NihkQj3FFuEql31UDiByBe6CNAcjCrJHJPToFqFjy4S/bMNGgxm9kU/QBdPMOmye59J2YoXEhf2pu3bcXICHE7LicSykC6VpSLQI/divVw7RlJP3DwRA24wD/sMLwMtZE97FFn7pJ4PtedBHwhqxUo2ipxqPS66xc5Qb6MUE+jZkMQSJQ/0G9kpYpCT5XiIbyXrRkYbAJ42otNk5xUhanvwG6pnq4N+onXdkKKmSa5Pn1nlryDkNrs4afhz9GgDQ== Received: from MWHPR11CA0032.namprd11.prod.outlook.com (2603:10b6:300:115::18) by BN9PR12MB5340.namprd12.prod.outlook.com (2603:10b6:408:105::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15; Wed, 20 Oct 2021 11:12:56 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:115:cafe::c7) by MWHPR11CA0032.outlook.office365.com (2603:10b6:300:115::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 11:12:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Wed, 20 Oct 2021 11:12:55 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 20 Oct 2021 11:12:47 +0000 From: Xueming Li To: , Gaetan Rivet , David Marchand CC: , Thomas Monjalon , "Lior Margalit" Date: Wed, 20 Oct 2021 19:12:30 +0800 Message-ID: <20211020111230.2441949-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211020111230.2441949-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211020111230.2441949-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 99ccf738-d89b-4452-7928-08d993ba9145 X-MS-TrafficTypeDiagnostic: BN9PR12MB5340: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IvI+qTBqEIDq5xSy2ZZ2I7HSxUkt4nG3tazNwAlGMp8wqYn9IccHA3ZJJzk2nFUZEByvk9mh945xlZrl8YaaJzc3TOxAh0uTGwG8xFU1MWmpIvTIJNymT/b0ZliJQXgK/QUjQWLPaPh/0QY1yFC0UTjD9wVHH2irEOKvxJksZjS1Wiwn6awfaa/C+bt2nIYU/htqLp0ckQ08oyoOhzKBFn03jSUbniE13Pl/QRIqmg1CL6uqBrM1DaMEyRXdxkhE7/D4D/aurPEE+SJ4aTjPUDbXaBbsgWAe/WwCy41LjLWSVi3uUZRLkI7qoGCCnP2NnX1zpDUTa0PhBJsUKItqxgah102BxSQRiCLElsTaummC60hNweTk1W/rgLXpI+paEbKP+U7jRVNfp/lK07VPwR0D07aiEBvXLrJkGPevDerChVGP/ZdJK1KBj44ZkuZgLQvz3rjS6Iet2wBnP9ZoLtgfQE84seT+z6XRdfvSs5BIaD9VU/PFE5+d/r61KCiWLhzyYAOfL3vF6OP+QnyiMMHrSUNr0t2f5MMmvK6/e9QDsQg1CdMq0DqKF32O4cs0wZRW1HiRHlM7i4ZDPZGxkuPEJ4VTfiwmv9xyjNWbpRbeu0vnzihOLcO01FK0Nslh7hcatV6uQB97MscIVK+JT34s9iH4XDbK5u8xxnQNsfIG5Gn0B2Y7fui+gYElQjTS0adkDUAu6F2kgXqMiQHVww== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(86362001)(55016002)(2906002)(1076003)(5660300002)(186003)(36756003)(508600001)(2616005)(336012)(6286002)(426003)(70206006)(70586007)(107886003)(47076005)(8936002)(36860700001)(8676002)(82310400003)(36906005)(7696005)(26005)(54906003)(356005)(316002)(110136005)(7636003)(6666004)(4326008)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2021 11:12:55.5048 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99ccf738-d89b-4452-7928-08d993ba9145 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5340 Subject: [dpdk-dev] [PATCH v4 3/3] test/devargs: add devargs test cases X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Initial version to test global devargs syntax. Signed-off-by: Xueming Li --- app/test/meson.build | 5 ++ app/test/test_devargs.c | 184 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 app/test/test_devargs.c diff --git a/app/test/meson.build b/app/test/meson.build index a16374b7a10..c4b0241010d 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -399,6 +399,11 @@ if dpdk_conf.has('RTE_NET_RING') fast_tests += [['latencystats_autotest', true]] fast_tests += [['pdump_autotest', true]] endif +if dpdk_conf.has('RTE_NET_VIRTIO') + test_deps += 'net_virtio' + test_sources += 'test_devargs.c' + fast_tests += [['devargs_autotest', true]] +endif if dpdk_conf.has('RTE_LIB_POWER') test_deps += 'power' diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c new file mode 100644 index 00000000000..13e95f052b0 --- /dev/null +++ b/app/test/test_devargs.c @@ -0,0 +1,184 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "test.h" + +/* Check layer arguments. */ +static int +test_args(const char *devargs, const char *layer, const char *args, const int n) +{ + struct rte_kvargs *kvlist; + + if (n == 0) { + if (args != NULL && strlen(args) > 0) { + printf("rte_devargs_parse(%s) %s args parsed (not expected)\n", + devargs, layer); + return -1; + } else { + return 0; + } + } + if (args == NULL) { + printf("rte_devargs_parse(%s) %s args not parsed\n", + devargs, layer); + return -1; + } + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_devargs_parse(%s) %s_str: %s not parsed\n", + devargs, layer, args); + return -1; + } + if ((int)kvlist->count != n) { + printf("rte_devargs_parse(%s) %s_str: %s kv number %u, not %d\n", + devargs, layer, args, kvlist->count, n); + return -1; + } + return 0; +} + +/* Test several valid cases */ +static int +test_valid_devargs(void) +{ + static const struct { + const char *devargs; + int bus_kv; + int class_kv; + int driver_kv; + const char *bus; + const char *name; + const char *class; + } list[] = { + /* Global devargs syntax: */ + { "bus=pci", + 1, 0, 0, "pci", NULL, NULL}, + { "class=eth", + 0, 1, 0, NULL, NULL, "eth" }, + { "bus=pci,addr=1:2.3/class=eth/driver=abc,k0=v0", + 2, 1, 2, "pci", "0000:01:02.3", "eth" }, + { "bus=vdev,name=/dev/file/name/class=eth", + 2, 1, 0, "vdev", "/dev/file/name", "eth" }, + { "bus=vdev,name=/class/bus/path/class=eth", + 2, 1, 0, "vdev", "/class/bus/path", "eth" }, + { "bus=vdev,name=///dblslsh/class=eth", + 2, 1, 0, "vdev", "///dblslsh", "eth" }, + /* Legacy devargs syntax: */ + { "1:2.3", 0, 0, 0, + "pci", "1:2.3", NULL }, + { "pci:1:2.3,k0=v0", + 0, 0, 1, "pci", "1:2.3", NULL }, + { "net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1", + 0, 0, 3, "vdev", "net_virtio_user0", NULL }, + { "net_virtio_user0,iface=test,path=/class/bus/,queues=1", + 0, 0, 3, "vdev", "net_virtio_user0", NULL }, + }; + struct rte_devargs da; + uint32_t i; + int ret; + int fail = 0; + + for (i = 0; i < RTE_DIM(list); i++) { + memset(&da, 0, sizeof(da)); + ret = rte_devargs_parse(&da, list[i].devargs); + if (ret < 0) { + printf("rte_devargs_parse(%s) returned %d (but should not)\n", + list[i].devargs, ret); + goto fail; + } + if ((list[i].bus_kv > 0 || list[i].bus != NULL) && + da.bus == NULL) { + printf("rte_devargs_parse(%s) bus not parsed\n", + list[i].devargs); + goto fail; + } + if (test_args(list[i].devargs, "bus", da.bus_str, + list[i].bus_kv) != 0) + goto fail; + if (list[i].bus != NULL && + strcmp(da.bus->name, list[i].bus) != 0) { + printf("rte_devargs_parse(%s) bus name (%s) not expected (%s)\n", + list[i].devargs, da.bus->name, list[i].bus); + goto fail; + } + if ((list[i].class_kv > 0 || list[i].class != NULL) && + da.cls == NULL) { + printf("rte_devargs_parse(%s) class not parsed\n", + list[i].devargs); + goto fail; + } + if (test_args(list[i].devargs, "class", da.cls_str, + list[i].class_kv) != 0) + goto fail; + if (list[i].class != NULL && + strcmp(da.cls->name, list[i].class) != 0) { + printf("rte_devargs_parse(%s) class name (%s) not expected (%s)\n", + list[i].devargs, da.cls->name, list[i].class); + goto fail; + } + if (test_args(list[i].devargs, "driver", da.drv_str, + list[i].driver_kv) != 0) + goto fail; + if (list[i].name != NULL && + strcmp(da.name, list[i].name) != 0) { + printf("rte_devargs_parse(%s) device name (%s) not expected (%s)\n", + list[i].devargs, da.name, list[i].name); + goto fail; + } + goto cleanup; +fail: + fail = -1; +cleanup: + rte_devargs_reset(&da); + } + return fail; +} + +/* Test several invalid cases */ +static int +test_invalid_devargs(void) +{ + static const char * const list[] = { + "bus=wrong-bus", + "class=wrong-class"}; + struct rte_devargs da; + uint32_t i; + int ret; + int fail = 0; + + for (i = 0; i < RTE_DIM(list); i++) { + ret = rte_devargs_parse(&da, list[i]); + if (ret >= 0) { + printf("rte_devargs_parse(%s) returned %d (but should not)\n", + list[i], ret); + fail = ret; + } + rte_devargs_reset(&da); + } + return fail; +} + +static int +test_devargs(void) +{ + printf("== test valid case ==\n"); + if (test_valid_devargs() < 0) + return -1; + printf("== test invalid case ==\n"); + if (test_invalid_devargs() < 0) + return -1; + return 0; +} + +REGISTER_TEST_COMMAND(devargs_autotest, test_devargs);