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 ABEF1A058A; Fri, 17 Apr 2020 16:50:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D8C811E92D; Fri, 17 Apr 2020 16:50:38 +0200 (CEST) Received: from mail-oo1-f67.google.com (mail-oo1-f67.google.com [209.85.161.67]) by dpdk.org (Postfix) with ESMTP id 747861E92D for ; Fri, 17 Apr 2020 16:50:37 +0200 (CEST) Received: by mail-oo1-f67.google.com with SMTP id d21so496912ook.10 for ; Fri, 17 Apr 2020 07:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vTuek9mAdPE57IH0gHkjDOID7wgWYQOfuJGc5LkK4bs=; b=A8Cgsk1Dafbl9Yxw/rI4EskWgP12gLmJrISH2wAXR+ZAMRemh57wK8VdYqG4TD0qG6 Ye435ogIMp/oEQU6K0/76F3+VqieepKtnznmVKygrEvl9JLayR2JeC2Zg1ctkVuCJIOE wB3LBIsfHSPEATVUv5DrRhSKYc+dtCCusdDb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vTuek9mAdPE57IH0gHkjDOID7wgWYQOfuJGc5LkK4bs=; b=rToMgFXuHa8xHI/9h+HLH87zfjTJMabDBHzAOaSN7X8XKtjIBh2sKGs6cJUYKStaZN uoZoFQgJoevQaZ8CFOYyWHNTf+zOwR7r+WL+rg4g1wimcmu0MuFMbEnGBFNMTvFkSZEQ Y6XIMMtk3xMazIjmBcgA/vBVDxpM0tLeboiH9yh7/Z/hwT2x0sptX5UkKQna464pFhoy AkOgb7unxta9XV4P0YbILgVKKQTCZXIUca1VsadNK4XTS+iqAgTIWZLQhQ3NmCDvJAxx y2tbRtC7Ia7uQ874sZrWCwS6bZAYaoluGWgyi7vYNavh397M9S3w515BWgvdo1RWNwpv AcKQ== X-Gm-Message-State: AGi0Pub46X/Z+aWXYxR0ltmFw+G9jbTLtKPsy94eqJ260Nhxlh5BmJMG f19EqkibL1QOG2Kk5O6ALMp65mCEtBB4fmmKZ0BDtY/SOLM= X-Google-Smtp-Source: APiQypJuU0fFA3+Wt2iN/pIkdNZOuv05/5z1+IRg+VtpZ51zIETMVimCQTdGSorTRp56Ya93455Ky4CQHuG44WkR8+c= X-Received: by 2002:a4a:d28b:: with SMTP id h11mr2783100oos.23.1587135036358; Fri, 17 Apr 2020 07:50:36 -0700 (PDT) MIME-Version: 1.0 References: <20200415225822.61874-1-ajit.khaparde@broadcom.com> In-Reply-To: <20200415225822.61874-1-ajit.khaparde@broadcom.com> From: Ajit Khaparde Date: Fri, 17 Apr 2020 07:50:19 -0700 Message-ID: To: dpdk-dev Cc: Ferruh Yigit , Somnath Kotur Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] net/bnxt: add PCI function stats to extended stats 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" On Wed, Apr 15, 2020 at 3:58 PM Ajit Khaparde wrote: > HWRM API allows drivers to query stats per PCI function. > These stats can provide some useful information in certain > circumstances. > > Signed-off-by: Ajit Khaparde > Reviewed-by: Somnath Kotur > Patch applied to dpdk-next-net-brcm. > --- > drivers/net/bnxt/bnxt_hwrm.c | 10 +++++++- > drivers/net/bnxt/bnxt_hwrm.h | 4 +++- > drivers/net/bnxt/bnxt_stats.c | 42 +++++++++++++++++++-------------- > drivers/net/bnxt/rte_pmd_bnxt.c | 3 ++- > 4 files changed, 38 insertions(+), 21 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c > index 0eaf9171c..d435f6570 100644 > --- a/drivers/net/bnxt/bnxt_hwrm.c > +++ b/drivers/net/bnxt/bnxt_hwrm.c > @@ -2261,7 +2261,8 @@ int bnxt_hwrm_func_qstats_tx_drop(struct bnxt *bp, > uint16_t fid, > } > > int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t fid, > - struct rte_eth_stats *stats) > + struct rte_eth_stats *stats, > + struct hwrm_func_qstats_output *func_qstats) > { > int rc = 0; > struct hwrm_func_qstats_input req = {.req_type = 0}; > @@ -2274,6 +2275,12 @@ int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t > fid, > rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), > BNXT_USE_CHIMP_MB); > > HWRM_CHECK_RESULT(); > + if (func_qstats) > + memcpy(func_qstats, resp, > + sizeof(struct hwrm_func_qstats_output)); > + > + if (!stats) > + goto exit; > > stats->ipackets = rte_le_to_cpu_64(resp->rx_ucast_pkts); > stats->ipackets += rte_le_to_cpu_64(resp->rx_mcast_pkts); > @@ -2293,6 +2300,7 @@ int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t > fid, > stats->ierrors = rte_le_to_cpu_64(resp->rx_drop_pkts); > stats->oerrors = rte_le_to_cpu_64(resp->tx_discard_pkts); > > +exit: > HWRM_UNLOCK(); > > return rc; > diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h > index 0079d8a97..1b7e35306 100644 > --- a/drivers/net/bnxt/bnxt_hwrm.h > +++ b/drivers/net/bnxt/bnxt_hwrm.h > @@ -12,6 +12,7 @@ > struct bnxt; > struct bnxt_filter_info; > struct bnxt_cp_ring_info; > +struct hwrm_func_qstats_output; > > #define HWRM_SEQ_ID_INVALID -1U > /* Convert Bit field location to value */ > @@ -112,7 +113,8 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp); > int bnxt_hwrm_func_reset(struct bnxt *bp); > int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags); > int bnxt_hwrm_func_qstats(struct bnxt *bp, uint16_t fid, > - struct rte_eth_stats *stats); > + struct rte_eth_stats *stats, > + struct hwrm_func_qstats_output *func_qstats); > int bnxt_hwrm_func_qstats_tx_drop(struct bnxt *bp, uint16_t fid, > uint64_t *dropped); > int bnxt_hwrm_func_clr_stats(struct bnxt *bp, uint16_t fid); > diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c > index 29628bd64..6afd11adb 100644 > --- a/drivers/net/bnxt/bnxt_stats.c > +++ b/drivers/net/bnxt/bnxt_stats.c > @@ -547,7 +547,7 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev, > return rc; > } > > - rc = bnxt_hwrm_func_qstats(bp, 0xffff, bnxt_stats); > + rc = bnxt_hwrm_func_qstats(bp, 0xffff, bnxt_stats, NULL); > return rc; > } > > @@ -581,10 +581,10 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev > *eth_dev, > { > struct bnxt *bp = eth_dev->data->dev_private; > unsigned int count, i; > - uint64_t tx_drop_pkts; > unsigned int rx_port_stats_ext_cnt; > unsigned int tx_port_stats_ext_cnt; > unsigned int stat_size = sizeof(uint64_t); > + struct hwrm_func_qstats_output func_qstats = {0}; > unsigned int stat_count; > int rc; > > @@ -597,8 +597,8 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, > > memset(xstats, 0, sizeof(*xstats)); > > + bnxt_hwrm_func_qstats(bp, 0xffff, NULL, &func_qstats); > bnxt_hwrm_port_qstats(bp); > - bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, &tx_drop_pkts); > bnxt_hwrm_ext_port_qstats(bp); > rx_port_stats_ext_cnt = RTE_MIN(RTE_DIM(bnxt_rx_ext_stats_strings), > (bp->fw_rx_port_stats_ext_size / > @@ -608,7 +608,8 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, > stat_size)); > > count = RTE_DIM(bnxt_rx_stats_strings) + > - RTE_DIM(bnxt_tx_stats_strings) + 1/* For tx_drop_pkts */ + > + RTE_DIM(bnxt_tx_stats_strings) + > + RTE_DIM(bnxt_func_stats_strings) + > RTE_DIM(bnxt_rx_ext_stats_strings) + > RTE_DIM(bnxt_tx_ext_stats_strings); > stat_count = count; > @@ -635,10 +636,13 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev > *eth_dev, > count++; > } > > - /* The Tx drop pkts aka the Anti spoof coounter */ > - xstats[count].id = count; > - xstats[count].value = rte_le_to_cpu_64(tx_drop_pkts); > - count++; > + for (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) { > + xstats[count].id = count; > + xstats[count].value = > + rte_le_to_cpu_64(((uint64_t *)&func_qstats)[i]); > + count++; > + } > + > > for (i = 0; i < rx_port_stats_ext_cnt; i++) { > uint64_t *rx_stats_ext = (uint64_t > *)bp->hw_rx_port_stats_ext; > @@ -667,9 +671,9 @@ int bnxt_dev_xstats_get_names_op(struct rte_eth_dev > *eth_dev, > struct rte_eth_xstat_name *xstats_names, > __rte_unused unsigned int limit) > { > - /* Account for the Tx drop pkts aka the Anti spoof counter */ > const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + > - RTE_DIM(bnxt_tx_stats_strings) + 1 + > + RTE_DIM(bnxt_tx_stats_strings) + > + RTE_DIM(bnxt_func_stats_strings) + > RTE_DIM(bnxt_rx_ext_stats_strings) + > RTE_DIM(bnxt_tx_ext_stats_strings); > struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; > @@ -697,10 +701,12 @@ int bnxt_dev_xstats_get_names_op(struct rte_eth_dev > *eth_dev, > count++; > } > > - strlcpy(xstats_names[count].name, > - bnxt_func_stats_strings[4].name, > - sizeof(xstats_names[count].name)); > - count++; > + for (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) { > + strlcpy(xstats_names[count].name, > + bnxt_func_stats_strings[i].name, > + sizeof(xstats_names[count].name)); > + count++; > + } > > for (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) { > strlcpy(xstats_names[count].name, > @@ -748,9 +754,9 @@ int bnxt_dev_xstats_reset_op(struct rte_eth_dev > *eth_dev) > int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t > *ids, > uint64_t *values, unsigned int limit) > { > - /* Account for the Tx drop pkts aka the Anti spoof counter */ > const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + > - RTE_DIM(bnxt_tx_stats_strings) + 1 + > + RTE_DIM(bnxt_tx_stats_strings) + > + RTE_DIM(bnxt_func_stats_strings) + > RTE_DIM(bnxt_rx_ext_stats_strings) + > RTE_DIM(bnxt_tx_ext_stats_strings); > struct bnxt *bp = dev->data->dev_private; > @@ -781,9 +787,9 @@ int bnxt_dev_xstats_get_names_by_id_op(struct > rte_eth_dev *dev, > struct rte_eth_xstat_name *xstats_names, > const uint64_t *ids, unsigned int limit) > { > - /* Account for the Tx drop pkts aka the Anti spoof counter */ > const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + > - RTE_DIM(bnxt_tx_stats_strings) + 1 + > + RTE_DIM(bnxt_tx_stats_strings) + > + RTE_DIM(bnxt_func_stats_strings) + > RTE_DIM(bnxt_rx_ext_stats_strings) + > RTE_DIM(bnxt_tx_ext_stats_strings); > struct rte_eth_xstat_name xstats_names_copy[stat_cnt]; > diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c > b/drivers/net/bnxt/rte_pmd_bnxt.c > index 4374034c3..2df486592 100644 > --- a/drivers/net/bnxt/rte_pmd_bnxt.c > +++ b/drivers/net/bnxt/rte_pmd_bnxt.c > @@ -614,7 +614,8 @@ int rte_pmd_bnxt_get_vf_stats(uint16_t port, > return -ENOTSUP; > } > > - return bnxt_hwrm_func_qstats(bp, bp->pf.first_vf_id + vf_id, > stats); > + return bnxt_hwrm_func_qstats(bp, bp->pf.first_vf_id + vf_id, stats, > + NULL); > } > > int rte_pmd_bnxt_reset_vf_stats(uint16_t port, > -- > 2.21.1 (Apple Git-122.3) > >