From patchwork Wed Sep 19 16:03:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 44963 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 021AA5F13; Wed, 19 Sep 2018 18:04:21 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 909F45920 for ; Wed, 19 Sep 2018 18:04:11 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id o18-v6so7641897wmc.0 for ; Wed, 19 Sep 2018 09:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hMCs2bBg9MIWK7fO1XimBPC5t4ITKNvu5mKjlgrObEw=; b=XPsSdGMcjqkQBMWuEi+jOvHFWk+RAlmkWPJsC2hTo9UvlXd9d+A6dFyVxaa9ls1mQ+ U6R9r+50zYOt1/F3HXjl5TzwGMTJihZkYMnV/TfxUL67F/qW+L4IxfkTrabLI/8GtAJg bQ73fWsC06abartjPp7jTwjzOeDlDkQBkhhirISjyC4Wq7lU3JweM/KYJNfh5y3GAHay 9fDSeT99tEhMqgqHL87ABXFlCUKs8YupeAJVSwGoqLPNeS+DeZEq7GRv4h4jbgVPCxwD UIHI68riTH4PbF7o/efE/seiFf9zJqXIkqakMYo0Y0uMhGlzUDT5htrQVdgV80e0uMVf lm1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hMCs2bBg9MIWK7fO1XimBPC5t4ITKNvu5mKjlgrObEw=; b=PtKVQCXcy2dObeaixYI44PcIE0/zp+pLPjtRUQJm5PxwmwvV6kzNzbtt2FyHwziXbv se0v0FIGvQZSrUPlgDCCM7GbDqFg78/kLwvWRZ//+8epmC9z93V722TtWAoNaaWzqJTy p95tryAf7ugC70xe7B9AVnE8wHUFLCw2yC/Fc3oW6azsxBqfy6nSAZKNaaVU90E5M+z3 LOdSguai4xzCt1oPMLWyX+60sU8eR8Ig39Ubp9kSE2mBPErRNHrv9rT4xWNh2F7b4CsW a9Zkh9ZiS6DL5hUEXV4D7Bfpu7c0EW89uPQFGt1a/z3By93NgnewYI8JbehoiW3IvZIX sYFg== X-Gm-Message-State: APzg51ANN/dgDHv66O6ewkAsPs/2p/d7h66sAz//uagbWnCGp7bvJMrJ dr4r2PshIFb0Rs8pGBRlEgC+FIhhcHQ= X-Google-Smtp-Source: ANB0VdYun9LajMisyfg1ZnA8pH7DKVcJ/HXUhECKJv0pY8HfyXObDPrifeSoGQCWqxnDyz+l1O/Olg== X-Received: by 2002:a1c:e382:: with SMTP id a124-v6mr20481327wmh.121.1537373050753; Wed, 19 Sep 2018 09:04:10 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id x24-v6sm34983671wrd.13.2018.09.19.09.04.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 09:04:10 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 19 Sep 2018 18:03:36 +0200 Message-Id: <46632b39b54a833efc150df1e0a107648ec0bb34.1537372746.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 06/13] ethdev: register ether layer as a class X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Implement the operators of an rte_class for the ethdev abstraction layer. Register the layer as such. Signed-off-by: Gaetan Rivet Acked-by: Andrew Rybchenko --- lib/librte_ethdev/Makefile | 3 +- lib/librte_ethdev/meson.build | 1 + lib/librte_ethdev/rte_class_eth.c | 79 +++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 lib/librte_ethdev/rte_class_eth.c diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile index 4b0eeaac7..d720dd207 100644 --- a/lib/librte_ethdev/Makefile +++ b/lib/librte_ethdev/Makefile @@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring -LDLIBS += -lrte_mbuf +LDLIBS += -lrte_mbuf -lrte_kvargs EXPORT_MAP := rte_ethdev_version.map @@ -20,6 +20,7 @@ LIBABIVER := 10 SRCS-y += ethdev_private.c SRCS-y += rte_ethdev.c +SRCS-y += rte_class_eth.c SRCS-y += rte_flow.c SRCS-y += rte_tm.c SRCS-y += rte_mtr.c diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build index 7798217d0..172e302f0 100644 --- a/lib/librte_ethdev/meson.build +++ b/lib/librte_ethdev/meson.build @@ -6,6 +6,7 @@ version = 10 allow_experimental_apis = true sources = files('ethdev_private.c', 'ethdev_profile.c', + 'rte_class_eth.c', 'rte_ethdev.c', 'rte_flow.c', 'rte_mtr.c', diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c new file mode 100644 index 000000000..b6557db97 --- /dev/null +++ b/lib/librte_ethdev/rte_class_eth.c @@ -0,0 +1,79 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Gaëtan Rivet + */ + +#include + +#include +#include +#include +#include +#include + +#include "rte_ethdev.h" +#include "rte_ethdev_core.h" +#include "ethdev_private.h" + +enum eth_params { + RTE_ETH_PARAMS_MAX, +}; + +static const char * const eth_params_keys[] = { + [RTE_ETH_PARAMS_MAX] = NULL, +}; + +struct eth_dev_match_arg { + struct rte_device *device; + struct rte_kvargs *kvlist; +}; + +#define eth_dev_match_arg(d, k) \ + (&(const struct eth_dev_match_arg) { \ + .device = (d), \ + .kvlist = (k), \ + }) + +static int +eth_dev_match(const struct rte_eth_dev *edev, + const void *_arg) +{ + const struct eth_dev_match_arg *arg = _arg; + const struct rte_kvargs *kvlist = arg->kvlist; + + if (edev->state == RTE_ETH_DEV_UNUSED) + return -1; + if (edev->device != arg->device) + return -1; + if (kvlist == NULL) + /* Empty string matches everything. */ + return 0; + return 0; +} + +static void * +eth_dev_iterate(const void *start, + const char *str, + const struct rte_dev_iterator *it) +{ + struct rte_kvargs *kvargs = NULL; + struct rte_eth_dev *edev = NULL; + + if (str != NULL) { + kvargs = rte_kvargs_parse(str, eth_params_keys); + if (kvargs == NULL) { + RTE_LOG(ERR, EAL, "cannot parse argument list\n"); + rte_errno = EINVAL; + return NULL; + } + } + edev = eth_find_device(start, eth_dev_match, + eth_dev_match_arg(it->device, kvargs)); + rte_kvargs_free(kvargs); + return edev; +} + +struct rte_class rte_class_eth = { + .dev_iterate = eth_dev_iterate, +}; + +RTE_REGISTER_CLASS(eth, rte_class_eth);