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