From patchwork Thu Mar 15 07:52:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 36113 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 DE383A495; Thu, 15 Mar 2018 08:52:24 +0100 (CET) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by dpdk.org (Postfix) with ESMTP id 1A5FBA48C for ; Thu, 15 Mar 2018 08:52:22 +0100 (CET) Received: by mail-lf0-f66.google.com with SMTP id e5-v6so4653448lfb.7 for ; Thu, 15 Mar 2018 00:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mZ5okINALSs6G3RbMuvqhy8hsXt9UOw+1R1GW+CQmFM=; b=MhMitRbSTvskdq16EHFEcUmc4FmNmDWmc484GVWu5KKdmUnOao157HM7+UPg1u7WaQ sLNSg2qGmg1I3pcrtHYVvOw/dD1cZsTVeei7XkSyaiihic0joU6BkV3L6MOWXMumkmcn NGy1VxNzqMqJBVZcpUxa10TFe4wUpJD9YVu7EgGyetXKoxrZbuqRRWKBlRpI3+eJ8j0r c5tJ4yfDwr2WG5XVHuImF2hnZmtrOzGOy6tT5VGVzEvYwyB4+rw7wjFeHUIDKWlsrOtX lnYf+Y6Bf6Kkzt+nSCusfPM1Cat7jBQXr6cae4eFSNyfw+0W0CrXW5+aa39PNhQpGYsG 89Hw== 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=mZ5okINALSs6G3RbMuvqhy8hsXt9UOw+1R1GW+CQmFM=; b=hdCF3tqfVqMZBlB+PVPXBpZuU7zpyAdY4iTxwd5z95pELd2fx8kiRyhDvi/ZZHG0Jl rQA+bapBKiKWpre3JMWgfJmfr1q08nTqgeas3uNrPekGREInSRzwKR6lql9edLE4vL1c lBf0eGQ9oHMHQJnZKgVkNhiqX8ligzcObjzkLq6EhRcyVt1Lq80C0dnYmccxT4xawLWk AsoL423x7dCVnEbjWPbIfzHAPPmy6CVc0NHsQlY3DHyTe+mx34ywC3duN77d30ht1jmH qjOAZfsLThNFIXH5lSUhUZROiARLP63C6P/j+MRpvYhf1dPHC5ZEv4E1MWvfrg53H+Yo Exlw== X-Gm-Message-State: AElRT7GMnIBPjg91hvMhuJ3Oiv2knEDSR2ZZgV/jRcpy7xUjYDovim4f /7XxP1xKZ9KWKBJrOb4NvTMN3/t8T/I= X-Google-Smtp-Source: AG47ELuJWcI4Ux6OGdboYjTjzo7poBPSeQ/5+Qymw5Yu/G4b0YA+HKv3C9khg1Ag2N88IVWxzH3IpA== X-Received: by 2002:a19:1b81:: with SMTP id b123-v6mr3475239lfb.64.1521100341464; Thu, 15 Mar 2018 00:52:21 -0700 (PDT) Received: from sh.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id d14sm972925ljd.31.2018.03.15.00.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Mar 2018 00:52:20 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: mw@semihalf.com, dima@marvell.com, nsamsono@marvell.com, jck@semihalf.com, jianbo.liu@arm.com, Tomasz Duszynski Date: Thu, 15 Mar 2018 08:52:02 +0100 Message-Id: <1521100324-26558-7-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521100324-26558-1-git-send-email-tdu@semihalf.com> References: <1520844132-29969-1-git-send-email-tdu@semihalf.com> <1521100324-26558-1-git-send-email-tdu@semihalf.com> Subject: [dpdk-dev] [PATCH v3 6/8] net/mrvl: add extended statistics 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" Add extended statistics implementation. Signed-off-by: Natalie Samsonov Signed-off-by: Tomasz Duszynski --- doc/guides/nics/features/mrvl.ini | 1 + doc/guides/nics/mrvl.rst | 1 + drivers/net/mrvl/mrvl_ethdev.c | 115 +++++++++++++++++++++++++++++++++++++- 3 files changed, 116 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/mrvl.ini b/doc/guides/nics/features/mrvl.ini index 00d9621..120fd4d 100644 --- a/doc/guides/nics/features/mrvl.ini +++ b/doc/guides/nics/features/mrvl.ini @@ -19,5 +19,6 @@ L3 checksum offload = Y L4 checksum offload = Y Packet type parsing = Y Basic stats = Y +Extended stats = Y ARMv8 = Y Usage doc = Y diff --git a/doc/guides/nics/mrvl.rst b/doc/guides/nics/mrvl.rst index 9230d5e..7678265 100644 --- a/doc/guides/nics/mrvl.rst +++ b/doc/guides/nics/mrvl.rst @@ -70,6 +70,7 @@ Features of the MRVL PMD are: - L4 checksum offload - Packet type parsing - Basic stats +- Extended stats - QoS diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.c index 34b9ef7..880bd0b 100644 --- a/drivers/net/mrvl/mrvl_ethdev.c +++ b/drivers/net/mrvl/mrvl_ethdev.c @@ -145,6 +145,32 @@ static inline void mrvl_free_sent_buffers(struct pp2_ppio *ppio, struct pp2_hif *hif, unsigned int core_id, struct mrvl_shadow_txq *sq, int qid, int force); +#define MRVL_XSTATS_TBL_ENTRY(name) { \ + #name, offsetof(struct pp2_ppio_statistics, name), \ + sizeof(((struct pp2_ppio_statistics *)0)->name) \ +} + +/* Table with xstats data */ +static struct { + const char *name; + unsigned int offset; + unsigned int size; +} mrvl_xstats_tbl[] = { + MRVL_XSTATS_TBL_ENTRY(rx_bytes), + MRVL_XSTATS_TBL_ENTRY(rx_packets), + MRVL_XSTATS_TBL_ENTRY(rx_unicast_packets), + MRVL_XSTATS_TBL_ENTRY(rx_errors), + MRVL_XSTATS_TBL_ENTRY(rx_fullq_dropped), + MRVL_XSTATS_TBL_ENTRY(rx_bm_dropped), + MRVL_XSTATS_TBL_ENTRY(rx_early_dropped), + MRVL_XSTATS_TBL_ENTRY(rx_fifo_dropped), + MRVL_XSTATS_TBL_ENTRY(rx_cls_dropped), + MRVL_XSTATS_TBL_ENTRY(tx_bytes), + MRVL_XSTATS_TBL_ENTRY(tx_packets), + MRVL_XSTATS_TBL_ENTRY(tx_unicast_packets), + MRVL_XSTATS_TBL_ENTRY(tx_errors) +}; + static inline int mrvl_get_bpool_size(int pp2_id, int pool_id) { @@ -1110,6 +1136,90 @@ mrvl_stats_reset(struct rte_eth_dev *dev) } /** + * DPDK callback to get extended statistics. + * + * @param dev + * Pointer to Ethernet device structure. + * @param stats + * Pointer to xstats table. + * @param n + * Number of entries in xstats table. + * @return + * Negative value on error, number of read xstats otherwise. + */ +static int +mrvl_xstats_get(struct rte_eth_dev *dev, + struct rte_eth_xstat *stats, unsigned int n) +{ + struct mrvl_priv *priv = dev->data->dev_private; + struct pp2_ppio_statistics ppio_stats; + unsigned int i; + + if (!stats) + return 0; + + pp2_ppio_get_statistics(priv->ppio, &ppio_stats, 0); + for (i = 0; i < n && i < RTE_DIM(mrvl_xstats_tbl); i++) { + uint64_t val; + + if (mrvl_xstats_tbl[i].size == sizeof(uint32_t)) + val = *(uint32_t *)((uint8_t *)&ppio_stats + + mrvl_xstats_tbl[i].offset); + else if (mrvl_xstats_tbl[i].size == sizeof(uint64_t)) + val = *(uint64_t *)((uint8_t *)&ppio_stats + + mrvl_xstats_tbl[i].offset); + else + return -EINVAL; + + stats[i].id = i; + stats[i].value = val; + } + + return n; +} + +/** + * DPDK callback to reset extended statistics. + * + * @param dev + * Pointer to Ethernet device structure. + */ +static void +mrvl_xstats_reset(struct rte_eth_dev *dev) +{ + mrvl_stats_reset(dev); +} + +/** + * DPDK callback to get extended statistics names. + * + * @param dev (unused) + * Pointer to Ethernet device structure. + * @param xstats_names + * Pointer to xstats names table. + * @param size + * Size of the xstats names table. + * @return + * Number of read names. + */ +static int +mrvl_xstats_get_names(struct rte_eth_dev *dev __rte_unused, + struct rte_eth_xstat_name *xstats_names, + unsigned int size) +{ + unsigned int i; + + if (!xstats_names) + return RTE_DIM(mrvl_xstats_tbl); + + for (i = 0; i < size && i < RTE_DIM(mrvl_xstats_tbl); i++) + snprintf(xstats_names[i].name, RTE_ETH_XSTATS_NAME_SIZE, "%s", + mrvl_xstats_tbl[i].name); + + return size; +} + +/** * DPDK callback to get information about the device. * * @param dev @@ -1692,6 +1802,9 @@ static const struct eth_dev_ops mrvl_ops = { .mtu_set = mrvl_mtu_set, .stats_get = mrvl_stats_get, .stats_reset = mrvl_stats_reset, + .xstats_get = mrvl_xstats_get, + .xstats_reset = mrvl_xstats_reset, + .xstats_get_names = mrvl_xstats_get_names, .dev_infos_get = mrvl_dev_infos_get, .dev_supported_ptypes_get = mrvl_dev_supported_ptypes_get, .rxq_info_get = mrvl_rxq_info_get, @@ -1703,7 +1816,7 @@ static const struct eth_dev_ops mrvl_ops = { .tx_queue_release = mrvl_tx_queue_release, .rss_hash_update = mrvl_rss_hash_update, .rss_hash_conf_get = mrvl_rss_hash_conf_get, - .filter_ctrl = mrvl_eth_filter_ctrl + .filter_ctrl = mrvl_eth_filter_ctrl, }; /**