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 DC43243B7D for ; Tue, 5 Mar 2024 10:57:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D611442E41; Tue, 5 Mar 2024 10:57:29 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2068.outbound.protection.outlook.com [40.107.101.68]) by mails.dpdk.org (Postfix) with ESMTP id E5C5142E41 for ; Tue, 5 Mar 2024 10:57:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JneP0IPN3P9WGXY1PpREjxuAE8Oc+GLuJISCA26bbXNhkpjSQFMVEcIupY7eT7ysAb3IFgcWWWMtETn6RnAPxQKZt5jW+nUR8yIkzGwCz28A1jAw2YbEz91N3v2PopzKJJ8qTIxdbX2L70v/B5sxinxGXnAmWeoLc6chx8WBjgWF5QoWZIjPYae54a5GHmOHhXpJc7I9jaKmfK8Iva+FZkM8eluhTZmpYzhzv6ziDG9VsXiSXq7o/0uNNYr9YFt1HuTB27r8wAMuWUNdtXEQF00koeF4AA19FDj0BUMYWTp0rF1nY/9rB2o7C9Zc/jSXTe3EtZLCLxYZnqnrsBD3eQ== 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=pGq3zRCkdVH/4h5sQaAAsMUgnFu0yNP43ZAHIglcS1A=; b=UtUKwcG6z/ugyM4pjuQgLZkQhvBVzuUYclI7yNj4c6QinP58SsuVcvHTdBkV6gsmPnv/NeQuOcI07uRTNIWfeoc/jtyOqcbYi3oWAW8q7IMBQ12/B8pQUEgSIQ5DQTTt04odK6w004QP4CH0aa61VQqWLScLynVGjYxOgmb33bUJ/MPV2zy3Tc1ysNNXlFHH4iLcWmM+M9dLl7VLqk5Nm8rlqnaDmc6xmrTPjGi/xgxtInRwDSo+quBc49pVh2xqOfWlVnocWWBUfVYmBe/t+tXiEbM1KU/aYEztUuyAwgu320j2onfTZJvvvorRD2SodEGNrgOADbzIOuUu28wH2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=cesnet.cz 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=pGq3zRCkdVH/4h5sQaAAsMUgnFu0yNP43ZAHIglcS1A=; b=PPIdJYkTBIHALW1bVZR0AA9FqdFYB5Dn/heZWcIqs4QxsgBWc6At4JZCY3r8xllGb8oQGvNzF92S8Wz1K9zc7bWZ7kjMwqF/kBh2RoshlQnAYS0OPGJLOaj6AALocz0wiZy6mL9EeLJFy2S8Cy/m+W7dud5KAc/JCZlllfa0b6rgB59I50jT3va4u3JAo01Kfor3tvT9qQ8oAxUpXw7MDeTauTCr1gpWpG6TTXKldBU1OH1iYEPmzPDVGp9taGcYMDelm7NofMQ6FIBgqIqbOiGRog7rwAfVtiz0KjLVFxxWHmrydav53vBfPat/qg/eMilElLn+xshTUNgDOpVPeg== Received: from BYAPR01CA0014.prod.exchangelabs.com (2603:10b6:a02:80::27) by BL3PR12MB6402.namprd12.prod.outlook.com (2603:10b6:208:3b2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:57:26 +0000 Received: from SJ5PEPF000001D3.namprd05.prod.outlook.com (2603:10b6:a02:80:cafe::8b) by BYAPR01CA0014.outlook.office365.com (2603:10b6:a02:80::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 09:57:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ5PEPF000001D3.mail.protection.outlook.com (10.167.242.55) 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:57:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:57:13 -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:57:11 -0800 From: Xueming Li To: =?UTF-8?q?M=C3=A1rio=20Kuka?= CC: Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix flow count query' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:25 +0800 Message-ID: <20240305094757.439387-105-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: SJ5PEPF000001D3:EE_|BL3PR12MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 01224c79-a59e-4a41-ce23-08dc3cfaa8e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +2bOttnxa3n+RtzZ3Bk5GOEewix+yTlED2TU7XhLLGH9pRwV8RrciPBY0+TLFP8lsLA22P6CQ47+EcDvht+16RRVOq2YRyXJZiVy6Iw0Zlcdkskaj7y6HQnt+2zczJJEI4panFxeI8wGP8oMWMC50GZkqQzSvEviTpE8PzhX0xoXWSP+rg6thS1B5WSw3UhHauslqqIrllqFO/ZOZ+wmjNabR8nofUxIQHMmSnGagDwb33FCPKhJrFvo2p4YeUBiRe1Rpo0Ej7qTkfINEIuwITRpwiO5zrYeZXEOWaDVTe439PFqW2icOI0WQcwEYngMRRRo5vf7k/K4ZNeIeWiEaSzk+/JJgpCmRpHb7nKoG0AW+TsD+fdYsrfHes9inFD9ILNksQ31nG0JnubmIgM37HmZXfCujenNNkCcDfRpk9K5eKPSr2yPPD9bzR6mqkJY82BVO8VXTwlCkJ0FJ662ppjBk6IzJtGFyGJlpV+5lTCDMuf8xk5VERn+tKRjQ6OpcJPvflFHR23MgmmhPJ/FopPYMzKFw0MAZCwZU8U1C0UsnfiywyYBEmi63aO099CqE4aISr/Fkh57EKayL/9adW8+5PmuDRC3hhrCY3nLo3IRWKSNUlNNKACWWMN15zXWjWJ5mqN84rVcqQBuliLQM9sW+T8QGUDLdl3uulBLuP9vsNz0c9y3ySf4wIlcjlW3hZ1F/J6FEeEbnhzpB6RTnHgSqlE51TtawmssSDHnQVHWLLvi19eFIpj6C15mdc4U X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.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:57:25.2840 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01224c79-a59e-4a41-ce23-08dc3cfaa8e9 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6402 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=3fb48407081ae377a19ebed021b03896a904c2ad Thanks. Xueming Li --- >From 3fb48407081ae377a19ebed021b03896a904c2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Kuka?= Date: Wed, 3 Jan 2024 12:10:35 +0100 Subject: [PATCH] net/bonding: fix flow count query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 02a2accb5f54183d448edf35902b71023ab908ac ] The rte_flow_query_count structure returned from the bonding driver always indicates that hits and bytes are invalid (bytes_set and hits_set flags are zero) because bond_flow_query_count() from the net/bonding driver does not set the bytes_set and hits_set flags. Fixes: 49dad9028e2a ("net/bonding: support flow API") Signed-off-by: Mário Kuka Acked-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_flow.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_flow.c b/drivers/net/bonding/rte_eth_bond_flow.c index 71a91675f7..5d0be5caf5 100644 --- a/drivers/net/bonding/rte_eth_bond_flow.c +++ b/drivers/net/bonding/rte_eth_bond_flow.c @@ -180,6 +180,8 @@ bond_flow_query_count(struct rte_eth_dev *dev, struct rte_flow *flow, count->bytes = 0; count->hits = 0; + count->bytes_set = 0; + count->hits_set = 0; rte_memcpy(&member_count, count, sizeof(member_count)); for (i = 0; i < internals->member_count; i++) { ret = rte_flow_query(internals->members[i].port_id, @@ -192,8 +194,12 @@ bond_flow_query_count(struct rte_eth_dev *dev, struct rte_flow *flow, } count->bytes += member_count.bytes; count->hits += member_count.hits; + count->bytes_set |= member_count.bytes_set; + count->hits_set |= member_count.hits_set; member_count.bytes = 0; member_count.hits = 0; + member_count.bytes_set = 0; + member_count.hits_set = 0; } return 0; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.125738104 +0800 +++ 0104-net-bonding-fix-flow-count-query.patch 2024-03-05 17:39:30.883566497 +0800 @@ -1 +1 @@ -From 02a2accb5f54183d448edf35902b71023ab908ac Mon Sep 17 00:00:00 2001 +From 3fb48407081ae377a19ebed021b03896a904c2ad Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 02a2accb5f54183d448edf35902b71023ab908ac ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org