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 DFDD041D8D for ; Mon, 27 Feb 2023 08:04:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC51F40A84; Mon, 27 Feb 2023 08:04:35 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2058.outbound.protection.outlook.com [40.107.93.58]) by mails.dpdk.org (Postfix) with ESMTP id 569C640A7D for ; Mon, 27 Feb 2023 08:04:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IkR8/Hn4KzuD4EsApA/IjkP/uoa2ZJzCaFiKaw+SMU8jmDMrmClshgyhHXrxxpBsHM/BvaZdOHSrUCpjH0Nv1q0oqoKv0yly5unW9g/RDymkKiPAdHwLZj1twyhrvBywW/u4VcOMD5WsmM423S7Iv7KrQChled3OABxPEbq/ab5V7l+AcDbWL1h4YF4dsKey4sUAZdUI8n0HS52AeGTFNTxhzsH0+XJmllr1V5grKoS97gK4izhU/3eJlxCXPvlCk8XfQS5sHmAZdq3egLXO1MKyic/3ihsc2rYXm84kttm3HZFlNUrkQpCLhoocLLTESH/u0xbWUBoy3IMsavP1SQ== 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=4buADKpW8ib59csuvidQx8SoIXFKXkFd41CCUu//VpY=; b=UpdVqPIIZn9cE9nHbeSrdOvxYQI9OZ0yWuVCQ63YAWJ8eP30WF+L6gSgW3DnInPnNn27tT1fmVFQQdH1Z23u/3RD9cI0juhx+dYW9SUJqKdY73XqjM2UwW0f0fjrJFXcYVLEQXlXp74MQ5KZt8HHYnw82F19vLjelQU//w+B3Qc4+W0WdBCl7aVJNJ36NTF0b+PfLQTrKvtAUov0HNBXBx1f35TEGIkjNLDPeU0+7CFo9glBtS6Z7Avam2yfo0gwF8f8/+2PEchZ5phijZ4OlH8w142s29sbn67Eq7Tqc2gxsHAWvo3KnvP2VPk+t0BnPZ0IVoFVx8V8CytI3bKkzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.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 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=4buADKpW8ib59csuvidQx8SoIXFKXkFd41CCUu//VpY=; b=fRx63uLY9/mr0iAxtkm/uqih1T7onxpYh7Z6uNj/RcGA8RBsw5zfJxaifUaOECKzLdxrrUFma9hOQJfmTkDHbNb8W1FRqJX/2mmT+n/yzHk/vyvyr9DhU2zE4hOigSCB6hhH1aeRFJQdBG6EROjCu3luxNI3iIK7ss0UDHar7XPKa/dLd+y/wiTB/P8ULd02vtGrMUiqQqk/Vu9n8DNTKk7YnAHD0uleO87agtjH9j9rfruNYZMsYlgpieIesvs5AMiFHre4Q0piV39WrLQ8Pd2P5HZmYejdCVDk/YP5pxOS2a17m+0qs3jR0K5UQCde9rCTKu9tgLWB1gDDKjhTtA== Received: from MW4PR04CA0209.namprd04.prod.outlook.com (2603:10b6:303:86::34) by CH2PR12MB4101.namprd12.prod.outlook.com (2603:10b6:610:a8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:04:32 +0000 Received: from CO1NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::57) by MW4PR04CA0209.outlook.office365.com (2603:10b6:303:86::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:04:32 +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 CO1NAM11FT089.mail.protection.outlook.com (10.13.175.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:04:32 +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.36; Sun, 26 Feb 2023 23:04:15 -0800 Received: from nvidia.com (10.126.231.37) 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.986.37; Sun, 26 Feb 2023 23:04:13 -0800 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: store counter reset before zeroing flow query' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:57 +0800 Message-ID: <20230227070107.15664-29-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-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.37] 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: CO1NAM11FT089:EE_|CH2PR12MB4101:EE_ X-MS-Office365-Filtering-Correlation-Id: 28f871a0-8f53-4bfd-e189-08db1890e078 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bFFGjyzqUM/OI0e//nIftZydngLbRPE6TkBORafsh7HiGHnYi+JHbpUnjrm0ralILHUG6TcZpNR8oHyfcnhjvFvlBZAlEgXCaPQWmSrLQp0CvzzTABNkDjemyoIzzxINmMrsxqW6X0wPXIv2zZ8Klr31n/88mH/M5QPc2x2s2zB2zlJD5b02rMUJeJIoIyHd1xj1Ob3T3UZRtZ2Eko0Y1d28IIywHEqWG7ZtUOlTfRiK+UGSatt26qSdEI5N4Jv6OPmMkzvyqIGRXON7Er2jREY/UASnwpO8T/L4oMlIHzyXY98gjyEjq94jyC8GfOfUiv8dk3hOfLM5jm+EucU6G3lSR5Mc+XIXPtfHYWLS+tHz967KQjl2BjEB8uRR7UIJ/8NCLPaC7knMO5MRI1zfBwcBo8Gz/vvVOoqez6HrOMXsmiFG3T7sxCTLQDBqZhkrSP5w03MiuL1fGcobNlGtZL6RAfBZIVhCULBtw0Vz7Z3l6uZ3Plai4ECW0R8048h7SSSDTwjbAF9XTXikw4BoWasTTiWp6yHEOihDCzIgX5DHduQgdQwkCkfWA4DbZBF5VVP5DPU9Z2kZWNowaAMiOtQKOt+vfus7janQnUh2TlWLR0teqT5ZzcdVke/xZYj4vKVs5grxe+8tlkbrhTWgzLJcTRLE0f4N7HFAbj54HqrfkpNi/c63bMtOL0obNZP1nqKCWSbkqh9oKMuYQ2LPtY8gZQ2+LtBVwC5Zc/BdEIqLFikjpyM/faux/9VxY8SLuAEhrD4G2f1qku3RWe+QvcmiOrugFGCzza5b9/aLm2RsLjn671Tpz3nich/6Gr7K 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:(13230025)(4636009)(136003)(346002)(376002)(396003)(39860400002)(451199018)(36840700001)(40470700004)(46966006)(82740400003)(7636003)(316002)(36860700001)(34020700004)(2906002)(36756003)(40460700003)(5660300002)(8936002)(40480700001)(55016003)(86362001)(53546011)(1076003)(70206006)(70586007)(26005)(186003)(6286002)(16526019)(6916009)(8676002)(4326008)(54906003)(41300700001)(356005)(2616005)(66574015)(336012)(82310400005)(426003)(478600001)(83380400001)(47076005)(7696005)(966005)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:04:32.1870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28f871a0-8f53-4bfd-e189-08db1890e078 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: CO1NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4101 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.2 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/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=375086efb5ad85cceee8ab3398125639d8544f80 Thanks. Xueming Li --- >From 375086efb5ad85cceee8ab3398125639d8544f80 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Fri, 9 Dec 2022 16:17:47 +0800 Subject: [PATCH] net/nfp: store counter reset before zeroing flow query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 3fe4706ad0d8e86adcd9088939c66d74ad6d7d56 ] The reset flag in the query structure are cleared by mistake, cause the flow count never be reset, so the query API will always has count value even the flow has stopped, and this will cause the flow never been aged. Fixes: 30ecce522732 ("net/nfp: support flow API") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 6f79d950db..d1d209ce13 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3809,6 +3809,7 @@ nfp_flow_stats_get(struct rte_eth_dev *dev, struct rte_flow *nfp_flow, void *data) { + bool reset; uint32_t ctx_id; struct rte_flow *flow; struct nfp_flow_priv *priv; @@ -3823,6 +3824,7 @@ nfp_flow_stats_get(struct rte_eth_dev *dev, } query = (struct rte_flow_query_count *)data; + reset = query->reset; memset(query, 0, sizeof(*query)); ctx_id = rte_be_to_cpu_32(nfp_flow->payload.meta->host_ctx_id); @@ -3834,7 +3836,7 @@ nfp_flow_stats_get(struct rte_eth_dev *dev, query->bytes = stats->bytes; query->hits_set = 1; query->bytes_set = 1; - if (query->reset != 0) { + if (reset) { stats->pkts = 0; stats->bytes = 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.899153400 +0800 +++ 0030-net-nfp-store-counter-reset-before-zeroing-flow-quer.patch 2023-02-27 14:08:40.739237000 +0800 @@ -1 +1 @@ -From 3fe4706ad0d8e86adcd9088939c66d74ad6d7d56 Mon Sep 17 00:00:00 2001 +From 375086efb5ad85cceee8ab3398125639d8544f80 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 3fe4706ad0d8e86adcd9088939c66d74ad6d7d56 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org