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 83A94A0C52; Wed, 24 Nov 2021 12:02:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B4D641160; Wed, 24 Nov 2021 12:02:55 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 9AF2F40F35 for ; Wed, 24 Nov 2021 12:02:53 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id p18so1892387wmq.5 for ; Wed, 24 Nov 2021 03:02:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U+j8oRSRPH29rHkzaQgeHsYWeeV475y+vDWDfiCrF/Y=; b=aVCp2fgwiaiB1Vh3IKadq3lKN1YR8QwMCv7jYA7OALkSs8md/x82YlMR6GSTUh99mK O1Eyd6lGR7/GsV3PSBNjL4cF/fX2lSv4KtaoOWzybmzzApG/jlnRf1hbufQbOZJIQcZS bxXwkoaIYtDn0oEuSZSQlIwqI63fTuYGfZGrh9v8H2u6cgwkkQrjr/S7cPTdUkWWeE+o JQdm/XSzlbkyWw2SLimPnoNNdZ/iwPedINyqtg04S095aL5IMV5sLqf3oqBlb+Ig1y+L j+n+5Qw8OCz8+Jss1XrHEg79IYj6BMpVo/YloGQz3pHxDzWzen7qQ14qiIl68DBAgASC atTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U+j8oRSRPH29rHkzaQgeHsYWeeV475y+vDWDfiCrF/Y=; b=oO6GenyT3/AMR1/JLheEtzYj5npGfbxkfNF71WIGC3NF+6Wk7hMqE802sUt+HECYL2 SzuQykAcqImn6WInMtjxTUee0I+LRp/hxwF+53Drh4LsQYvHWMzpfvQCq/qiGDC1pArP 9eCBKIL6bTNyU0LWRk6EhzyJf8lXvdQCJCHT3ZmgwRCMq8POMDQkjyJILZ73bvkSb4XF m1wx4THkFFRt1sg6lC0jDih4aaSK8O8Y4MH4DLS5B0LqYeDHXxn/F3ucOBCgu+7rqQA+ cdflw24zCFghyZnijBwV1Hwcq2BgOYMqE0yEYGmXv+Z0eJb0W5JBSTvdbC+1KOBQYYxD qLmQ== X-Gm-Message-State: AOAM530u6LvPyu08lVVp5UsOHXf+IuHDUHa4zAGW7MQJwwFAB1qFiTdS FTQoqZIuZrwT5rYMUdGleP6GWhYNW9xgyw== X-Google-Smtp-Source: ABdhPJxA45OAa/TxBMDLYyxnXskY2uiFbtt9tQ7sPeyFb0+FRAXYL3WmTqw9acl9F75Df+EbWO8T5w== X-Received: by 2002:a05:600c:224a:: with SMTP id a10mr13622454wmm.154.1637751772452; Wed, 24 Nov 2021 03:02:52 -0800 (PST) Received: from gojira.dev.6wind.com ([185.13.181.2]) by smtp.gmail.com with ESMTPSA id t8sm5055248wmq.32.2021.11.24.03.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 03:02:51 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Cc: xuemingl@nvidia.com, Lior Margalit , Parav Pandit , David Marchand , Ray Kinsella Subject: [PATCH v3] bus: fix device iterator match from arguments Date: Wed, 24 Nov 2021 12:02:44 +0100 Message-Id: <20211124110244.26464-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211122061250.3220823-1-xuemingl@nvidia.com> References: <20211122061250.3220823-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Xueming Li Device iterator RTE_DEV_FOREACH() failed to return devices from classifier like "class=vdpa", because matching name from empty kvargs returns no result. If device name not specified in kvargs, the function should iterate all devices. This patch allows empty devargs or devargs without name specified. Fixes: 6aebb942907d ("kvargs: add function to get from key and value") Signed-off-by: Xueming Li Signed-off-by: Olivier Matz --- bug is specific to 21.11, no need to cc stable@dpdk.org --- app/test/meson.build | 3 + app/test/test_vdev.c | 168 +++++++++++++++++++++++ drivers/bus/auxiliary/auxiliary_params.c | 9 +- drivers/bus/vdev/vdev_params.c | 9 +- 4 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 app/test/test_vdev.c diff --git a/app/test/meson.build b/app/test/meson.build index 961bebc5cb..19009da52e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -153,6 +153,7 @@ test_sources = files( 'test_trace.c', 'test_trace_register.c', 'test_trace_perf.c', + 'test_vdev.c', 'test_version.c', 'virtual_pmd.c', ) @@ -177,6 +178,7 @@ test_deps = [ 'ipsec', 'lpm', 'member', + 'net_null', 'node', 'pipeline', 'port', @@ -283,6 +285,7 @@ fast_tests = [ ['service_autotest', true], ['thash_autotest', true], ['trace_autotest', true], + ['vdev_autotest', true], ] # Tests known to have issues or which don't belong in other tests lists. diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c new file mode 100644 index 0000000000..720722c363 --- /dev/null +++ b/app/test/test_vdev.c @@ -0,0 +1,168 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2021 6WIND S.A. + */ + +#include +#include +#include + +#include +#include +#include + +#include "test.h" + +#define TEST_VDEV_KEY_NAME "name" + +static const char * const valid_keys[] = { + TEST_VDEV_KEY_NAME, + NULL, +}; + +static int +cmp_dev_name(const struct rte_device *dev, const void *name) +{ + return strcmp(dev->name, name); +} + +static int +cmp_dev_match(const struct rte_device *dev, const void *_kvlist) +{ + const struct rte_kvargs *kvlist = _kvlist; + const char *key = TEST_VDEV_KEY_NAME; + const char *name; + + /* no kvlist arg, all devices match */ + if (kvlist == NULL) + return 0; + + /* if key is present in kvlist and does not match, filter device */ + name = rte_kvargs_get(kvlist, key); + if (name != NULL && strcmp(name, dev->name)) + return -1; + + return 0; +} + +static struct rte_device * +get_matching_vdev(const char *match_str) +{ + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + struct rte_kvargs *kvargs = NULL; + struct rte_device *dev; + + if (match_str != NULL) { + kvargs = rte_kvargs_parse(match_str, valid_keys); + if (kvargs == NULL) { + printf("Failed to parse match string\n"); + return NULL; + } + } + + dev = vdev_bus->find_device(NULL, cmp_dev_match, kvargs); + rte_kvargs_free(kvargs); + + return dev; +} + +static int +test_vdev_bus(void) +{ + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + struct rte_dev_iterator dev_iter = { 0 }; + struct rte_device *dev, *dev0, *dev1; + + /* not supported */ + if (vdev_bus == NULL) + return 0; + + /* create first vdev */ + if (rte_vdev_init("net_null_test0", "") < 0) { + printf("Failed to create vdev net_null_test0\n"); + goto fail; + } + dev0 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test0"); + if (dev0 == NULL) { + printf("Cannot find net_null_test0 vdev\n"); + goto fail; + } + + /* create second vdev */ + if (rte_vdev_init("net_null_test1", "") < 0) { + printf("Failed to create vdev net_null_test1\n"); + goto fail; + } + dev1 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test1"); + if (dev1 == NULL) { + printf("Cannot find net_null_test1 vdev\n"); + goto fail; + } + + /* try to match vdevs */ + dev = get_matching_vdev("name=net_null_test0"); + if (dev != dev0) { + printf("Cannot match net_null_test0 vdev\n"); + goto fail; + } + + dev = get_matching_vdev("name=net_null_test1"); + if (dev != dev1) { + printf("Cannot match net_null_test1 vdev\n"); + goto fail; + } + + dev = get_matching_vdev("name=unexistant"); + if (dev != NULL) { + printf("Unexistant vdev should not match\n"); + goto fail; + } + + dev = get_matching_vdev(""); + if (dev == NULL || dev == dev1) { + printf("Cannot match any vdev with empty match string\n"); + goto fail; + } + + dev = get_matching_vdev(NULL); + if (dev == NULL || dev == dev1) { + printf("Cannot match any vdev with NULL match string\n"); + goto fail; + } + + /* iterate all vdevs, and ensure we find vdev0 and vdev1 */ + RTE_DEV_FOREACH(dev, "bus=vdev", &dev_iter) { + if (dev == dev0) + dev0 = NULL; + else if (dev == dev1) + dev1 = NULL; + } + if (dev0 != NULL) { + printf("dev0 was not iterated\n"); + goto fail; + } + if (dev1 != NULL) { + printf("dev1 was not iterated\n"); + goto fail; + } + + rte_vdev_uninit("net_null_test0"); + rte_vdev_uninit("net_null_test1"); + + return 0; + +fail: + rte_vdev_uninit("net_null_test0"); + rte_vdev_uninit("net_null_test1"); + return -1; +} + +static int +test_vdev(void) +{ + printf("== test vdev bus ==\n"); + if (test_vdev_bus() < 0) + return -1; + return 0; +} + +REGISTER_TEST_COMMAND(vdev_autotest, test_vdev); diff --git a/drivers/bus/auxiliary/auxiliary_params.c b/drivers/bus/auxiliary/auxiliary_params.c index 8dd8813611..9c08ccdd1b 100644 --- a/drivers/bus/auxiliary/auxiliary_params.c +++ b/drivers/bus/auxiliary/auxiliary_params.c @@ -28,8 +28,15 @@ auxiliary_dev_match(const struct rte_device *dev, { const struct rte_kvargs *kvlist = _kvlist; const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME]; + const char *name; - if (rte_kvargs_get_with_value(kvlist, key, dev->name) == NULL) + /* no kvlist arg, all devices match */ + if (kvlist == NULL) + return 0; + + /* if key is present in kvlist and does not match, filter device */ + name = rte_kvargs_get(kvlist, key); + if (name != NULL && strcmp(name, dev->name)) return -1; return 0; diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 37d95395e7..3969faf16d 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -28,8 +28,15 @@ vdev_dev_match(const struct rte_device *dev, { const struct rte_kvargs *kvlist = _kvlist; const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME]; + const char *name; - if (rte_kvargs_get_with_value(kvlist, key, dev->name) == NULL) + /* no kvlist arg, all devices match */ + if (kvlist == NULL) + return 0; + + /* if key is present in kvlist and does not match, filter device */ + name = rte_kvargs_get(kvlist, key); + if (name != NULL && strcmp(name, dev->name)) return -1; return 0; -- 2.30.2