From patchwork Fri Jan 22 19:18:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liron Himi X-Patchwork-Id: 87119 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 89A04A0A0A; Fri, 22 Jan 2021 20:20:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C15A51410D0; Fri, 22 Jan 2021 20:20:08 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 35EDA1410C3 for ; Fri, 22 Jan 2021 20:20:05 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 10MJB74B008693 for ; Fri, 22 Jan 2021 11:20:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=xq27euLPdggCwEUfwh8fjEgvEJm4zO1mbmpyddyRIYc=; b=jlBO1vloK9BFqFZDcZD9LojZsBTcqjSznCKjkPE9umBdnI94QH375xFju6OLUlyOQ+vb rVRQTznj+M3eNH8XuYkFY0FzoXdiKpUEHTK2gbwDHLYitG7YNYE/shOfZMrdeBAP5WDm wEKFlgWzIHjKomXjcJib+YYqTGTGcpjESjLxTn8V4Q6EHTttpGdLS3ZNoutLd580qR9x O15z8ztt9FG73P4LN3O+GMgI0P+Eu7FC/HAQ60UdfHTgyEdDRmDJrlX5gHJul6eoK15z UTv3nvyiOQXBfV1SZ44eTVH4sBEe1RBpgqOn1UkZ8QRDNjjYxDsmVy8CwIvWSBFkmeOp eg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 3668p32v8t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 22 Jan 2021 11:20:04 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 22 Jan 2021 11:20:02 -0800 Received: from pt-lxl0023.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 22 Jan 2021 11:20:01 -0800 From: To: CC: , Yuri Chipchev , Liron Himi Date: Fri, 22 Jan 2021 21:18:56 +0200 Message-ID: <20210122191925.24308-9-lironh@marvell.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210122191925.24308-1-lironh@marvell.com> References: <20201202101212.4717-1-lironh@marvell.com> <20210122191925.24308-1-lironh@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2021-01-22_14:2021-01-22, 2021-01-22 signatures=0 Subject: [dpdk-dev] [PATCH v2 08/37] net/mvpp2: extend xstats support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: Yuri Chipchev Add xstats_by_id callbacks Signed-off-by: Yuri Chipchev Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 98 ++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 3 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index e4ec343d5..ba1882266 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -173,6 +173,8 @@ static struct { MRVL_XSTATS_TBL_ENTRY(tx_errors) }; +#define MRVL_NUM_XSTATS RTE_DIM(mrvl_xstats_tbl) + static inline void mrvl_fill_shadowq(struct mrvl_shadow_txq *sq, struct rte_mbuf *buf) { @@ -1376,7 +1378,7 @@ mrvl_xstats_get(struct rte_eth_dev *dev, return 0; pp2_ppio_get_statistics(priv->ppio, &ppio_stats, 0); - for (i = 0; i < n && i < RTE_DIM(mrvl_xstats_tbl); i++) { + for (i = 0; i < n && i < MRVL_NUM_XSTATS; i++) { uint64_t val; if (mrvl_xstats_tbl[i].size == sizeof(uint32_t)) @@ -1430,9 +1432,9 @@ mrvl_xstats_get_names(struct rte_eth_dev *dev __rte_unused, unsigned int i; if (!xstats_names) - return RTE_DIM(mrvl_xstats_tbl); + return MRVL_NUM_XSTATS; - for (i = 0; i < size && i < RTE_DIM(mrvl_xstats_tbl); i++) + for (i = 0; i < size && i < MRVL_NUM_XSTATS; i++) strlcpy(xstats_names[i].name, mrvl_xstats_tbl[i].name, RTE_ETH_XSTATS_NAME_SIZE); @@ -2015,6 +2017,94 @@ mrvl_eth_filter_ctrl(struct rte_eth_dev *dev __rte_unused, } } +/** + * DPDK callback to get xstats by id. + * + * @param dev + * Pointer to the device structure. + * @param ids + * Pointer to the ids table. + * @param values + * Pointer to the values table. + * @param n + * Values table size. + * @returns + * Number of read values, negative value otherwise. + */ +static int +mrvl_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, + uint64_t *values, unsigned int n) +{ + struct rte_eth_xstat xstats[MRVL_NUM_XSTATS]; + uint16_t i; + + if (n < MRVL_NUM_XSTATS && ids == NULL) + return MRVL_NUM_XSTATS; + + if (n > MRVL_NUM_XSTATS) + return -EINVAL; + + if (values == NULL) + return -ENOMEM; + + mrvl_xstats_get(dev, xstats, n); + + for (i = 0; i < MRVL_NUM_XSTATS; i++) { + if (ids[i] >= MRVL_NUM_XSTATS) { + MRVL_LOG(ERR, "id value is not valid\n"); + return -EINVAL; + } + values[i] = xstats[ids[i]].value; + } + + return n; +} + +/** + * DPDK callback to get xstats names by ids. + * + * @param dev + * Pointer to the device structure. + * @param xstats_names + * Pointer to table with xstats names. + * @param ids + * Pointer to table with ids. + * @param size + * Xstats names table size. + * @returns + * Number of names read, negative value otherwise. + */ +static int +mrvl_xstats_get_names_by_id(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, unsigned int size) +{ + struct rte_eth_xstat_name names[MRVL_NUM_XSTATS]; + uint16_t i; + + if (size < MRVL_NUM_XSTATS && ids == NULL) + return MRVL_NUM_XSTATS; + + if (size > MRVL_NUM_XSTATS) + return -EINVAL; + + if (xstats_names == NULL) + return -ENOMEM; + + mrvl_xstats_get_names(dev, names, size); + + for (i = 0; i < MRVL_NUM_XSTATS; i++) { + if (ids[i] >= MRVL_NUM_XSTATS) { + MRVL_LOG(ERR, "id value is not valid"); + return -EINVAL; + } + strncpy(xstats_names[i].name, names[ids[i]].name, + sizeof(xstats_names[i].name)); + } + + return size; +} + /** * DPDK callback to get rte_mtr callbacks. * @@ -2090,6 +2180,8 @@ static const struct eth_dev_ops mrvl_ops = { .rss_hash_update = mrvl_rss_hash_update, .rss_hash_conf_get = mrvl_rss_hash_conf_get, .filter_ctrl = mrvl_eth_filter_ctrl, + .xstats_get_by_id = mrvl_xstats_get_by_id, + .xstats_get_names_by_id = mrvl_xstats_get_names_by_id, .mtr_ops_get = mrvl_mtr_ops_get, .tm_ops_get = mrvl_tm_ops_get, };