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 3BB7746468 for ; Mon, 24 Mar 2025 17:18:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3575940DCB; Mon, 24 Mar 2025 17:18:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0D4FB40DCE for ; Mon, 24 Mar 2025 17:18:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a/Swe8fHh0/Hz6lHTapwRxbSbwsxqYlEdIbi8GY7kuM=; b=RKShN223jLfwY6uI3+rVNcxVk7u5gxk4kWn//VUkKjl4srty8AlFq9IpPN6aRFfVE0m3D0 TcPNwnxVD3iy/U8axKqhu/wMSCJQ+c6D+kK/jCZFpClmZLZB6ScDjlsvG+8e7czTcyQUOr lsxfDVpCOMGmTNWtwAsTA8HtVCcVD2w= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-VbAMl6Q5N7ma69bsYjPjnQ-1; Mon, 24 Mar 2025 12:18:03 -0400 X-MC-Unique: VbAMl6Q5N7ma69bsYjPjnQ-1 X-Mimecast-MFC-AGG-ID: VbAMl6Q5N7ma69bsYjPjnQ_1742833083 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E818518EBE9B; Mon, 24 Mar 2025 16:18:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.16]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2B94B30001A1; Mon, 24 Mar 2025 16:18:00 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix crash using represented port without ID' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:17 +0000 Message-ID: <20250324161731.63950-10-ktraynor@redhat.com> In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com> References: <20250324161731.63950-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: obJK8p3OOCnEboFBYO7LDJSPWR5-V_KU_S2nkYWWNJo_1742833083 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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/28/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9a3c182073ca565958fe5e9c59653e064efa08fc Thanks. Kevin --- >From 9a3c182073ca565958fe5e9c59653e064efa08fc Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 27 Feb 2025 12:33:29 +0200 Subject: [PATCH] net/mlx5/hws: fix crash using represented port without ID [ upstream commit 1de93ca6aee6acb785c8080f84da26b09835af0f ] For non-template API on top of HWS, when trying to use represented-port item w/o setting the ethdev_port_id, it crashes. Added default values to match the case for SWS. Default port is now eswitch manager id. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 837e0c47bd..399cb1013a 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -744,8 +744,9 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, { const struct rte_flow_item_ethdev *v = item_spec; - const struct flow_hw_port_info *port_info; + const struct flow_hw_port_info *port_info = NULL; uint32_t regc_value; - port_info = flow_hw_conv_port_id(fc->dr_ctx, v->port_id); + if (v) + port_info = flow_hw_conv_port_id(fc->dr_ctx, v->port_id); if (unlikely(!port_info)) regc_value = BAD_PORT; @@ -1557,8 +1558,9 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, { struct mlx5dr_cmd_query_caps *caps = cd->ctx->caps; - const struct rte_flow_item_ethdev *m = item->mask; + uint16_t port_id = item->mask ? + ((const struct rte_flow_item_ethdev *)(item->mask))->port_id : 0; struct mlx5dr_definer_fc *fc; - if (m->port_id) { + if (port_id) { if (!caps->wire_regc_mask) { DR_LOG(ERR, "Port ID item not supported, missing wire REGC mask"); @@ -1575,8 +1577,4 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, fc->bit_mask = caps->wire_regc_mask >> fc->bit_off; fc->dr_ctx = cd->ctx; - } else { - DR_LOG(ERR, "Pord ID item mask must specify ID mask"); - rte_errno = EINVAL; - return rte_errno; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.164897745 +0000 +++ 0010-net-mlx5-hws-fix-crash-using-represented-port-withou.patch 2025-03-24 16:15:14.728735410 +0000 @@ -1 +1 @@ -From 1de93ca6aee6acb785c8080f84da26b09835af0f Mon Sep 17 00:00:00 2001 +From 9a3c182073ca565958fe5e9c59653e064efa08fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1de93ca6aee6acb785c8080f84da26b09835af0f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 98d670fc1c..a4b9306d2b 100644 +index 837e0c47bd..399cb1013a 100644 @@ -26 +27 @@ -@@ -773,8 +773,9 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, +@@ -744,8 +744,9 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc, @@ -38 +39 @@ -@@ -1586,8 +1587,9 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, +@@ -1557,8 +1558,9 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, @@ -50 +51 @@ -@@ -1604,8 +1606,4 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd, +@@ -1575,8 +1577,4 @@ mlx5dr_definer_conv_item_port(struct mlx5dr_definer_conv_data *cd,