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 0A18143829 for ; Tue, 5 Mar 2024 16:35:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03FF042E02; Tue, 5 Mar 2024 16:35:38 +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 A4570402AF for ; Tue, 5 Mar 2024 16:35:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652936; 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=xB9xIz3Tsyy/VDM4LZQWDFVGr9cC0SyLpCirGY+mf94=; b=d8tvOu+2wYMVql8mhXBzgKi/5Aiq3jDrH3oWyVXYfmfwBDGGmOPwTEfoZ0BT6XVpu/Psik fvMT8pIWrlgXbCw9dhemJnBqK7QMZWULmAdS0oYR3nplGXts8C3rGe9z9k4rJ4oOn6KYwY BsfwA7HW2XiiONvrs+CclWHvRfNQOm0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-VtDIinJtOxatMLbrA8EAvA-1; Tue, 05 Mar 2024 10:35:34 -0500 X-MC-Unique: VtDIinJtOxatMLbrA8EAvA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03342101A58E; Tue, 5 Mar 2024 15:35:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5331200B01D; Tue, 5 Mar 2024 15:35:32 +0000 (UTC) From: Kevin Traynor To: Edwin Brossette Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/virtio: remove duplicate queue xstats' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:01 +0000 Message-ID: <20240305153449.263666-28-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.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 03/11/24. 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/519dd4c280d390bf7a634115d77547e648097e88 Thanks. Kevin --- >From 519dd4c280d390bf7a634115d77547e648097e88 Mon Sep 17 00:00:00 2001 From: Edwin Brossette Date: Fri, 24 Nov 2023 14:52:36 +0100 Subject: [PATCH] net/virtio: remove duplicate queue xstats [ upstream commit 4b0a1fdb745c39003d70c75696d6730eba5636a5 ] The flag RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS was temporarily set while moving queue stats from 'struct rte_eth_stats' to the individual PMDs, as explained in commit f30e69b41f94 ("ethdev: add device flag to bypass auto-filled queue xstats"). This flag was added so every pmd would keep its original behavior until the change was implemented. However, this flag was not removed afterwards in the virtio PMD and as a result, some queue stats are displayed twice when trying to get them: once in lib_rte_ethdev, and a second time in the virtio PMD. Remove this flag so stats are printed only once. Fixes: f30e69b41f94 ("ethdev: add device flag to bypass auto-filled queue xstats") Signed-off-by: Edwin Brossette Reviewed-by: Ferruh Yigit --- drivers/net/virtio/virtio_ethdev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index bcad27817e..c6155e9ae5 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2240,6 +2240,4 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) eth_dev->data->dev_flags &= ~RTE_ETH_DEV_INTR_LSC; - eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - /* Setting up rx_header size for the device */ if (virtio_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF) || -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.361097782 +0000 +++ 0028-net-virtio-remove-duplicate-queue-xstats.patch 2024-03-05 14:08:54.644520749 +0000 @@ -1 +1 @@ -From 4b0a1fdb745c39003d70c75696d6730eba5636a5 Mon Sep 17 00:00:00 2001 +From 519dd4c280d390bf7a634115d77547e648097e88 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b0a1fdb745c39003d70c75696d6730eba5636a5 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index c2c0a1a111..517585740e 100644 +index bcad27817e..c6155e9ae5 100644 @@ -32 +33 @@ -@@ -1794,6 +1794,4 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) +@@ -2240,6 +2240,4 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)