From patchwork Wed Nov 24 12:45:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 104666 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 B8DD3A0C52; Wed, 24 Nov 2021 13:45:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 499EB410E5; Wed, 24 Nov 2021 13:45:38 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 34EEA40F35 for ; Wed, 24 Nov 2021 13:45:37 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id y196so2210854wmc.3 for ; Wed, 24 Nov 2021 04:45:37 -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=6x2swgkZ52Lu6KKQoLAJayAEKfwD7mLXO7RAjxpSFiU=; b=GS2N09ru8wRoxTaxcJmaNxRGgsAF2KZwuZlZBOcVqKTwuSO8DB7cC3ysV6zYniZI9e 6CETFjG09GRUiaw423JhtpEAbIBpKeMMefEd4MZhvjXQ30HhMxt9w7H9y/p/FjxOhw7P VInUnK8ZO5vPx1Mz+Q2C4hpp750HRMSQzxX3wpl3J/edCJaBTp+U8QvrCUkNc/NNS3OH 1Ej7pAMu1MmV5qf1Xy9K4rjNvKS2TLLUqHho9+zxcux/vyr9YhHS2phmNC7u8on8+ufG TU/QQkgNxIePHheTT93ALK0XuZO1FHqgIvx4DAZe2q5O9RrZgiOhLjIUcNhdgZxa1VzL gCAg== 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=6x2swgkZ52Lu6KKQoLAJayAEKfwD7mLXO7RAjxpSFiU=; b=bViV7ElgpL4FdXCPd04twwXpyAWE15GYi5bx8Qg1lHLGwlDbJrowP4EvBBboRfWWFB B6DpWoIp8OfemMNaC3nZfpV8a/+rTqL8RvXSLpFhyLS9zf74MfV/zK45ncc/FZsPBzQE 9Udxl2P94iR/uOG0XXsr3oVZTpsP0ubphKme/vJsE+tOyKDfuYPqa3AJk53wRYEnUQUK XztUfpQq6wBFx2jHURQGpLDjUoJI8Ke+oRDmQbATcBcVl0SML1OqpyS0FDCuZ9PQrt/6 hSOC7WdT3f2VCMh9pYg6YafD7oz2dLR1ZYOwZcLISC4exP+0Dt432dLfUEAYfRxqPvh1 1Zsg== X-Gm-Message-State: AOAM531IPvBPfSSsprNh/zNXBMxIucDlSky23K3OCNC5fDT6/k0C2oC9 kfYwBM7+i79FOqOkyEcNP/gzwr4xolpSaw== X-Google-Smtp-Source: ABdhPJzzu9o7F/B82hjqSRiNxST6C54MC1d3lONcPWiC1NnwVuXXCQMyu8ruC38dDYpTzoBHpz446w== X-Received: by 2002:a7b:c742:: with SMTP id w2mr14837006wmk.65.1637757936820; Wed, 24 Nov 2021 04:45:36 -0800 (PST) Received: from gojira.dev.6wind.com ([185.13.181.2]) by smtp.gmail.com with ESMTPSA id f19sm5911491wmq.34.2021.11.24.04.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 04:45:36 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Cc: xuemingl@nvidia.com, Lior Margalit , Parav Pandit , David Marchand , Ray Kinsella Subject: [PATCH v4] bus: fix device iterator match from arguments Date: Wed, 24 Nov 2021 13:45:24 +0100 Message-Id: <20211124124524.25754-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 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 Reviewed-by: Xueming Li Acked-by: Xueming Li --- bug is specific to 21.11, no need to cc stable@dpdk.org v4: - disable unit test when net/null is not enabled v3: - add unit test v2: - use rte_kvargs_get() + strcmp instead of rte_kvargs_get_with_value() --- app/test/meson.build | 5 + app/test/test_vdev.c | 168 +++++++++++++++++++++++ drivers/bus/auxiliary/auxiliary_params.c | 9 +- drivers/bus/vdev/vdev_params.c | 9 +- 4 files changed, 189 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..2b480adfba 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -426,6 +426,11 @@ if dpdk_conf.has('RTE_NET_RING') fast_tests += [['pdump_autotest', true]] endif endif +if dpdk_conf.has('RTE_NET_NULL') + test_deps += 'net_null' + test_sources += 'test_vdev.c' + fast_tests += [['vdev_autotest', true]] +endif if dpdk_conf.has('RTE_HAS_LIBPCAP') ext_deps += pcap_dep 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;