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 271CD43C60 for ; Thu, 7 Mar 2024 02:34:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 179B042EED; Thu, 7 Mar 2024 02:34:48 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id B9C3842E64 for ; Thu, 7 Mar 2024 02:34:46 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33d153254b7so166516f8f.0 for ; Wed, 06 Mar 2024 17:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775286; x=1710380086; darn=dpdk.org; 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=+jBrCWA3/Ifc04EAxTHv8eaVMgfw3QkI52ORSAWOA6g=; b=c7txizHM9YwGkVhzUbKjtRYkm8Xplw86YXWRL8SRjmdMc4Fww/Lv7jwi92LTonPdmA ICXMrziEPDvY67qJJXlTCNcyx7PVKVD4GwOccwuosbPcL/9t/D97ZGzBVyUG7cHG7Rf7 RB1c2ABZxan1SXUSCEtKwyEE/xLBu3JgwQ7tkbRO5s1Z7KOGLt7ldXfytnImE4aytJz2 i6p8EMTsgutr6N1pdbefCjsVPOuWaZVfAjpSQloesBq6K2Vji9R9TqpEyzl664CdZ6jm YK1aEyLzqGH+yuEYuql6WHYUMao8P6tBMeY6vAu2MBlWVTggUcu81MFDqsqj9ErU5fXT /BJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775286; x=1710380086; 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=+jBrCWA3/Ifc04EAxTHv8eaVMgfw3QkI52ORSAWOA6g=; b=naE1s2xjiDv0tsg28b+2/oAS42DiwBjWJKMFZaMbPedzj75wG6Vr1WdyIYlJ73QN7Q InbwP0EazMHMq5zLI+y2dryeK4W6hRXYuVcvRLbdElP4ugyj8SesLSHBQRDSeBme3xmy 0PwvrAWxVYZmGvnIpRxzpVrP/ORbS+tIGrRmR+L6Vm3PhbYUHgJkV0A5WNvZKLrtPE2O JiP60PoYj9HKib7lx9/JQV0Wokzpae7oQu318Er1lep7lGQ9sb3jA2UT1IcDl6D4paUb u8d7qp/8RE65Ceb6vk6i2rLQ+WrzK3Q3fBh8XZoJny2XGGxkLTAhiThk8sOVk0tjs+y6 Ng8g== X-Forwarded-Encrypted: i=1; AJvYcCWF24qYaG72YsXeBBK4SYtPQo+jHvM2hlSLEnXCh60iOxRkNLfRQCPCrsjZODsJMAjpboadJqIKCF2nqOicrsQ= X-Gm-Message-State: AOJu0YydKVTj209tjl0Xcqf+SlosDdfZewrPDBsbySwXtFSfL2Ybwo56 3TUSqS3UIYEFxlHQyZTb5Z+0kyGQmIVMGEZPuB8ZtzEBC5SLf/3pG640E3SO X-Google-Smtp-Source: AGHT+IEuXvxDsiRTukHM6DCHxaYukyz/rKlDRTR79iLTQvUre/eUqA1TSbLTSIsaTcDRDYtgUJ1k3g== X-Received: by 2002:adf:9cc1:0:b0:33e:3dff:32d4 with SMTP id h1-20020adf9cc1000000b0033e3dff32d4mr8075096wre.34.1709775286393; Wed, 06 Mar 2024 17:34:46 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id f15-20020adffccf000000b0033dedd63382sm18921207wrs.101.2024.03.06.17.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:34:45 -0800 (PST) From: luca.boccassi@gmail.com To: Edwin Brossette Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/virtio: remove duplicate queue xstats' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:02 +0000 Message-Id: <20240307013159.1735343-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/453678fc16c2ad282dad6b54a8034715a1221086 Thanks. Luca Boccassi --- >From 453678fc16c2ad282dad6b54a8034715a1221086 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 5e9ed47551..073bbf482d 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2237,8 +2237,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) else 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) || virtio_with_feature(hw, VIRTIO_F_VERSION_1) || -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:38.790571866 +0000 +++ 0045-net-virtio-remove-duplicate-queue-xstats.patch 2024-03-07 01:05:34.782939677 +0000 @@ -1 +1 @@ -From 4b0a1fdb745c39003d70c75696d6730eba5636a5 Mon Sep 17 00:00:00 2001 +From 453678fc16c2ad282dad6b54a8034715a1221086 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 5e9ed47551..073bbf482d 100644 @@ -32 +33 @@ -@@ -1793,8 +1793,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) +@@ -2237,8 +2237,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)