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 AA02343E57 for ; Sat, 13 Apr 2024 15:00:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A433D40294; Sat, 13 Apr 2024 15:00:00 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2046.outbound.protection.outlook.com [40.107.244.46]) by mails.dpdk.org (Postfix) with ESMTP id 9F79C400D6 for ; Sat, 13 Apr 2024 14:59:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSWOPGOhQXFez1OWa9O66IRIftK+OxRKrpA1akPbZ1YBZDnpdOmEJbeHnanbph4KBE1Fy3meBbt657VxbUHA0llHvbunWnr3igjVk44eCpVwbygQTloSR8btBHz/IiORZSz1bhcuwPBK6bZgL6DwqJ5jg46UQDKqNCPVvfGu4jxRupLyvRuNXO9k41bx0ab/MtjIKlqIRTfgtIu9ISoAfKGKJG4YsjKRy+NER8ZncY9ROVa5VjL2shYRyU9dRM9UkhNiFw9d3GRp37pHSfRMv0j3GBKBNZ1Uk7U0Zn3dMA1zDCoT8500KNF3DfG7+ulANDid7vEYSQtEJHrowC4mhQ== 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=Kw1CA4HLl/ppTIYanJ98Fh1aYWQohVdnVfWGTM2pmg4=; b=YllmSwlFZoi/jdx+XD4Ga3xMW8GYMpQi00pbv8oGHEhSuyHtaKj2nt9mv9HHQrXjcPQ44SlbbV32W8dM9Unc3dxK4cISjsibyXqKsFHh647iGFGNMK8sJBYJ3sDkfHo1mObLvsK6BpMtdXbGrIUCyJPUxxrdGFGGjPkECJZ98pitwgTk0aI62GVmGTXDFfXXh1fm040g65jolXzK2zFaC554+/9T1UxyYaIhFRoqlfMkkYf/LM3GRCgoyILjMs5ghZRzC9ZP3r+M4coII8GiCqMQMnabzIX6D9dFzIcfxvhbxySNv++mEXZbiYvXqRreUbJXTVxPiR0GrzpOVL6wBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org 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=Kw1CA4HLl/ppTIYanJ98Fh1aYWQohVdnVfWGTM2pmg4=; b=ei7/CPCeq1LNF0p0VO/PY2JBTyKVM+AhB01ZvRkORhkTQk0IfHx2kbM7BZ1iYzmWDFhxzJ3iFmrjdiAeUU3V6q8NNnEHS9MBshug7Gj61O/23Yv1uhGHALT2gRJXGdqiX7CzAkTql/HSqYUMzXZPpgnEzbN/ktLxbpPZCS5J40qnglsPg3PQgDCMm2THKPBNzj2WY95brTlW9T54KapTzD5RhEpR7jUX/4djYy//rIxIdNoj4VdJksZg12nMddLZHreKRaAFDsOpP/ykokjj1CMdZuzefrCxGnhg1yO9Ahq75S4gfD/WyH6nIp+NopNy6bXEhvA+T9F82OScGg2qzw== Received: from SJ0PR05CA0046.namprd05.prod.outlook.com (2603:10b6:a03:33f::21) by DS0PR12MB8041.namprd12.prod.outlook.com (2603:10b6:8:147::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:59:56 +0000 Received: from MWH0EPF000989E8.namprd02.prod.outlook.com (2603:10b6:a03:33f:cafe::38) by SJ0PR05CA0046.outlook.office365.com (2603:10b6:a03:33f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.16 via Frontend Transport; Sat, 13 Apr 2024 12:59:56 +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 MWH0EPF000989E8.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:59:56 +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; Sat, 13 Apr 2024 05:59:47 -0700 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; Sat, 13 Apr 2024 05:59:46 -0700 From: Xueming Li To: Bing Zhao CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix age position in hairpin split' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:46 +0800 Message-ID: <20240413125005.725659-106-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E8:EE_|DS0PR12MB8041:EE_ X-MS-Office365-Filtering-Correlation-Id: 32151e1e-f63d-4fdb-862d-08dc5bb99e53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bVNqLndGEhAQ7gYlDbQllcId9y3T3Ar+yVh5bqASgHU5FBD/nAunoJz9mrnKfG0ppsBVjCgL2D9nFsE7MJ7nR2KkJ4VuL5J9nwOeKCEzhAh8BBU+794UKuoOdmNrTF295E0mxYa8D0yBNBgP/pwgjMQTW/zzMjyrZaCvO5IW2iZaKjA4Zrsi44r8RFEmwNwqNSIf2ph7JVk8PfVtRtLnV4Kx9dMZxN7NwVoHd5yesqFOeCMdNLyNuadNpTaaILmeea3EfCEi+kQ28V9I6wbNtInOm4QBQzI9kTsoB2aP9HikXhgpug6US08WAPZJGt1Kb83B5KxukTAtc7xNhTCEb/F8TXzTQb7sn17Mqgbt8GEXjq/ZuOnRdaXLfCWvMEAjLjf0HI3vKeXrAqeVOL/uLIY21zL9PXLDAsgFbFkpkvzD1ZjAZO0dLixel8AnW9AvKL0NfDcgrakRwP5GEGIt1SGVZrGCUzN2I0juc8EHG8+/WKYiI5SJgY5Jd7MPAQHJquouqbxBEyLrcmESY5Zrpog+5kR19WDxOaq8UroAhYImmiHPoyHDl2b+dbVoGKn0b7jioCO8zv0yJsOuPBuj94LCuQ2m4rzK7PW6mMDMaYWXKvL933Rqn5Qf/vNAfrThIpswJ1MycZzyJkpo+5GaCbR3ZK3gAhXs96S2bsseN3Jtf3c4HjDvLXPgKtjVVj+JMZPxWmSRJUIJnwkOf9hlVgu9QH4sWkp3RCfYwB4FDnz8Y7kEO5Om+qW9PTtR/loS 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)(1800799015)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:59:56.2181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32151e1e-f63d-4fdb-862d-08dc5bb99e53 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: MWH0EPF000989E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8041 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 04/15/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=9aba4dee4d43bfc96d4a15be0b77c9fb9301d513 Thanks. Xueming Li --- >From 9aba4dee4d43bfc96d4a15be0b77c9fb9301d513 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Thu, 7 Mar 2024 10:09:24 +0200 Subject: [PATCH] net/mlx5: fix age position in hairpin split Cc: Xueming Li [ upstream commit 4c89815eab7471b98388dc958b95777d341f05fc ] When splitting a hairpin rule implicitly, the count action will be on either Tx or Rx subflow based on the encapsulation checking. Once there is a flow rule with both count and age action, one counter will be reused. If there is only age action and the ASO flow hit is supported, the flow hit will be chosen instead of a counter. In the previous flow splitting, the age would always be in the Rx part, while the count would be on the Tx part when there is an encap. Before this commit, 2 issues can be observed with a hairpin split: 1. On the root table, one counter was used on both Rx and Tx parts for age and count actions. Then one ingress packet will be counted twice. 2. On the non-root table, an extra ASO flow hit was used on the Rx part. This would cause some overhead. The age and count actions should be in the same subflow instead of 2. Fixes: daed4b6e3db2 ("net/mlx5: use aging by counter when counter exists") Signed-off-by: Bing Zhao Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow.c | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ee210549e7..ccfd189c1f 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5492,6 +5492,7 @@ flow_hairpin_split(struct rte_eth_dev *dev, } break; case RTE_FLOW_ACTION_TYPE_COUNT: + case RTE_FLOW_ACTION_TYPE_AGE: if (encap) { rte_memcpy(actions_tx, actions, sizeof(struct rte_flow_action)); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e36443436e..7688d97813 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -19094,8 +19094,7 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev, LIST_FOREACH(act, &age_info->aged_aso, next) { nb_flows++; if (nb_contexts) { - context[nb_flows - 1] = - act->age_params.context; + context[nb_flows - 1] = act->age_params.context; if (!(--nb_contexts)) break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:08.265894063 +0800 +++ 0106-net-mlx5-fix-age-position-in-hairpin-split.patch 2024-04-13 20:43:05.117753775 +0800 @@ -1 +1 @@ -From 4c89815eab7471b98388dc958b95777d341f05fc Mon Sep 17 00:00:00 2001 +From 9aba4dee4d43bfc96d4a15be0b77c9fb9301d513 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4c89815eab7471b98388dc958b95777d341f05fc ] @@ -26 +28,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index 6484874c35..f31fdfbf3d 100644 +index ee210549e7..ccfd189c1f 100644 @@ -39 +41 @@ -@@ -5399,6 +5399,7 @@ flow_hairpin_split(struct rte_eth_dev *dev, +@@ -5492,6 +5492,7 @@ flow_hairpin_split(struct rte_eth_dev *dev, @@ -48 +50 @@ -index 80239bebee..4badde1a9a 100644 +index e36443436e..7688d97813 100644 @@ -51 +53 @@ -@@ -19361,8 +19361,7 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev, +@@ -19094,8 +19094,7 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev,