From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 838A9A2EFC for ; Thu, 19 Sep 2019 14:57:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 04CC91EFE2; Thu, 19 Sep 2019 14:56:58 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id E64541EFDC for ; Thu, 19 Sep 2019 14:56:55 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id o18so2943616wrv.13 for ; Thu, 19 Sep 2019 05:56:55 -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; bh=HL8FvmCjEWcSDk0U2/yR+tfpByUBsRFIOxKMJMhd9ig=; b=N1ZP08JNyyG4CNFPJbBZwUqjUhycQ076aj8m+S1bc0tGWBvg7zYc2uh/S8tdZGhxeU MvEXf/7KxfY8it35kDNVw9Hnmgt6FP2PEAzEAyP7MUMEJFeyqo867ozFNgvEbYBy4p4g +a+lNUPV52u1CS+HMWaVMgYxObhjX90JhpFQ5OkALWesk/soUq3CDTKpFuh2TBzOgwhd MWdslGLSupNT7dFa5sZqbDb7WoIswpxKH5WICTaVAkQh51HOzAu+p2e/WbIFY65A3l4v E2Pu4pqL2f7ghxqJBvbeq/425BOd+Pn3D0GvkKJK1M9dIFvhrZRSxCgOlzGVngE7w5Ly tCPw== 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; bh=HL8FvmCjEWcSDk0U2/yR+tfpByUBsRFIOxKMJMhd9ig=; b=KUFxqBQYtDrjlfTXfKYMbdeXh8o5yW9bE3kRIv8Nd1VobwKeFPREhSucJLsqj9RBdw x+C1gVFzOleV6V22Xp7ZPSTgbBJ4EX0/CTNBz0WWR5TPZoBoQv/fYBoNkFxsSDABi0Y7 /YilYW9uXUF0RPGp08Qo0jPeBbm5UF47LhjSmmJZcE/miYBqth/IZuarY6sOtQFRy43y dg8RQBauxWlnsX87AFdy3DQcUjrbX/CJ5c6AeY9BDojFaeZAufM9Oc7S5OiLfXND9x8Y ESnybOsiAF5a51q3jitcYe5yOM4roeCYxkinjOjB9SVyTHs5q06QHkbpVNYourGNhokF FnOw== X-Gm-Message-State: APjAAAUFkHnBRCvM4G7Rv0lhvjWcfGPvh8g2+RQTK6p/YiAFH5j80QYS myLrXCC/yHUpdY56KDQ1KiitOxzpao3wug== X-Google-Smtp-Source: APXvYqwOs0Ex+38vBH/3mrkpyqAX6oaM3TAD8k+jvLnaLC+eBSm4+RKabq7u8OICvyaUqqoF4++jEw== X-Received: by 2002:a5d:4241:: with SMTP id s1mr6967828wrr.101.1568897814945; Thu, 19 Sep 2019 05:56:54 -0700 (PDT) Received: from localhost.localdomain (lmontsouris-657-1-167-187.w82-127.abo.wanadoo.fr. [82.127.205.187]) by smtp.gmail.com with ESMTPSA id f186sm8030519wmg.21.2019.09.19.05.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 05:56:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 19 Sep 2019 14:56:49 +0200 Message-Id: <20190919125650.27262-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190919125650.27262-1-stephen@networkplumber.org> References: <20190811160607.16441-1-stephen@networkplumber.org> <20190919125650.27262-1-stephen@networkplumber.org> 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" 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 Acked-by: Gaetan Rivet --- lib/librte_ethdev/rte_ethdev.c | 17 +++---- lib/librte_ethdev/rte_ethdev_driver.h | 65 ++++++++++++++++++++++++ lib/librte_ethdev/rte_ethdev_version.map | 24 +++++++++ 3 files changed, 97 insertions(+), 9 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 17d183e1f0ec..88e3065d06fd 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_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h index 936ff8c98651..489889a72203 100644 --- a/lib/librte_ethdev/rte_ethdev_driver.h +++ b/lib/librte_ethdev/rte_ethdev_driver.h @@ -208,6 +208,71 @@ rte_eth_linkstatus_get(const struct rte_eth_dev *dev, #endif } +/** + * @internal + * Get basic stats part of xstats for an ethernet device. + * + * @param dev + * Pointer to struct rte_eth_dev. + */ +__rte_experimental +int +rte_eth_basic_stats_count(struct rte_eth_dev *dev); + +/** + * @internal + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Retrieve the names for the basic part of extended statistics. + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param xstats_names + * An rte_eth_xstat_name array of at least *size* elements to + * be filled. If set to NULL, the function returns the required number + * of elements. + * @return + * - A positive value lower or equal to size: success. The return value + * is the number of entries filled in the stats table. + * - A positive value higher than size: error, the given statistics table + * is too small. The return value corresponds to the size that should + * be given to succeed. The entries in the table are not valid and + * shall not be used by the caller. + * - A negative value on error (invalid port id). + */ +__rte_experimental +int +rte_eth_basic_stats_get_names(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names); + +/** + * @internal + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Retrieve the basic part of the extended statistics. + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param xstats + * A pointer to a table of structure of type *rte_eth_xstat* + * to be filled with device statistics ids and values. + * This parameter can be set to NULL if n is 0. + * @param n + * The size of the xstats array (number of elements). + * @return + * - A positive value lower or equal to n: success. The return value + * is the number of entries filled in the stats table. + * - A positive value higher than n: error, the given statistics table + * is too small. The return value corresponds to the size that should + * be given to succeed. The entries in the table are not valid and + * shall not be used by the caller. + * - A negative value on error (invalid port id). + */ +__rte_experimental +int +rte_eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats); + + /** * @warning * @b EXPERIMENTAL: this API may change without prior notice. diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map index 6df42a47b89d..f2198b0367d1 100644 --- a/lib/librte_ethdev/rte_ethdev_version.map +++ b/lib/librte_ethdev/rte_ethdev_version.map @@ -240,6 +240,25 @@ EXPERIMENTAL { global: # added in 17.11 + rte_eth_devargs_parse; + rte_eth_dev_create; + rte_eth_dev_destroy; + rte_eth_dev_get_module_eeprom; + rte_eth_dev_get_module_info; + rte_eth_dev_is_removed; + rte_eth_dev_owner_delete; + rte_eth_dev_owner_get; + rte_eth_dev_owner_new; + rte_eth_dev_owner_set; + rte_eth_dev_owner_unset; + rte_eth_dev_rx_intr_ctl_q_get_fd; + rte_eth_find_next_of; + rte_eth_find_next_sibling; + rte_eth_read_clock; + rte_eth_switch_domain_alloc; + rte_eth_switch_domain_free; + rte_flow_conv; + rte_flow_expand_rss; rte_mtr_capabilities_get; rte_mtr_create; rte_mtr_destroy; @@ -283,4 +302,9 @@ EXPERIMENTAL { # added in 19.08 rte_eth_read_clock; + + # added in 19.11 + rte_eth_basic_stats_count; + rte_eth_basic_stats_get; + rte_eth_basic_stats_get_names; }; -- 2.17.1