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 B9FE4A0350 for ; Mon, 21 Feb 2022 16:43:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B49644013F; Mon, 21 Feb 2022 16:43:04 +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 3370E410E0 for ; Mon, 21 Feb 2022 16:43:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458182; 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=gzwecqFH0nsDdVJNZxHsteOoIyJjXzd6qHCzTHwcIxs=; b=fXY4j0aKtbzgvm4Bt1mFT2mNTKPaz3RnqI3YlpduOnBfAwZYXVjpxDpFEeris75uWiD2FR 54ptjjJCtU0en886VN55j/8u9xyEBRfz1xJbeYkiH7Wu2IClfSPzMFdUSyPtU9NP/ME7Cj nvF2jNPNXCoMHIvYt69ev0RJef5667g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-428-AHku-acTN8q1esv_tueI0w-1; Mon, 21 Feb 2022 10:42:58 -0500 X-MC-Unique: AHku-acTN8q1esv_tueI0w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5EF11091DA0; Mon, 21 Feb 2022 15:42:57 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDC6A7E131; Mon, 21 Feb 2022 15:42:56 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: dpdk stable Subject: patch 'net/mlx5: fix metadata endianness in modify field action' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:02 +0000 Message-Id: <20220221153625.152324-173-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 02/26/22. 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/c9a140e15bcc47c0b00f0e3ca6912c34449ae736 Thanks. Kevin --- >From c9a140e15bcc47c0b00f0e3ca6912c34449ae736 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Thu, 3 Feb 2022 10:46:51 +0200 Subject: [PATCH] net/mlx5: fix metadata endianness in modify field action [ upstream commit ced4900cdec2a957cf7def05dfb076c089a32e66 ] As modify field action immediate source parameter the metadata should follow the CPU endianness (according to SET_META action structure format), and mlx5 PMD wrongly handled the immediate parameter metadata buffer as big-endian, resulting in wrong metadata set action with incorrect endianness. Fixes: 40c8fb1fd3b3 ("net/mlx5: update modify field action") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index af90a7fd0a..10ef2af06a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1868,5 +1868,5 @@ flow_dv_convert_action_modify_field {0, 0, 0} }; uint32_t mask[MLX5_ACT_MAX_MOD_FIELDS] = {0, 0, 0, 0, 0}; - uint32_t type; + uint32_t type, meta = 0; uint32_t shift = 0; @@ -1881,4 +1881,9 @@ flow_dv_convert_action_modify_field (void *)(uintptr_t)conf->src.pvalue : (void *)(uintptr_t)&conf->src.value; + if (conf->dst.field == RTE_FLOW_FIELD_META) { + meta = *(const unaligned_uint32_t *)item.spec; + meta = rte_cpu_to_be_32(meta); + item.spec = &meta; + } } else { type = MLX5_MODIFICATION_TYPE_COPY; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.288522390 +0000 +++ 0173-net-mlx5-fix-metadata-endianness-in-modify-field-act.patch 2022-02-21 15:22:44.344704696 +0000 @@ -1 +1 @@ -From ced4900cdec2a957cf7def05dfb076c089a32e66 Mon Sep 17 00:00:00 2001 +From c9a140e15bcc47c0b00f0e3ca6912c34449ae736 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ced4900cdec2a957cf7def05dfb076c089a32e66 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org