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 ECC24A0C4C; Tue, 5 Oct 2021 17:55:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35E03413ED; Tue, 5 Oct 2021 17:55:20 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2086.outbound.protection.outlook.com [40.107.236.86]) by mails.dpdk.org (Postfix) with ESMTP id 502CA413E8 for ; Tue, 5 Oct 2021 17:55:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QDs0irOvWmdQjB1mj39HAQe0UMYintkT2o9KwEwW6/rNHcA8wtJ8G5mo+DF96QyVOs1z1Hrrrn9NkzhNDBUxVYUUFlHp1bPWxeotm47k2iqba8k9ruAUORlu9d9qn9au1kUneRZPs7a/5QHbh6JTzxTB/5kALRcNdeQ6+1cQyz2ZNS4a5EAJgF49WITxoXxVnWq19G4Wkrc+JmvVUovhNitqHbDEjNA9cy/LLz78PLIP5vYh5Ie6O0Ck+SvYQRc9kpr+vEun5G7LTbvZNlFH49Q8E/lTPpGy9S4lfTJxALAzyqmsUKEOCxBv5VaEjKMYam/25icK98znNm8YO9Mi4g== 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=yhfThV8GIu8rXRVcOgbqSgj/1qSnvZKaGqBpKC161Sc=; b=f4QMULnb0ICUl2sIW6qHN779uUE8V3DHPH8m+nn1yfRGvxGy6peyinAO2799OwkgJVaxEsS2hedOkt8FTiEQ0qDDZXuim8Bx/vnk73DRNUxVzGV1V6VfEdDjEeMAsQeaB3XcbUg9W3dnN90NudA1oC8ys0UQGLkc3CTQtK11DOghA5Gox/LaQTQmXqnc347OSK/7sPGNtAWtKj/ZerQyHdA2BbiiD0s/PejKz7ucOgc4V+uCabctF6YDgXH7mNERm+4rx4gJoI7QC2qT2kTuc9j+IFPTDEJwodhMDxns3kbNPMxlaEUOSWp53KV12umgaXez2Dom/3VSn/mdxv4BZw== 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=yhfThV8GIu8rXRVcOgbqSgj/1qSnvZKaGqBpKC161Sc=; b=Dom6DriRFURGp/u0TvDcm1ix1tUNOEfQNlSAQdWdPclHj5IZIk7b1rCE/Mdwc2DP18gocmgEZCKYsS3Jckv4G/lG8SAJVAZzW722kOD7h7DBAPM2hoJc3xyUrSXlDCdGNGLFL7Gk4ru4IkuSCIqfPYTUSZmvLr4Y4ct7P8XxJPW/rcsxK9ejcX23jdlNlZgA2IIqA6c1EvcQa2+ENbxec1D0GQT0URHvdswqN10yJ+2YMEzX69xrWfxlLC7urt28EhVREoJ1UmJ8GlP4KyBXvp/9MQwAZZqUVLIJt2se8D3VwGaaCrcdJipMkCZSBQ3+Bzmy5cA+Oxp2w6znHYhVBQ== Received: from MWHPR04CA0065.namprd04.prod.outlook.com (2603:10b6:300:6c::27) by BN9PR12MB5099.namprd12.prod.outlook.com (2603:10b6:408:118::11) 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 15:55:17 +0000 Received: from CO1NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:300:6c:cafe::69) by MWHPR04CA0065.outlook.office365.com (2603:10b6:300:6c::27) 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 15:55:16 +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 CO1NAM11FT032.mail.protection.outlook.com (10.13.174.218) 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 15:55:16 +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 15:55:13 +0000 From: Xueming Li To: CC: , Thomas Monjalon , "David Marchand" Date: Tue, 5 Oct 2021 23:54:35 +0800 Message-ID: <20211005155435.279043-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211005155435.279043-1-xuemingl@nvidia.com> References: <20211005123012.264727-1-xuemingl@nvidia.com> <20211005155435.279043-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: 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: b1d4c211-5a90-4144-2335-08d98818865e X-MS-TrafficTypeDiagnostic: BN9PR12MB5099: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:376; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HPSIeB//twqLEEsteGD4MqqeD9a/KAs3dTrDgUpSoPDDBpBD6p9U5zxrliz8UPtXbDO1z2aVrzgov2q2dhEHG8hl/pu/ZA5odj+hfJInNahmydkORExgFqQxp0k1tudsbXkj0LHa9e+VI+02PHBjAf6Sx5iCfPLqoPhmslCd1zrQXZLe2Km3QrIP3XonWqZDmAFqkixJKVCde+VBWjFd7hUnBqF4lNjBat8bAhkaWfnevYdmNHI53BIKMld1PFdWDj9IFVE7knW3HzzgxhUm2d52hNDjnkBauXCVUs+Pg4fzOPw3/sTWPCyAR9C7VWhOn4n2eLTNySni/IrZvgHjAd4u7uWtCEgrw1p1N9xJJPMY0WQ7tIc+5E4AWMbx3b/HFPeBEXiSq/94sOoZ+c5w1sypZ7Jt9Y7muZeMpH/U01x6COUoJlg3HJtomJ6DQp7kNrfjLFq3ikcmvmvoXn09WzM64gnOi/wBoZmWt+X88svwky8xY/EyDldb5JJcJF7VyqQqI7zBIfqn/IYFGXg2+19pff/TQjMEQ8tVECUO1L6pDAXuZSvUjxT6QrYPIKA6WGoCZ/umqpyJIv7Dv7CStkp6WO8wD5IT6ViXBPOsGYrDzhhTbIjDE/C2BbznqFUIvjookzJCGTjcJb+dyezo2XSli6oFg125c4HMw6VmQqfn/SVkeMWk6666/DWJdQoNDAptiEQoILu6+sPiNKdXHg== 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)(2906002)(86362001)(356005)(70206006)(36860700001)(7636003)(82310400003)(70586007)(26005)(7696005)(8936002)(5660300002)(1076003)(55016002)(426003)(6286002)(186003)(316002)(54906003)(508600001)(47076005)(83380400001)(336012)(36756003)(16526019)(2616005)(6916009)(8676002)(4326008)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 15:55:16.3335 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1d4c211-5a90-4144-2335-08d98818865e 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: CO1NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5099 Subject: [dpdk-dev] [PATCH v1 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/autotest_data.py | 6 ++ app/test/meson.build | 2 + app/test/test_devargs.c | 147 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 app/test/test_devargs.c diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 302d6374c16..3b841e71918 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -785,6 +785,12 @@ "Func": default_autotest, "Report": None, }, + { + "Name": "Devargs autotest", + "Command": "devargs_autotest", + "Func": default_autotest, + "Report": None, + }, # # Please always make sure that ring_perf is the last test! # diff --git a/app/test/meson.build b/app/test/meson.build index f144d8b8ed6..de8540f6119 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', @@ -201,6 +202,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..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); -- 2.33.0