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 52BBB45C9B for ; Tue, 12 Nov 2024 23:08:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D6B44064C; Tue, 12 Nov 2024 23:08:43 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 1BAD4406BB for ; Tue, 12 Nov 2024 23:08:42 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-37d41894a32so52611f8f.1 for ; Tue, 12 Nov 2024 14:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449322; x=1732054122; 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=6b5FB3msYxqOHcnSOVpJcuwhD+m7MP8Wc0rtW6yjSF8=; b=TvzNcrrHz0MfAzk4ozcCZfoJFy4BidTmq4E6xbJiqfGY2ZYfeu9HQ+9ckGE2UvRiXP V9961HB00wmdzqF8sRyTkrK2xiCBDOW94ArVEcozgP9mdnx4igpEJk4o3ejHuo6Tq09Z WZdeBE1ZdYh0o2dmSXqdvKbsl0+6uXQv+qibvn+CrpRXU/p6I4wfzuLKIx8rk7nSa+DJ QgKEJXzx5UgOAiycuOa0En38+oSjCC8pxbdfTImpkcC2lQ2p5ddXmKx4GTUcf06f/qjO lkUiFsGumg5lHQ0LZFVgndcGdjJhvtDq6qQPaSK1qYsveNQS+0cKolICnQBmN6IIitvO QGPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449322; x=1732054122; 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=6b5FB3msYxqOHcnSOVpJcuwhD+m7MP8Wc0rtW6yjSF8=; b=N8cQg54bOa+MMJMGd1Gso/8QaoiG53mXNakVD0LvGXMICL/kT9cXtjPGgg21LowCU5 ly07/s6E4UnzNiF2XVu8/16eFGF9bETCicsgT0nsiGuE5n9EeWVpokn7F/p2Pq4YMGGm mzd92fU49I5QzEUvg8j3FIQ8ZtjJvosHOfuB4XEQs2TkG37z5YA9z/kBacFZNvId3WUY OuGLy1f7J/LHKBsmRowFYU6fuUDS5Is1vEBsNgp8975Fc0mpYPmrBhcRhiRf5Po3MwxM etdpUrJ0cmRl6qTO0LnU6i1lvtMkxWJ+gIBLJw3lcKpc1NQ8UJUAflA/L+sCHwhrxNbV gf8g== X-Forwarded-Encrypted: i=1; AJvYcCXaZy2fwrvaWTzDVWT7XJN/SIi2NTsSzr0Zh8hlqQfo1Qi6HwfvoIqZC9lNRWT8HCoG5IuRDDE=@dpdk.org X-Gm-Message-State: AOJu0YxaxsK9KYyfAfIX8ItS9syIis+wH4mKCq/rnVlXFbNdQ+Tpw63E Pd/9R1rg//fnzwFFNXGC2PzeLHfICfkItHWUFt68rFPWr2dNHAgv4KdV5g== X-Google-Smtp-Source: AGHT+IF0SSdGRM7ZFpE68qjVAXwzH9Z4cCLs+dltcrsapPUprtpIPTlN8KXZ1woWpKbn2fikhQu9HQ== X-Received: by 2002:a05:6000:184b:b0:374:bd00:d1e with SMTP id ffacd0b85a97d-381f0f40da8mr16470846f8f.3.1731449321565; Tue, 12 Nov 2024 14:08:41 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed9ea4c5sm16704693f8f.76.2024.11.12.14.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:40 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix SQ flow item size' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:22 +0000 Message-ID: <20241112220754.666489-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/f2a35164aab320bffe2240fc837a9461a66d2adf Thanks. Luca Boccassi --- >From f2a35164aab320bffe2240fc837a9461a66d2adf Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 16:09:40 +0200 Subject: [PATCH] net/mlx5: fix SQ flow item size [ upstream commit 7c66fa49ddcce1981c2fa3a0c024ec82b036639c ] Expand the size of struct mlx5_rte_flow_item_sq to 64 bits on 64-bit systems. This aligns with DPDK's assumption that PMD private data has pointer size when copying flow items with rte_flow_conv.[1] Previously, the struct was defined as 32 bits, causing DPDK to incorrectly assign an additional 32 bits when copying MLX5_RTE_FLOW_ITEM_TYPE_SQ items on 64-bit systems. This fix ensures proper memory alignment and prevents potential buffer overflows when DPDK copies MLX5_RTE_FLOW_ITEM_TYPE_SQ items. [1]: commit 6cf72047332b ("ethdev: support flow elements with variable length") Fixes: 75a00812b18f ("net/mlx5: add hardware steering item translation") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 4f3a216ed4..1aff287616 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -117,6 +117,9 @@ struct mlx5_flow_action_copy_mreg { /* Matches on source queue. */ struct mlx5_rte_flow_item_sq { uint32_t queue; /* DevX SQ number */ +#ifdef RTE_ARCH_64 + uint32_t reserved; +#endif }; /* Feature name to allocate metadata register. */ -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.087437604 +0000 +++ 0012-net-mlx5-fix-SQ-flow-item-size.patch 2024-11-12 22:06:58.655307014 +0000 @@ -1 +1 @@ -From 7c66fa49ddcce1981c2fa3a0c024ec82b036639c Mon Sep 17 00:00:00 2001 +From f2a35164aab320bffe2240fc837a9461a66d2adf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7c66fa49ddcce1981c2fa3a0c024ec82b036639c ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 9a8eccdd25..f5866af231 100644 +index 4f3a216ed4..1aff287616 100644 @@ -33 +34 @@ -@@ -168,6 +168,9 @@ struct mlx5_flow_action_copy_mreg { +@@ -117,6 +117,9 @@ struct mlx5_flow_action_copy_mreg { @@ -42 +43 @@ - /* Map from registers to modify fields. */ + /* Feature name to allocate metadata register. */