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 7857943B86 for ; Tue, 5 Mar 2024 10:53:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 722A04026B; Tue, 5 Mar 2024 10:53:27 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2061.outbound.protection.outlook.com [40.107.237.61]) by mails.dpdk.org (Postfix) with ESMTP id D6EBE4014F for ; Tue, 5 Mar 2024 10:53:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QJSMYvHzfoNsA+zb6SGomVVYJvzuKI2HmZUrFjGq4h5GHIfo9sR9KoTQ2J75PGkRJVOZmPIkxXRKUUfViDHyL2A/IAO0NFNw/KZcDfVr6qlpBLv/l6k2wKp10HwU8SqQruVrfjJLry7LAC2FT9M2nBR5HFX8GUYgSRz1ofdgfU095c7ij0nCncDzhcYDVyNXanjhg9y8DudrBfhdCkqXSBMkT5E/5zLhiNI9NvMWznDdgHTP3wCksqbuFMplswEPdbiMweEGARQIvF/qAiNkzlB1fqtpncw6qNrMJaXdkWczAPfLZLjS8QGtzospgqzE9qR/czqw0ie4Esz+ctHKpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MzxIsE1gWAYYjF/eKky28fhBWiXy7Xzn5cYIJ+E2B3Q=; b=mmwbxOUxuEX93jPN3dPj8yd5/7ihFYZori02LF4HdPr74BLm1bNw9YoZ8q6yBF9hOal81/XE7hJhv1ZBvmubmI4NDIG4XNDte0IDJthtIPYuheVyVVOesaYkNajSoZIY1/Wa/hCP+vqT3I4qIhqsyjWa279tXLcxLYoOapRHyJoAt1cQEdPzFveiz4WBypucK9iZSOtNn1wGCYcw5pSY4EQvQVAIuxg7AVlHSdld4N4eewsAwnYYbjSTz8mb2AyzY2Vh85J4WrWLQm/yP2eG3UM+jiLLHSxtLPunwW74UZawrFjr2bYqmS2bt2cJyVmQDtGIngisjIzBtyT54MQy7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=6wind.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MzxIsE1gWAYYjF/eKky28fhBWiXy7Xzn5cYIJ+E2B3Q=; b=eI3BaHIQnjVpKlErVxKqLFyd1s+c6/XvQgG1ATPilbLsK2/YwAqB3JlzXrurYbpAkz8Ce1Riwz4/XiqSZ8BhJDt+GJO6kafgnFgX325UuQCwCGRZjcrvXqcJi56lOKdt95GsWNwaXPm3DN4xMGrdc/CTF7w4EZdUfKVS4ZQKdazcLDTf7TQM5qVLWN/hextzvMMWanEnmPKqJAOhpMbH3b1Hnnkv/kTVBpyWWeD4FqKVi8JzGY+emIec0BMeMtAL/OTlsWyCk677Z++OSdEW5DzBsCjqRlh9KlT48NvRyGgRnp50rlEMi+SXJmVGj5eHgKf4WpDB8XiC+uYmYpQyIw== Received: from CY5PR22CA0015.namprd22.prod.outlook.com (2603:10b6:930:16::7) by SA1PR12MB7173.namprd12.prod.outlook.com (2603:10b6:806:2b4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:53:21 +0000 Received: from CY4PEPF0000FCC4.namprd03.prod.outlook.com (2603:10b6:930:16:cafe::ae) by CY5PR22CA0015.outlook.office365.com (2603:10b6:930:16::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39 via Frontend Transport; Tue, 5 Mar 2024 09:53:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000FCC4.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:53:12 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 5 Mar 2024 01:53:11 -0800 From: Xueming Li To: Edwin Brossette CC: Ferruh Yigit , dpdk stable Subject: patch 'net/virtio: remove duplicate queue xstats' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:39 +0800 Message-ID: <20240305094757.439387-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC4:EE_|SA1PR12MB7173:EE_ X-MS-Office365-Filtering-Correlation-Id: c63ab986-ffef-4f31-4da0-08dc3cfa178b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LbLd03dQdXBYXreMF2NFGui61Yc7zOU/0C6kTR8izmAc8LI6CZn8cDe9vo7akDmXCZzwe0uCVjmpCuqlO5rPjurOLO+IU/cGrmO1DVBqXttx/locX8g49sRCcIeTbWgVXUO9gq8ZrQaDrxwBZ2Zw9+P59Z0wRbbC1rvTHYjZ+aF7jUl1sejo9/gZksZLTh8mGnTB7TmGGVc/Zj58+Jps+dUe09g+8/ODizNVm575w6tUGVwuAPwR751qTqcK+ajIqkKab+SEpOmLFWt+nqnHGsh1uTiq6SfRdetcB2nQT2JmdxDipD5WkBaCm1yS/mJe8mzdII4WIt60fpY6XN2EtDkHapqZjmQSUqVPwX8mNW0sO6IlskZuOBEcRD8qekfXgwPzUaOz9czZGusrkTZGcgI6wfBAM6hdJRTZk/b3CbiQiMskVs2wpjBDXFt92r0jQvhx35WYAl2m2kYFAGzj5dBOzM5JugNmuVYKC+e5x8O875I+Eo42yaZ8CBhr1bsopyUDG6q7JvX+q44xjI9whd4V0a8mhaUfdxU7DMRJLtIqaNzn/TI69yRSpwvI6YVWeJ3NEe46AaM1PBk8XZ+gybSrbJdVqvSEuYKDLhyZ03unC0nRucUVP4Xk2a5QuTCjvmBR7av01DGxn00kCx3BKudYIx3Vsm4+GTdTuUDkbdD8weBX1zrjRHxMWBi3rVQiKZEokxYc5/oINXqdrzYyp22RtEdL3o6Um/dbjXQWRYtXF4K2dY0amCbVKHB48zwn X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:21.2857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c63ab986-ffef-4f31-4da0-08dc3cfa178b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7173 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 23.11.1 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/31/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=33fbddf9a41548ffe2746b6dfee7e3bdb64c043b Thanks. Xueming Li --- >From 33fbddf9a41548ffe2746b6dfee7e3bdb64c043b 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 Cc: Xueming Li [ 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 c2c0a1a111..517585740e 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1793,8 +1793,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.717076558 +0800 +++ 0058-net-virtio-remove-duplicate-queue-xstats.patch 2024-03-05 17:39:30.773566493 +0800 @@ -1 +1 @@ -From 4b0a1fdb745c39003d70c75696d6730eba5636a5 Mon Sep 17 00:00:00 2001 +From 33fbddf9a41548ffe2746b6dfee7e3bdb64c043b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4b0a1fdb745c39003d70c75696d6730eba5636a5 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org