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 165A0A04C3 for ; Fri, 22 Nov 2019 15:43:08 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09A151BEA7; Fri, 22 Nov 2019 15:43:08 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 491D991 for ; Fri, 22 Nov 2019 15:43:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RT+TtzEhdC+GqQ18+6lKFQrK0LxYVNY80rc2wjMR2+E=; b=B71ewcRcLjh71c6c8n2hL+S9fALoeTaKPcETYv4tjoa/Yirpjf9qxGAu6zvpI3BguOJYCV yVqvlBBn5lXkPXNlEsTadRlWDwkVDsFfttKjT0wgh3JZAJfKyT1aB0fEGdvZ1NilGGwiiD OLng95gKG7QP6QBmcNiTLz0HeheeDfs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-ZLdXYzZGNm6U67vRaBEYvA-1; Fri, 22 Nov 2019 09:43:02 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E516107ACC9; Fri, 22 Nov 2019 14:43:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97BB48516; Fri, 22 Nov 2019 14:43:00 +0000 (UTC) From: Kevin Traynor To: Shahed Shaikh Cc: dpdk stable Date: Fri, 22 Nov 2019 14:41:28 +0000 Message-Id: <20191122144131.21231-42-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ZLdXYzZGNm6U67vRaBEYvA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/qede: fix stats flow as per new allocation method' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/0dede47cf0a1eb29c7= d44f8944675bb4a335df7e Thanks. Kevin. --- >From 0dede47cf0a1eb29c7d44f8944675bb4a335df7e Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Thu, 12 Sep 2019 08:24:15 -0700 Subject: [PATCH] net/qede: fix stats flow as per new allocation method [ upstream commit 0aa3e7b925e1ebefdcb9e49d4b1a4c4bc9a127c9 ] As per new method, need to consider hw stats of queues from both engines. This patch fixes the stats collection flow accordingly. Fixes: 2af14ca79c0a ("net/qede: support 100G") Signed-off-by: Shahed Shaikh --- drivers/net/qede/qede_ethdev.c | 143 ++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 64 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.= c index 493d0bce0..97d991cad 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -6,4 +6,5 @@ =20 #include "qede_ethdev.h" +#include #include #include @@ -1475,5 +1476,5 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rt= e_eth_stats *eth_stats) =09struct ecore_dev *edev =3D &qdev->edev; =09struct ecore_eth_stats stats; -=09unsigned int i =3D 0, j =3D 0, qid; +=09unsigned int i =3D 0, j =3D 0, qid, idx, hw_fn; =09unsigned int rxq_stat_cntrs, txq_stat_cntrs; =09struct qede_tx_queue *txq; @@ -1523,18 +1524,26 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct = rte_eth_stats *eth_stats) =20 =09for (qid =3D 0; qid < eth_dev->data->nb_rx_queues; qid++) { -=09=09eth_stats->q_ipackets[i] =3D -=09=09=09*(uint64_t *)( -=09=09=09=09((char *)(qdev->fp_array[qid].rxq)) + -=09=09=09=09offsetof(struct qede_rx_queue, -=09=09=09=09rcv_pkts)); -=09=09eth_stats->q_errors[i] =3D -=09=09=09*(uint64_t *)( -=09=09=09=09((char *)(qdev->fp_array[qid].rxq)) + -=09=09=09=09offsetof(struct qede_rx_queue, -=09=09=09=09rx_hw_errors)) + -=09=09=09*(uint64_t *)( -=09=09=09=09((char *)(qdev->fp_array[qid].rxq)) + -=09=09=09=09offsetof(struct qede_rx_queue, -=09=09=09=09rx_alloc_errors)); +=09=09eth_stats->q_ipackets[i] =3D 0; +=09=09eth_stats->q_errors[i] =3D 0; + +=09=09for_each_hwfn(edev, hw_fn) { +=09=09=09idx =3D qid * edev->num_hwfns + hw_fn; + +=09=09=09eth_stats->q_ipackets[i] +=3D +=09=09=09=09*(uint64_t *) +=09=09=09=09=09(((char *)(qdev->fp_array[idx].rxq)) + +=09=09=09=09=09 offsetof(struct qede_rx_queue, +=09=09=09=09=09 rcv_pkts)); +=09=09=09eth_stats->q_errors[i] +=3D +=09=09=09=09*(uint64_t *) +=09=09=09=09=09(((char *)(qdev->fp_array[idx].rxq)) + +=09=09=09=09=09 offsetof(struct qede_rx_queue, +=09=09=09=09=09 rx_hw_errors)) + +=09=09=09=09*(uint64_t *) +=09=09=09=09=09(((char *)(qdev->fp_array[idx].rxq)) + +=09=09=09=09=09 offsetof(struct qede_rx_queue, +=09=09=09=09=09 rx_alloc_errors)); +=09=09} + =09=09i++; =09=09if (i =3D=3D rxq_stat_cntrs) @@ -1543,10 +1552,17 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct = rte_eth_stats *eth_stats) =20 =09for (qid =3D 0; qid < eth_dev->data->nb_tx_queues; qid++) { -=09=09txq =3D qdev->fp_array[qid].txq; -=09=09eth_stats->q_opackets[j] =3D -=09=09=09*((uint64_t *)(uintptr_t) -=09=09=09=09(((uint64_t)(uintptr_t)(txq)) + -=09=09=09=09 offsetof(struct qede_tx_queue, -=09=09=09=09=09 xmit_pkts))); +=09=09eth_stats->q_opackets[j] =3D 0; + +=09=09for_each_hwfn(edev, hw_fn) { +=09=09=09idx =3D qid * edev->num_hwfns + hw_fn; + +=09=09=09txq =3D qdev->fp_array[idx].txq; +=09=09=09eth_stats->q_opackets[j] +=3D +=09=09=09=09*((uint64_t *)(uintptr_t) +=09=09=09=09=09(((uint64_t)(uintptr_t)(txq)) + +=09=09=09=09=09 offsetof(struct qede_tx_queue, +=09=09=09=09=09=09 xmit_pkts))); +=09=09} + =09=09j++; =09=09if (j =3D=3D txq_stat_cntrs) @@ -1581,43 +1597,41 @@ qede_get_xstats_names(struct rte_eth_dev *dev, =09struct ecore_dev *edev =3D &qdev->edev; =09const unsigned int stat_cnt =3D qede_get_xstats_count(qdev); -=09unsigned int i, qid, stat_idx =3D 0; -=09unsigned int rxq_stat_cntrs; +=09unsigned int i, qid, hw_fn, stat_idx =3D 0; =20 -=09if (xstats_names !=3D NULL) { -=09=09for (i =3D 0; i < RTE_DIM(qede_xstats_strings); i++) { -=09=09=09snprintf(xstats_names[stat_idx].name, -=09=09=09=09sizeof(xstats_names[stat_idx].name), -=09=09=09=09"%s", -=09=09=09=09qede_xstats_strings[i].name); +=09if (xstats_names =3D=3D NULL) +=09=09return stat_cnt; + +=09for (i =3D 0; i < RTE_DIM(qede_xstats_strings); i++) { +=09=09strlcpy(xstats_names[stat_idx].name, +=09=09=09qede_xstats_strings[i].name, +=09=09=09sizeof(xstats_names[stat_idx].name)); +=09=09stat_idx++; +=09} + +=09if (ECORE_IS_BB(edev)) { +=09=09for (i =3D 0; i < RTE_DIM(qede_bb_xstats_strings); i++) { +=09=09=09strlcpy(xstats_names[stat_idx].name, +=09=09=09=09qede_bb_xstats_strings[i].name, +=09=09=09=09sizeof(xstats_names[stat_idx].name)); =09=09=09stat_idx++; =09=09} - -=09=09if (ECORE_IS_BB(edev)) { -=09=09=09for (i =3D 0; i < RTE_DIM(qede_bb_xstats_strings); i++) { -=09=09=09=09snprintf(xstats_names[stat_idx].name, -=09=09=09=09=09sizeof(xstats_names[stat_idx].name), -=09=09=09=09=09"%s", -=09=09=09=09=09qede_bb_xstats_strings[i].name); -=09=09=09=09stat_idx++; -=09=09=09} -=09=09} else { -=09=09=09for (i =3D 0; i < RTE_DIM(qede_ah_xstats_strings); i++) { -=09=09=09=09snprintf(xstats_names[stat_idx].name, -=09=09=09=09=09sizeof(xstats_names[stat_idx].name), -=09=09=09=09=09"%s", -=09=09=09=09=09qede_ah_xstats_strings[i].name); -=09=09=09=09stat_idx++; -=09=09=09} +=09} else { +=09=09for (i =3D 0; i < RTE_DIM(qede_ah_xstats_strings); i++) { +=09=09=09strlcpy(xstats_names[stat_idx].name, +=09=09=09=09qede_ah_xstats_strings[i].name, +=09=09=09=09sizeof(xstats_names[stat_idx].name)); +=09=09=09stat_idx++; =09=09} +=09} =20 -=09=09rxq_stat_cntrs =3D RTE_MIN(QEDE_RSS_COUNT(dev), -=09=09=09=09=09 RTE_ETHDEV_QUEUE_STAT_CNTRS); -=09=09for (qid =3D 0; qid < rxq_stat_cntrs; qid++) { +=09for (qid =3D 0; qid < QEDE_RSS_COUNT(dev); qid++) { +=09=09for_each_hwfn(edev, hw_fn) { =09=09=09for (i =3D 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) { =09=09=09=09snprintf(xstats_names[stat_idx].name, -=09=09=09=09=09sizeof(xstats_names[stat_idx].name), -=09=09=09=09=09"%.4s%d%s", -=09=09=09=09=09qede_rxq_xstats_strings[i].name, qid, -=09=09=09=09=09qede_rxq_xstats_strings[i].name + 4); +=09=09=09=09=09 RTE_ETH_XSTATS_NAME_SIZE, +=09=09=09=09=09 "%.4s%d.%d%s", +=09=09=09=09=09 qede_rxq_xstats_strings[i].name, +=09=09=09=09=09 hw_fn, qid, +=09=09=09=09=09 qede_rxq_xstats_strings[i].name + 4); =09=09=09=09stat_idx++; =09=09=09} @@ -1636,6 +1650,5 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_e= th_xstat *xstats, =09struct ecore_eth_stats stats; =09const unsigned int num =3D qede_get_xstats_count(qdev); -=09unsigned int i, qid, stat_idx =3D 0; -=09unsigned int rxq_stat_cntrs; +=09unsigned int i, qid, hw_fn, fpidx, stat_idx =3D 0; =20 =09if (n < num) @@ -1669,13 +1682,15 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte= _eth_xstat *xstats, =09} =20 -=09rxq_stat_cntrs =3D RTE_MIN(QEDE_RSS_COUNT(dev), -=09=09=09=09 RTE_ETHDEV_QUEUE_STAT_CNTRS); -=09for (qid =3D 0; qid < rxq_stat_cntrs; qid++) { -=09=09for (i =3D 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) { -=09=09=09xstats[stat_idx].value =3D *(uint64_t *) -=09=09=09=09(((char *)(qdev->fp_array[qid].rxq)) + -=09=09=09=09 qede_rxq_xstats_strings[i].offset); -=09=09=09xstats[stat_idx].id =3D stat_idx; -=09=09=09stat_idx++; +=09for (qid =3D 0; qid < dev->data->nb_rx_queues; qid++) { +=09=09for_each_hwfn(edev, hw_fn) { +=09=09=09for (i =3D 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) { +=09=09=09=09fpidx =3D qid * edev->num_hwfns + hw_fn; +=09=09=09=09xstats[stat_idx].value =3D *(uint64_t *) +=09=09=09=09=09(((char *)(qdev->fp_array[fpidx].rxq)) + +=09=09=09=09=09 qede_rxq_xstats_strings[i].offset); +=09=09=09=09xstats[stat_idx].id =3D stat_idx; +=09=09=09=09stat_idx++; +=09=09=09} + =09=09} =09} --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:57.441184443 +0000 +++ 0042-net-qede-fix-stats-flow-as-per-new-allocation-method.patch=092019-= 11-22 14:36:55.226148666 +0000 @@ -1 +1 @@ -From 0aa3e7b925e1ebefdcb9e49d4b1a4c4bc9a127c9 Mon Sep 17 00:00:00 2001 +From 0dede47cf0a1eb29c7d44f8944675bb4a335df7e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0aa3e7b925e1ebefdcb9e49d4b1a4c4bc9a127c9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/qede/qede_ethdev.c | 135 +++++++++++++++++++-------------- - 1 file changed, 76 insertions(+), 59 deletions(-) + drivers/net/qede/qede_ethdev.c | 143 ++++++++++++++++++--------------- + 1 file changed, 79 insertions(+), 64 deletions(-) @@ -18 +19 @@ -index 8b75ca3a7..98290fdc7 100644 +index 493d0bce0..97d991cad 100644 @@ -21 +22,7 @@ -@@ -1478,5 +1478,5 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct r= te_eth_stats *eth_stats) +@@ -6,4 +6,5 @@ +=20 + #include "qede_ethdev.h" ++#include + #include + #include +@@ -1475,5 +1476,5 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct r= te_eth_stats *eth_stats) @@ -28 +35 @@ -@@ -1526,18 +1526,26 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct= rte_eth_stats *eth_stats) +@@ -1523,18 +1524,26 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct= rte_eth_stats *eth_stats) @@ -69 +76 @@ -@@ -1546,10 +1554,17 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct= rte_eth_stats *eth_stats) +@@ -1543,10 +1552,17 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct= rte_eth_stats *eth_stats) @@ -93 +100 @@ -@@ -1584,40 +1599,41 @@ qede_get_xstats_names(struct rte_eth_dev *dev, +@@ -1581,43 +1597,41 @@ qede_get_xstats_names(struct rte_eth_dev *dev, @@ -101,0 +109,4 @@ +-=09=09=09snprintf(xstats_names[stat_idx].name, +-=09=09=09=09sizeof(xstats_names[stat_idx].name), +-=09=09=09=09"%s", +-=09=09=09=09qede_xstats_strings[i].name); @@ -114,2 +125 @@ - =09=09=09strlcpy(xstats_names[stat_idx].name, --=09=09=09=09qede_xstats_strings[i].name, ++=09=09=09strlcpy(xstats_names[stat_idx].name, @@ -117 +127 @@ - =09=09=09=09sizeof(xstats_names[stat_idx].name)); ++=09=09=09=09sizeof(xstats_names[stat_idx].name)); @@ -123,3 +133,4 @@ --=09=09=09=09strlcpy(xstats_names[stat_idx].name, --=09=09=09=09=09qede_bb_xstats_strings[i].name, --=09=09=09=09=09sizeof(xstats_names[stat_idx].name)); +-=09=09=09=09snprintf(xstats_names[stat_idx].name, +-=09=09=09=09=09sizeof(xstats_names[stat_idx].name), +-=09=09=09=09=09"%s", +-=09=09=09=09=09qede_bb_xstats_strings[i].name); @@ -130,3 +141,4 @@ --=09=09=09=09strlcpy(xstats_names[stat_idx].name, --=09=09=09=09=09qede_ah_xstats_strings[i].name, --=09=09=09=09=09sizeof(xstats_names[stat_idx].name)); +-=09=09=09=09snprintf(xstats_names[stat_idx].name, +-=09=09=09=09=09sizeof(xstats_names[stat_idx].name), +-=09=09=09=09=09"%s", +-=09=09=09=09=09qede_ah_xstats_strings[i].name); @@ -162 +174 @@ -@@ -1636,6 +1652,5 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_= eth_xstat *xstats, +@@ -1636,6 +1650,5 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_= eth_xstat *xstats, @@ -170 +182 @@ -@@ -1669,13 +1684,15 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rt= e_eth_xstat *xstats, +@@ -1669,13 +1682,15 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rt= e_eth_xstat *xstats,