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);