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 D51C343CAD for ; Thu, 14 Mar 2024 01:12:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3CBE42E71; Thu, 14 Mar 2024 01:12:20 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 38D4C42E50 for ; Thu, 14 Mar 2024 01:12:19 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4132f37e170so2441035e9.2 for ; Wed, 13 Mar 2024 17:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375139; x=1710979939; 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=zNGy7c9eZtw3yXkWrc44dvkWDifcmgIiGOBQZBRT4w0=; b=aoUKWWVGJjxgR2B8v9VSW2WL24/gJGtzgIYdylA1KlH5xJATxGtApPzFZDpxTJZQ3i t/MJVwQaf8hs9T4mdh35hhw0/yUTMxgi7jfr8uoulDcnUybiRjk6CkcHMPCbEqNLftem pHe7ahULPTjjKdyuHSW8rg0ucWLCN/CGw23p3/6w3ulcKoSfWHuyU0RhOcfhIasKzbBw 2R0J3kKaWaPDfCtp4V+D3RvmtJ5YJE7AbAb6R1Zld0YlEY0gbaVuaDYq/2N5B2zEEJmF VeeY2GMqmWYGvU98LzX+91aYSDbXrhG5jhieSbebCYh/LeJO3Ap0hbLnATme6ALRYX5W IenQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375139; x=1710979939; 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=zNGy7c9eZtw3yXkWrc44dvkWDifcmgIiGOBQZBRT4w0=; b=Nk12Fnzbf7GMUUQfM8Kr2xnckkkXoLh9Qqy8FgqWv4AASWj6gTDw5Wnyv58eHJ1b/0 2PlkfLAUEvLAIbd8J9o071dp4kvEwQcjiwv7IkiWk3lZVYCHF0BM0fmv3m+cCNEcC84z I7MAKCHNBolZ3aPg1YuDknAVgnRZWO++AC+2xpPQdmfZHBxlzADU90LEfzwSPFo8Ggi0 tFIsoprbjfdvQTkzArojbYLwLRrjEvWviY4PA0zoxWA8iT01VWhtZb1uvrOlGm25ksvQ Zh1csmVBZVPWtx2QDV9XooneFHuQFSNpFvXxVNoekNvX+TZJDb8j1IIEdQyQ5siNuPUP T9QQ== X-Forwarded-Encrypted: i=1; AJvYcCWEiyv2T0o69m+wJr8Mh/gXx8AjUtIJ76ENHEp0jMDlJaNNbQDK1m+cRig4AOgkyoB9Vy8B1jw+01iBgbzStZU= X-Gm-Message-State: AOJu0YyCUwFWjm/sWyrsL2vM/qyDsoMIhWsdzb8s9qhy53wuHnhr2q3R Z/WvfCmyagJgSDf34LNHQ1HLVA492da+Z6DM5h0OHi8t9NB4c/yw X-Google-Smtp-Source: AGHT+IHFbebt3U5g68I+x20xOfYbxmn4qD9qWfZeSzFDSA3rSOdgPQ2a7DhQmYF4WinIfnXCWFWa6w== X-Received: by 2002:a05:600c:19cd:b0:413:ea5a:7787 with SMTP id u13-20020a05600c19cd00b00413ea5a7787mr185023wmq.22.1710375138843; Wed, 13 Mar 2024 17:12:18 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id i9-20020a05600c354900b00413ef6826desm614678wmq.4.2024.03.13.17.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix conntrack action handle representation' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:41 +0000 Message-Id: <20240314000957.2810803-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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/16/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/c2a6e4ddcaae8b8c4872da94d014c1333e55020f Thanks. Luca Boccassi --- >From c2a6e4ddcaae8b8c4872da94d014c1333e55020f Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 27 Feb 2024 15:52:21 +0200 Subject: [PATCH] net/mlx5: fix conntrack action handle representation [ upstream commit 4487a79277a11bd5e78f57234b29b77b62f4e653 ] In mlx5 PMD, handles to indirect connection tracking flow actions are encoded in 32-bit unsigned integers as follows: - Bits 31-29 - indirect action type. - Bits 28-25 - port on which connection tracking action was created. - Bits 24-0 - index of connection tracking object. Macro defining a bit shift for owner part in this representation was incorrectly defined as 22. This patch fixes that, as well as aligns documented limitations. Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS") Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- doc/guides/nics/mlx5.rst | 4 ++-- drivers/net/mlx5/mlx5_flow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 239e297d2a..b047d7db58 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -561,8 +561,8 @@ Limitations - Cannot co-exist with ASO meter, ASO age action in a single flow rule. - Flow rules insertion rate and memory consumption need more optimization. - - 256 ports maximum. - - 4M connections maximum with ``dv_flow_en`` 1 mode. 16M with ``dv_flow_en`` 2. + - 16 ports maximum. + - 32M connections maximum. - Multi-thread flow insertion: diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index eb87f84166..42db9ba12a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -75,7 +75,7 @@ enum { /* Now, the maximal ports will be supported is 16, action number is 32M. */ #define MLX5_INDIRECT_ACT_CT_MAX_PORT 0x10 -#define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 22 +#define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 25 #define MLX5_INDIRECT_ACT_CT_OWNER_MASK (MLX5_INDIRECT_ACT_CT_MAX_PORT - 1) /* 29-31: type, 25-28: owner port, 0-24: index */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.762896602 +0000 +++ 0045-net-mlx5-fix-conntrack-action-handle-representation.patch 2024-03-14 00:09:20.657616094 +0000 @@ -1 +1 @@ -From 4487a79277a11bd5e78f57234b29b77b62f4e653 Mon Sep 17 00:00:00 2001 +From c2a6e4ddcaae8b8c4872da94d014c1333e55020f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4487a79277a11bd5e78f57234b29b77b62f4e653 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 6dce4f1c98..de286c67c8 100644 +index 239e297d2a..b047d7db58 100644 @@ -32 +33 @@ -@@ -814,8 +814,8 @@ Limitations +@@ -561,8 +561,8 @@ Limitations @@ -44 +45 @@ -index a4d0ff7b13..b4bf96cd64 100644 +index eb87f84166..42db9ba12a 100644 @@ -47 +48 @@ -@@ -77,7 +77,7 @@ enum mlx5_indirect_type { +@@ -75,7 +75,7 @@ enum {