From patchwork Wed Jun 26 22:21:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 55427 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 4A0392BE6; Thu, 27 Jun 2019 00:21:48 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 5284C2BE3 for ; Thu, 27 Jun 2019 00:21:46 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id ay6so96700plb.9 for ; Wed, 26 Jun 2019 15:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UKaUOWgx7mp3QIQf6OwVRcXGZcyEmm9yJnnVHE8bIW4=; b=i28WTpbDesA9y5TnOpFfjHMl4W07DXsZM7nhc2KTadQ+lyTrcO8unN6bPeEi+9xsLi 2Oz+MkK2iTEBvqF4ZBVxVzRutDhtcZmLDon3s/aV/z1vQ86H6EV1lPLpzM3fv4cx9ndp SWISMvODVXXnNbODGMuudwD2o7phQCOnLGIPoCjMpyluv8yjbmGAXaC+AYtgCnp3WzWd TXkMGVc1xWG6hMPCJwGSbdU7xwQ8gIZafyxGqOs76yZOg7i7gh0L1jTXRmLKrWkb/qsc q1Etp55dIohhQ0Nk4gTVUgcxUiFz2lkAsN/Hq58/7R/tiqiQ2HXOUtXcE7ozPcnZjfBW 5X5Q== 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=UKaUOWgx7mp3QIQf6OwVRcXGZcyEmm9yJnnVHE8bIW4=; b=aD0P7NDRMbFu9vY71mbQELPSlBgwYyZv/LHV4BWRGKf4GqvppK6SIE1/gcC41ac0dq /A3+qvehHbyGkCVR89vr7FfFDVTN5UDtF4fvIDnyi00i4oy6u4/zm6WSF1Yv4Hczylzc stDEOCKzC5rYgNbEjI/Cjp2Ncyrhff2T9LyNS8EC444YZmrmqlvw7HNKxHsSO+6ABmBP +wSHZAfOj4wlRshqhejAqG+ftcgYz3SDsmbeFC0YyJHx9hwXmPuNcA2Xb9aNg8S4dLQ4 liF2ivWyQfstBJy+i/UbJdl7wsfCtdrIs/10nu/0bS+Xl5c5z7zseQHkSjmt3pn2b5MQ tVZA== X-Gm-Message-State: APjAAAVKo4vQYenlGutSGOMOYKM0Pw5y8DF88lt3bPbiWBK/AaNbd8/l DbBKdzUyz/tQyuGkR/zVP+wTdg== X-Google-Smtp-Source: APXvYqx99I7Q2sP4I2ZjxwqjA2OgPKhOH1+k7venGKQWoWBIukY26u/I48quySWP9ohA9P88/4oGVA== X-Received: by 2002:a17:902:a414:: with SMTP id p20mr425630plq.187.1561587705299; Wed, 26 Jun 2019 15:21:45 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d5sm266114pfn.25.2019.06.26.15.21.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 26 Jun 2019 15:21:44 -0700 (PDT) From: Stephen Hemminger To: gaetan.rivet@6wind.com Cc: dev@dpdk.org, Stephen Hemminger Date: Wed, 26 Jun 2019 15:21:34 -0700 Message-Id: <20190626222135.11368-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626222135.11368-1-stephen@networkplumber.org> References: <20190626222135.11368-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] ethdev: expose basic xstats for driver use 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" From: Stephen Hemminger Avoid duplication by having generic basic xstats available for use by drivers. A later patch uses this for failsafe driver. Signed-off-by: Stephen Hemminger --- lib/librte_ethdev/rte_ethdev.c | 17 ++++++++--------- lib/librte_ethdev/rte_ethdev_core.h | 14 ++++++++++++++ lib/librte_ethdev/rte_ethdev_version.map | 3 +++ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 8ac301608b9c..a83e9727c144 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1996,8 +1996,8 @@ rte_eth_stats_reset(uint16_t port_id) return 0; } -static inline int -get_xstats_basic_count(struct rte_eth_dev *dev) +int +rte_eth_basic_stats_count(struct rte_eth_dev *dev) { uint16_t nb_rxqs, nb_txqs; int count; @@ -2034,7 +2034,7 @@ get_xstats_count(uint16_t port_id) count = 0; - count += get_xstats_basic_count(dev); + count += rte_eth_basic_stats_count(dev); return count; } @@ -2084,7 +2084,7 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name, } /* retrieve basic stats names */ -static int +int rte_eth_basic_stats_get_names(struct rte_eth_dev *dev, struct rte_eth_xstat_name *xstats_names) { @@ -2140,7 +2140,7 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - basic_count = get_xstats_basic_count(dev); + basic_count = rte_eth_basic_stats_count(dev); ret = get_xstats_count(port_id); if (ret < 0) return ret; @@ -2268,8 +2268,7 @@ rte_eth_xstats_get_names(uint16_t port_id, return cnt_used_entries; } - -static int +int rte_eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats) { struct rte_eth_dev *dev; @@ -2341,7 +2340,7 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids, expected_entries = (uint16_t)ret; struct rte_eth_xstat xstats[expected_entries]; dev = &rte_eth_devices[port_id]; - basic_count = get_xstats_basic_count(dev); + basic_count = rte_eth_basic_stats_count(dev); /* Return max number of stats if no ids given */ if (!ids) { @@ -2355,7 +2354,7 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids, return -EINVAL; if (ids && dev->dev_ops->xstats_get_by_id != NULL && size) { - unsigned int basic_count = get_xstats_basic_count(dev); + unsigned int basic_count = rte_eth_basic_stats_count(dev); uint64_t ids_copy[size]; for (i = 0; i < size; i++) { diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h index 2922d5b7cc95..91ce1880d1c6 100644 --- a/lib/librte_ethdev/rte_ethdev_core.h +++ b/lib/librte_ethdev/rte_ethdev_core.h @@ -517,6 +517,20 @@ struct eth_dev_ops { /**< Test if a port supports specific mempool ops */ }; +/** + * @internal + * Get basic stats for ethdev + */ +int __rte_experimental +rte_eth_basic_stats_count(struct rte_eth_dev *dev); + +int __rte_experimental +rte_eth_basic_stats_get_names(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names); + +int __rte_experimental +rte_eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats); + /** * @internal * Structure used to hold information about the callbacks to be called for a diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map index df9141825c3f..949a79800cbc 100644 --- a/lib/librte_ethdev/rte_ethdev_version.map +++ b/lib/librte_ethdev/rte_ethdev_version.map @@ -239,6 +239,9 @@ DPDK_19.05 { EXPERIMENTAL { global: + rte_eth_basic_stats_count; + rte_eth_basic_stats_get; + rte_eth_basic_stats_get_names; rte_eth_devargs_parse; rte_eth_dev_create; rte_eth_dev_destroy;