From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 25CB11C254 for ; Fri, 13 Apr 2018 15:23:23 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id l49so8283349wrl.4 for ; Fri, 13 Apr 2018 06:23: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:in-reply-to:references:content-transfer-encoding; bh=0yrOYTyEYRmKpjxbUW9Sta2CECu8ZMnppErt3D9qCtE=; b=J/VrcPaAbEBaYDIeUsC6Id9/81mNlFOw3yQfThsvi/qnvUZxXwzysgPZfhOxtmVkvS Fpf5Z/oQ6XgRk4S3wEUJzoupbbpBovt/CMr2+yUcsnIxJAMDWG3F//ib5Jc6RGvAeDtW cDwq12iGbP8+pVhfMc6I6S0VU5eD7PBBgSihxhrIeRJIQq8QeVdHPb/pf94LHyS3PaxY ga5miPmrupIAIo82twVI/kFIfqgXd0hAX+FcA4dgiGBCBPEKKpsMDCLcTTPFwp6r+Xwz RkLACY59ZhIKkJxPkaGD3Lb1+vJo9Qg+IGrroBxUE8IaWW7H/Q8VHrr4wVZReQpqtdfR 0+oQ== 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:in-reply-to:references :content-transfer-encoding; bh=0yrOYTyEYRmKpjxbUW9Sta2CECu8ZMnppErt3D9qCtE=; b=bl78ko/pMOmLY2/WT1YQmGCSUN9XyNbIZDeeyVf9UBSypHlPZPNlONJIWSWdtqQRGk Frby7BYY0PyL/sIQcYLI2BlmQDoUb6SZI4ArYBTtU9hGBjacW+emveddC7ThXqkQu7mc IolGDvk4hPVzfPB6+SoUsA6RU+yVxGkfEfqsIai99lD6ykc0gp0qx7jjRs8qCl1lCjop tKhrBba4HHg3RMx/pq0pQF/a0EzyLT70KA2exxJ9jfRUqkofV8I/SoE82X+t56Qn6HMh FlGZv0BFuyET7TaxYmhtEK1uQ/HZKVnmls+eFoDLmj6x2RAFRtYDNdyPKgJ3epzKVw+O U4kA== X-Gm-Message-State: ALQs6tBSjeV2xobyq2+INrLtmWS9HF0xCGy5jxk4MCLM90OY3wYCXRZh hO1ywGVq4+0pHmEknKlzJLS3nxX0 X-Google-Smtp-Source: AIpwx49KntTjlhFbgzrrYiH5SXHMU6y3jNEGNnXvUsZDGKzMK1myTbqudi9nG/iNKhgt772wPtn34Q== X-Received: by 10.223.146.196 with SMTP id 62mr386266wrn.159.1523625802462; Fri, 13 Apr 2018 06:23: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 r200sm2377244wmb.9.2018.04.13.06.23.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 06:23:21 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Fri, 13 Apr 2018 15:22:35 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v6 20/22] 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: , X-List-Received-Date: Fri, 13 Apr 2018 13:23:23 -0000 Signed-off-by: Gaetan Rivet --- lib/Makefile | 2 +- lib/librte_ether/Makefile | 3 +- lib/librte_ether/rte_class_eth.c | 79 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 lib/librte_ether/rte_class_eth.c diff --git a/lib/Makefile b/lib/Makefile index 4206485d3..47513f03f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -23,7 +23,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DEPDIRS-librte_cmdline := librte_eal DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether DEPDIRS-librte_ether := librte_net librte_eal librte_mempool librte_ring -DEPDIRS-librte_ether += librte_mbuf +DEPDIRS-librte_ether += librte_mbuf librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile index 2fa133fbc..d4c3a8d06 100644 --- a/lib/librte_ether/Makefile +++ b/lib/librte_ether/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_ether/rte_class_eth.c b/lib/librte_ether/rte_class_eth.c new file mode 100644 index 000000000..32c736d32 --- /dev/null +++ b/lib/librte_ether/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); -- 2.11.0