From patchwork Thu Jul 5 11:48:27 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: 42355 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 40C8F1BF9F; Thu, 5 Jul 2018 13:49:46 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 7C60F1BEB9 for ; Thu, 5 Jul 2018 13:49:23 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id v16-v6so10633759wmv.5 for ; Thu, 05 Jul 2018 04:49:23 -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=4GVoPGxPVbEi4xXKoRREOyrMdd30uHc6auy6dlwC1CU=; b=iooUXQgsYVZi/SE3s04JdaooJISUMX5ptGk6Yk4Z5EAKaR1sB4vihg/jAlxRtQEJot mt46T+3Xr0lyo0yywiT246TC7q0Nh40393hjU/qfFbwQ6H1WPWFvUaPxLaa+fWm/cIA+ hHlWcH1vx1/0xKrN4RwxBLpZQKDzyRBgyL5Iz1RQXKDHDhIR9Ym4fRZGSyofh0zftHPU sc48tbAAmFovVWxKwFbUEUsPl9/0AqbBRODrYv5sQTNYfZ00hfLONMhmmQaZUMkZGgMD Dx+hmlCu2AYbT2Ies8ui/KacvZb/flyeepxfDnHaT4F/LOdb5C/MSLtUazhunsz0HAn7 qxTA== 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=4GVoPGxPVbEi4xXKoRREOyrMdd30uHc6auy6dlwC1CU=; b=sKaoEv4iMTuP+aogj/eGlnV94usPj0r6SxpT3l8c7YoQSmfUc4IfsNHhLsLcKHkWqo PwbdhcYUeYug1f/vl3yxcN37QUS7loQflLc+7mRDiuWc/liVfe2m6imRn+Wp+qmld3y1 40N042EAkwVMPw1+GJ/eAmBRntqZ6ciQQfnKQRLwjHh9f7xTsVN3BejcsHfcfP7ma+h1 jmBJprCx2ooH/Btn17QaFy1ZjtkWpP006Ou+jNsrPtmNLtzIK1yx1twIHOvFxHVw61m5 XeSn0L2dK1MxmyVRLOil7zNjgbLC2XopBqNRqP7AVfaOQC/a5dC/hqoiNsHbCcKdkWdo WukA== X-Gm-Message-State: APt69E3GOQ9omn2FAS/UoiyQkIoGLsabxIlvbnniYKIWiB9ogVGDQgWA rWvoGE+tEM8/XHycZJw0HhWrcXMb X-Google-Smtp-Source: AAOMgpfsCiiMZaq+G8sX4s93Ypzcju2eSplKZwRvrlCBqHLRbIZkO9uZH7CxI3seckIt4R+dRbl/6g== X-Received: by 2002:adf:c5d2:: with SMTP id v18-v6mr4095522wrg.151.1530791362766; Thu, 05 Jul 2018 04:49:22 -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 o42-v6sm15809183wrc.50.2018.07.05.04.49.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 04:49:21 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 5 Jul 2018 13:48:27 +0200 Message-Id: <083825ccbcede0aadc2f8fd7ca5cfa1c9f12ed5e.1530791217.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 v10 20/27] 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" Signed-off-by: Gaetan Rivet --- 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 2fa133fbc..d4c3a8d06 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 := 9 SRCS-y += eth_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 a0c001847..f9538770b 100644 --- a/lib/librte_ethdev/meson.build +++ b/lib/librte_ethdev/meson.build @@ -6,6 +6,7 @@ version = 9 allow_experimental_apis = true sources = files('eth_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..32c736d32 --- /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 "eth_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);