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 7B18246468 for ; Mon, 24 Mar 2025 17:18:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7540940DC9; Mon, 24 Mar 2025 17:18:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5E5C840A7F for ; Mon, 24 Mar 2025 17:18:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833094; 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=q5gEZgDDHvl88fS9YTeIKU1P+K6XzBi6s9SUuHR4KEQ=; b=TV1YGhrDqKdbyvBMZJS9+wXTz6aFFWzhTDb+FiWwW65LnZ6bcys/5+iqKf7mO15Mlk39/1 JLJ7ioSEoeF6QYW6avdE80FMblyZ/drOfuu4aFKz1P1mx7ND44ZIqpeltjfdX2LOT4OOMc wjasVtCESA41i1OHufPXJiyg+LLM3do= Received: from mx-prod-mc-05.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-639-dznkQ948MVOJPzNA8dpuqQ-1; Mon, 24 Mar 2025 12:18:10 -0400 X-MC-Unique: dznkQ948MVOJPzNA8dpuqQ-1 X-Mimecast-MFC-AGG-ID: dznkQ948MVOJPzNA8dpuqQ_1742833089 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78FF21933B63; Mon, 24 Mar 2025 16:18:09 +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 E43CF30001A1; Mon, 24 Mar 2025 16:18:07 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix GTP flags matching' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:20 +0000 Message-ID: <20250324161731.63950-13-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: 7YNhz41w10zMOze7ddBpr-aZl4hM-d0MOcT4awhfXVY_1742833089 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/f998084dbb7a718806e1fa59b36513f2f0e40db5 Thanks. Kevin --- >From f998084dbb7a718806e1fa59b36513f2f0e40db5 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 27 Feb 2025 12:49:40 +0200 Subject: [PATCH] net/mlx5/hws: fix GTP flags matching [ upstream commit a31da10717be6a79877621e94eeb003f547c5f88 ] Support GTP flags in non-template on top of HWS. Currently, only extension flag was supported, Added support to all bits under v_pt_rsv_flags. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 12 ++++++------ drivers/net/mlx5/hws/mlx5dr_definer.h | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 399cb1013a..4af24c788a 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -200,5 +200,5 @@ struct mlx5dr_definer_conv_data { X(SET_BE32, gtp_teid, v->hdr.teid, rte_flow_item_gtp) \ X(SET, gtp_msg_type, v->hdr.msg_type, rte_flow_item_gtp) \ - X(SET, gtp_ext_flag, !!v->hdr.gtp_hdr_info, rte_flow_item_gtp) \ + X(SET, gtp_flags, v->hdr.gtp_hdr_info, rte_flow_item_gtp) \ X(SET, gtp_next_ext_hdr, GTP_PDU_SC, rte_flow_item_gtp_psc) \ X(SET, gtp_ext_hdr_pdu, v->hdr.type, rte_flow_item_gtp_psc) \ @@ -1435,5 +1435,5 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, return 0; - if (m->hdr.plen || m->hdr.gtp_hdr_info & ~MLX5DR_DEFINER_GTP_EXT_HDR_BIT) { + if (m->msg_len) { rte_errno = ENOTSUP; return rte_errno; @@ -1457,9 +1457,9 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, return rte_errno; } - fc = &cd->fc[MLX5DR_DEFINER_FNAME_GTP_EXT_FLAG]; + fc = &cd->fc[MLX5DR_DEFINER_FNAME_GTP_FLAGS]; fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_gtp_ext_flag_set; - fc->bit_mask = __mlx5_mask(header_gtp, ext_hdr_flag); - fc->bit_off = __mlx5_dw_bit_off(header_gtp, ext_hdr_flag); + fc->tag_set = &mlx5dr_definer_gtp_flags_set; + fc->bit_mask = __mlx5_mask(header_gtp, v_pt_rsv_flags); + fc->bit_off = __mlx5_dw_bit_off(header_gtp, v_pt_rsv_flags); fc->byte_off = caps->format_select_gtpu_dw_0 * DW_SIZE; } diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h index 092b1b3b10..d0c99399ae 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.h +++ b/drivers/net/mlx5/hws/mlx5dr_definer.h @@ -111,4 +111,5 @@ enum mlx5dr_definer_fname { MLX5DR_DEFINER_FNAME_GTP_MSG_TYPE, MLX5DR_DEFINER_FNAME_GTP_EXT_FLAG, + MLX5DR_DEFINER_FNAME_GTP_FLAGS, MLX5DR_DEFINER_FNAME_GTP_NEXT_EXT_HDR, MLX5DR_DEFINER_FNAME_GTP_EXT_HDR_PDU, @@ -607,10 +608,15 @@ enum mlx5dr_definer_gtp { struct mlx5_ifc_header_gtp_bits { - u8 version[0x3]; - u8 proto_type[0x1]; - u8 reserved1[0x1]; - u8 ext_hdr_flag[0x1]; - u8 seq_num_flag[0x1]; - u8 pdu_flag[0x1]; + union { + u8 v_pt_rsv_flags[0x8]; + struct { + u8 version[0x3]; + u8 proto_type[0x1]; + u8 reserved1[0x1]; + u8 ext_hdr_flag[0x1]; + u8 seq_num_flag[0x1]; + u8 pdu_flag[0x1]; + }; + }; u8 msg_type[0x8]; u8 msg_len[0x8]; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.274671555 +0000 +++ 0013-net-mlx5-hws-fix-GTP-flags-matching.patch 2025-03-24 16:15:14.749735496 +0000 @@ -1 +1 @@ -From a31da10717be6a79877621e94eeb003f547c5f88 Mon Sep 17 00:00:00 2001 +From f998084dbb7a718806e1fa59b36513f2f0e40db5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a31da10717be6a79877621e94eeb003f547c5f88 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a4b9306d2b..5272119bcb 100644 +index 399cb1013a..4af24c788a 100644 @@ -31 +32 @@ -@@ -1464,5 +1464,5 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, +@@ -1435,5 +1435,5 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, @@ -38 +39 @@ -@@ -1486,9 +1486,9 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, +@@ -1457,9 +1457,9 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd,