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 8A895A0542 for ; Fri, 11 Nov 2022 11:34:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8512142D0D; Fri, 11 Nov 2022 11:34:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DAEDA4014F for ; Fri, 11 Nov 2022 11:34:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162867; 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=IYAmaXsVqUNhuVTrbiU1Zbz6PkjivSByQoTLT27Jfm4=; b=HN2FKFIbnGp+TXbQM+L1BNIfJnfvmx0mUvq0oqkp5CEBwVykYmQaX8B58iNAl6czy7M2Ly u9Yw/pG/TczWl2ybB1WkHHZkXdr3KmloYjJ80mYRdhcE3+55d864cDlyP1PdQHsS6A+K2P gT7yXPlFJPgXBVCf4whYB53WT0NKSCo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-520-fOrMcRxGNsmwFMS3-2F5kQ-1; Fri, 11 Nov 2022 05:34:24 -0500 X-MC-Unique: fOrMcRxGNsmwFMS3-2F5kQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B1F485A5B6; Fri, 11 Nov 2022 10:34:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31C2E200E288; Fri, 11 Nov 2022 10:34:23 +0000 (UTC) From: Kevin Traynor To: Andrew Boyer Cc: dpdk stable Subject: patch 'net/ionic: fix reported error stats' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:03 +0000 Message-Id: <20221111103337.307408-13-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/14/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/4606affa8c01d3178c35feb5fe17a841739078cf Thanks. Kevin --- >From 4606affa8c01d3178c35feb5fe17a841739078cf 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 5e8fdf3893..799530f7f5 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -133,5 +133,5 @@ 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; - stats->imissed += + stats->ierrors += rx_stats->no_cb_arg + rx_stats->bad_cq_status + @@ -145,8 +145,6 @@ ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats 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.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.399275062 +0000 +++ 0013-net-ionic-fix-reported-error-stats.patch 2022-11-11 10:32:17.017300539 +0000 @@ -1 +1 @@ -From 26cc5dc29a3aa6a05f66ac269b346689028ee462 Mon Sep 17 00:00:00 2001 +From 4606affa8c01d3178c35feb5fe17a841739078cf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26cc5dc29a3aa6a05f66ac269b346689028ee462 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org