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 043DBA0548; Fri, 24 Sep 2021 17:58:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3E1541340; Fri, 24 Sep 2021 17:58:11 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id C726B41329 for ; Fri, 24 Sep 2021 17:58:08 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id t8so28972228wrq.4 for ; Fri, 24 Sep 2021 08:58:08 -0700 (PDT) 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=mG4OZqEBoW7KZ2M7s7ssYRmQvKyO3lGkA6SRDKo6ft0=; b=fbxWlUKYeU6HA49+hQobP0J2hcUV3xOaHQoYOjJRMo8Emfi8UsxjuwaFcl6DCsRD/+ 8aeH86hyELUwQiJUZK5mBgaq0ywXsbYJGDl2nTWO71v5hqnNtdkwNjF0GsXrl+X9qb7o TYRFplWeHXz/N83auuKHa7lFTJTf9K/1xqvM8STl0uB1zz1r9m1Xeb7ZBDQqpxd4ye7P ySxyHYLIe3dGh+casZ8kaNCn90HWcBsV3h2end0GNBPj9wop166LCgRpi8rl6VTbRXJ+ 0m9rtzowZj01D3JqHjOwsbiFv4G4wO5IRI9CJ0xLJY9VZCdnFCm36xWbNNCd2UmegbSY 52XQ== 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=mG4OZqEBoW7KZ2M7s7ssYRmQvKyO3lGkA6SRDKo6ft0=; b=KcW/6vi0LwJmgMqvofvAf4Yx3nEnfBW3jw7NSsu2EU24IGHCqxburkNOzqXUTuVnLa tLZuQ5+FM3BYGv2KpJtLc/15fSnP9/NYVv6hCi2ZznYmT3laygjIUui0z/ueNaqWvwuZ w6nCzMhKWOsdaDZgbC/bWOT296hkpE94TDcQ+jyp8GL8pJ5mUOIuiUQ1F0egKbkFU4c8 7WloGQnz6dmS4FYCCovdMj3cRYMC5ouyQwxrkbNpZ66q82V8q1p1Bd2WJzocbjmCnCTx tPV127KSuw0uQYcKlAhdKj4ZA20+WPuQdudVUHXsWZCuWdEmyrn97H3uw0souN0sQ7ZP MVTg== X-Gm-Message-State: AOAM533B3dwDLgdEDNhs88wVcjV1Y1GVhmNn9DmEcVNcfGeH3KCVZaqt hDJd0QC6/R9zaS3qnJ5esLbrpCMkzQBPmA== X-Google-Smtp-Source: ABdhPJzNLJf62OA7W33G7X7uAlyiUcor+i7TQyUVCsSYsHVUjKLK6W88a7kn+xzGeVQjq/3sFn6RCQ== X-Received: by 2002:adf:f4c6:: with SMTP id h6mr1720823wrp.397.1632499088530; Fri, 24 Sep 2021 08:58:08 -0700 (PDT) Received: from gojira.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id a75sm9280829wmd.4.2021.09.24.08.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 08:58:08 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Cc: Olivier Matz , Bruce Richardson , Xueming Li , Gaetan Rivet , Ray Kinsella Date: Fri, 24 Sep 2021 17:57:38 +0200 Message-Id: <20210924155740.20510-4-olivier.matz@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210924155740.20510-1-olivier.matz@6wind.com> References: <20210924155740.20510-1-olivier.matz@6wind.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 3/5] kvargs: new function to get from key and value 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" A quite common scenario with kvargs is to lookup for a = in a kvlist. For instance, check if name=foo is present in name=toto,name=foo,name=bar. This is currently done in drivers/bus with rte_kvargs_process() + the rte_kvargs_strcmp() handler. This approach is not straightforward, and can be replaced by this new function. Signed-off-by: Olivier Matz --- drivers/bus/auxiliary/auxiliary_params.c | 9 ++++---- drivers/bus/vdev/vdev_params.c | 13 ++--------- lib/kvargs/rte_kvargs.c | 23 +++++++++++++++---- lib/kvargs/rte_kvargs.h | 29 +++++++++++++++++++++++- lib/kvargs/version.map | 2 ++ 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/drivers/bus/auxiliary/auxiliary_params.c b/drivers/bus/auxiliary/auxiliary_params.c index cd3fa56cb4..a9c7853ed1 100644 --- a/drivers/bus/auxiliary/auxiliary_params.c +++ b/drivers/bus/auxiliary/auxiliary_params.c @@ -25,13 +25,12 @@ auxiliary_dev_match(const struct rte_device *dev, const void *_kvlist) { const struct rte_kvargs *kvlist = _kvlist; - int ret; + const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME]; - ret = rte_kvargs_process(kvlist, - auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME], - rte_kvargs_strcmp, (void *)(uintptr_t)dev->name); + if (rte_kvargs_get_with_value(kvlist, key, dev->name) == NULL) + return -1; - return ret != 0 ? -1 : 0; + return 0; } void * diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 6f74704d1c..37d95395e7 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -26,19 +26,10 @@ static int vdev_dev_match(const struct rte_device *dev, const void *_kvlist) { - int ret; const struct rte_kvargs *kvlist = _kvlist; - char *name; + const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME]; - /* cannot pass const dev->name to rte_kvargs_process() */ - name = strdup(dev->name); - if (name == NULL) - return -1; - ret = rte_kvargs_process(kvlist, - vdev_params_keys[RTE_VDEV_PARAM_NAME], - rte_kvargs_strcmp, name); - free(name); - if (ret != 0) + if (rte_kvargs_get_with_value(kvlist, key, dev->name) == NULL) return -1; return 0; diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c index 38e9d5c1ca..20abb23183 100644 --- a/lib/kvargs/rte_kvargs.c +++ b/lib/kvargs/rte_kvargs.c @@ -204,21 +204,34 @@ rte_kvargs_free(struct rte_kvargs *kvlist) free(kvlist); } -/* Lookup a value in an rte_kvargs list by its key. */ +/* Lookup a value in an rte_kvargs list by its key and value. */ const char * -rte_kvargs_get(const struct rte_kvargs *kvlist, const char *key) +rte_kvargs_get_with_value(const struct rte_kvargs *kvlist, const char *key, + const char *value) { unsigned int i; - if (kvlist == NULL || key == NULL) + if (kvlist == NULL) return NULL; for (i = 0; i < kvlist->count; ++i) { - if (strcmp(kvlist->pairs[i].key, key) == 0) - return kvlist->pairs[i].value; + if (key != NULL && strcmp(kvlist->pairs[i].key, key) != 0) + continue; + if (value != NULL && strcmp(kvlist->pairs[i].value, value) != 0) + continue; + return kvlist->pairs[i].value; } return NULL; } +/* Lookup a value in an rte_kvargs list by its key. */ +const char * +rte_kvargs_get(const struct rte_kvargs *kvlist, const char *key) +{ + if (kvlist == NULL || key == NULL) + return NULL; + return rte_kvargs_get_with_value(kvlist, key, NULL); +} + /* * Parse the arguments "key=value,key=value,..." string and return * an allocated structure that contains a key/value list. Also diff --git a/lib/kvargs/rte_kvargs.h b/lib/kvargs/rte_kvargs.h index 328f0d3cc6..e40df1bd2a 100644 --- a/lib/kvargs/rte_kvargs.h +++ b/lib/kvargs/rte_kvargs.h @@ -116,7 +116,7 @@ void rte_kvargs_free(struct rte_kvargs *kvlist); /** * Get the value associated with a given key. * - * If multiple key matches, the value of the first one is returned. + * If multiple keys match, the value of the first one is returned. * * The memory returned is allocated as part of the rte_kvargs structure, * it must never be modified. @@ -132,6 +132,33 @@ void rte_kvargs_free(struct rte_kvargs *kvlist); */ const char *rte_kvargs_get(const struct rte_kvargs *kvlist, const char *key); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Get the value associated with a given key and value. + * + * Find the first entry in the kvlist whose key and value match the + * ones passed as argument. + * + * The memory returned is allocated as part of the rte_kvargs structure, + * it must never be modified. + * + * @param kvlist + * A list of rte_kvargs pair of 'key=value'. + * @param key + * The matching key. If NULL, any key will match. + * @param value + * The matching value. If NULL, any value will match. + * + * @return + * NULL if no key matches the input, + * a value associated with a matching key otherwise. + */ +__rte_experimental +const char *rte_kvargs_get_with_value(const struct rte_kvargs *kvlist, + const char *key, const char *value); + /** * Call a handler function for each key/value matching the key * diff --git a/lib/kvargs/version.map b/lib/kvargs/version.map index 236f35c02b..82879b7140 100644 --- a/lib/kvargs/version.map +++ b/lib/kvargs/version.map @@ -16,4 +16,6 @@ EXPERIMENTAL { rte_kvargs_strcmp; + # added in 21.11 + rte_kvargs_get_with_value; }; -- 2.30.2