From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6CED4A0543 for ; Sat, 5 Nov 2022 18:12:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6896440151; Sat, 5 Nov 2022 18:12:49 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 307DA400D5 for ; Sat, 5 Nov 2022 18:12:48 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id g12so10841931wrs.10 for ; Sat, 05 Nov 2022 10:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z2GXBIO3wDChgbl9sCNXckKh4o/82/WWi0YTMvMFvQc=; b=OlMfef0/csJ3dQlrilLFqmv7vo+YWMREuWN+9HVg22s4H6Oc+O2/9XXtWLIfNy3B8U jL0R6qMw4kc7lwZx0eYx728P/9aZrYu24mWmAugOvd87DC2fN8Vr2+SU9AsgWVu/HcAS MCD3h7mrBswrKZUnZk6QhVwLAUS+3OvyFpZghF1+y9PSqfw9+4ItoJo9PVkvIljhTv+R 2Rky0vVDfo215pZ2tOi+dURXL3chqPHVGoO1igUM3jp3kTH1OwC7d7IIRnI1tLm3tzEL 4IL0MDPIVKAWOdecYKDo2QbHTP5d5ZUBC7uXs+EpvMfl3m2M5xnlg+xMzdS4sxpntgDG J9jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z2GXBIO3wDChgbl9sCNXckKh4o/82/WWi0YTMvMFvQc=; b=dkfArRWeHgjG8AUScZIL/c3r0jMxuLdqPUfw/KpeGTeyAQMQrVklOrVZZO9/DFIWgv IeF0gwb6L8ZP9ycW0/k9hBhkGx6PYMYj5gRVLv7MoIZ00DXeDIKNaVLJvEUUXDzQ3rB1 VQXu6tmkVFQHmLmDlsrsQb0fkcRgtGPvzNA931JNR3wcBye0Jzb93BGXDI79S9aIRIFW J5V4gCL7ZLbZFY2OwYpf/HteYxjcyANU6MZeW/2sm9K8olxE2/WdtzWwHRI5nsON6M3Y qUpaPSyo+7RrOIK83nWwmTylIzq7mzBc71+uYM1DyrAgHbtkiZJ+ciEbUqYAwzuMKEpt 6ZMg== X-Gm-Message-State: ACrzQf2borTFzULjY6R3VluKP2g/z3NBg5SLozJ+cZ9xs6VZq9fzrUls dwZemE+G9QdMXxygvErL/6LkqlAAzX4= X-Google-Smtp-Source: AMsMyM5sLew0AqNu4nfcWbXO9P7qySqla+l2RESEpku9Mx6uVRTZzG0fNz/acGQL1qS1+RF49Mh5dw== X-Received: by 2002:a05:6000:88:b0:236:b36c:a0d8 with SMTP id m8-20020a056000008800b00236b36ca0d8mr24659335wrx.459.1667668367943; Sat, 05 Nov 2022 10:12:47 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id i5-20020adffc05000000b0023660f6cecfsm2585778wrr.80.2022.11.05.10.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Boyer Cc: dpdk stable Subject: patch 'net/ionic: fix reported error stats' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:19 +0000 Message-Id: <20221105171146.1520039-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.7 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/07/22. 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 rebasing (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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2224ce94db7c23dc084a407c65eb59c5726313e8 Thanks. Luca Boccassi --- >From 2224ce94db7c23dc084a407c65eb59c5726313e8 Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Tue, 18 Oct 2022 12:41:00 -0700 Subject: [PATCH] net/ionic: fix reported error stats [ upstream commit 26cc5dc29a3aa6a05f66ac269b346689028ee462 ] Report descriptor errors in ierrors instead of imissed. Don't report rx_queue_empty or rx_queue_disabled in imissed, since those packet errors are already included in the rx_*_drop_packets counters. This makes the reported stats correct. Fixes: 3cdfd90579e7 ("net/ionic: add stats") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 33a5977ced..4947a047ca 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -114,7 +114,7 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats for (i = 0; i < lif->nrxqcqs; i++) { struct ionic_rx_stats *rx_stats = &lif->rxqcqs[i]->stats.rx; - stats->imissed += + stats->ierrors += rx_stats->no_cb_arg + rx_stats->bad_cq_status + rx_stats->no_room + @@ -126,10 +126,8 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats ls->rx_mcast_drop_packets + ls->rx_bcast_drop_packets; - stats->imissed += - ls->rx_queue_empty + + stats->ierrors += ls->rx_dma_error + - ls->rx_queue_disabled + ls->rx_desc_fetch_error + ls->rx_desc_data_error; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:10.426703337 +0000 +++ 0020-net-ionic-fix-reported-error-stats.patch 2022-11-05 17:11:08.630941697 +0000 @@ -1 +1 @@ -From 26cc5dc29a3aa6a05f66ac269b346689028ee462 Mon Sep 17 00:00:00 2001 +From 2224ce94db7c23dc084a407c65eb59c5726313e8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26cc5dc29a3aa6a05f66ac269b346689028ee462 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5e8fdf3893..799530f7f5 100644 +index 33a5977ced..4947a047ca 100644 @@ -24 +25 @@ -@@ -132,7 +132,7 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats +@@ -114,7 +114,7 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats @@ -27 +28 @@ - struct ionic_rx_stats *rx_stats = &lif->rxqcqs[i]->stats; + struct ionic_rx_stats *rx_stats = &lif->rxqcqs[i]->stats.rx; @@ -33 +34 @@ -@@ -144,10 +144,8 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats +@@ -126,10 +126,8 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats