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 427DE42ECF for ; Thu, 20 Jul 2023 17:22:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CD9642D2D; Thu, 20 Jul 2023 17:22:04 +0200 (CEST) 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 1D99B400D6 for ; Thu, 20 Jul 2023 17:22:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866522; 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=7UBVPZIAOivwTSGvODdwcizHpt4RtyiuKzOG3eCTosw=; b=ZAwcJj37m9Gfa5PahkMc0UxpPVGdq6h/8FBLRyHFv9PQ4GRPXzLHwxzB7O2C2jkpIXYSda fCYowVlqJ/6BZLKKeHz7m685OEpsw5I5jN7NNutv9mcfLlLKpqsDUHg9gzMzUYgMg98rwn lRqFOWxz1EF2YU1l6QTNZv0AVv5GmOw= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-28-O1UMV31ROM2zW1kALeJ51w-1; Thu, 20 Jul 2023 11:21:50 -0400 X-MC-Unique: O1UMV31ROM2zW1kALeJ51w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE75F1C0E0D4; Thu, 20 Jul 2023 15:21:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20BDD492C13; Thu, 20 Jul 2023 15:21:33 +0000 (UTC) From: Kevin Traynor To: Rahul Bhansali Cc: dpdk stable Subject: patch 'common/cnxk: fix IPsec IPv6 tunnel address byte swap' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:12 +0100 Message-ID: <20230720151942.262154-61-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 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 21.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 07/25/23. 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/6f685b45a69824160b39577d58973deb1a77e90c Thanks. Kevin --- >From 6f685b45a69824160b39577d58973deb1a77e90c Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 18 May 2023 21:18:58 +0530 Subject: [PATCH] common/cnxk: fix IPsec IPv6 tunnel address byte swap [ upstream commit 733e9db805c3317e2d158906afa4385744855844 ] Fix the IPsec IPv6 tunnel address bytes swap during SA configurations in session create/update. Fixes: 78d03027f2cc ("common/cnxk: add IPsec common code") Signed-off-by: Rahul Bhansali --- drivers/common/cnxk/cnxk_security.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c index 787138b059..7f4f0a643b 100644 --- a/drivers/common/cnxk/cnxk_security.c +++ b/drivers/common/cnxk/cnxk_security.c @@ -202,4 +202,12 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa) } +static void +ot_ipsec_update_ipv6_addr_endianness(uint64_t *addr) +{ + *addr = rte_be_to_cpu_64(*addr); + addr++; + *addr = rte_be_to_cpu_64(*addr); +} + static int ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, @@ -238,4 +246,8 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, sizeof(struct in6_addr)); + /* IP Source and Dest are in LE/CPU endian */ + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr); + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr); + break; default: @@ -422,4 +434,8 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa, sizeof(struct in6_addr)); + /* IP Source and Dest are in LE/CPU endian */ + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr); + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr); + /* Outer header flow label source */ if (!ipsec_xfrm->options.copy_flabel) { -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:02.397138585 +0100 +++ 0061-common-cnxk-fix-IPsec-IPv6-tunnel-address-byte-swap.patch 2023-07-20 16:17:54.831751202 +0100 @@ -1 +1 @@ -From 733e9db805c3317e2d158906afa4385744855844 Mon Sep 17 00:00:00 2001 +From 6f685b45a69824160b39577d58973deb1a77e90c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 733e9db805c3317e2d158906afa4385744855844 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 79427d48fe..13ca2c7791 100644 +index 787138b059..7f4f0a643b 100644 @@ -21 +22 @@ -@@ -275,4 +275,12 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa) +@@ -202,4 +202,12 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa) @@ -34 +35 @@ -@@ -311,4 +319,8 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, +@@ -238,4 +246,8 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, @@ -43 +44 @@ -@@ -500,4 +512,8 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa, +@@ -422,4 +434,8 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,