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 6C2DC42ECF for ; Thu, 20 Jul 2023 17:25:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68E8842D53; Thu, 20 Jul 2023 17:25:31 +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 5BD8140685 for ; Thu, 20 Jul 2023 17:25:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866728; 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=3Pbu/cvZcvAtLJ0ba5ACGhbfe9UsxSG6wmvscaaEf2I=; b=BQHjLVhHuSCZ5o8kovtMvHFie6+i1sN78cP6Bospjz2/pivr+QxYLYGqq8feVMJS9lEHVc bf6dH53RRgI8Tb14B5KAsPkL21pCXP5Sh9cr4Os9jxtW4ey8OTEaWHIYHUzZvasWFwzbf+ o3IS8gyTLBaN83VFhmj2dMdpsu2kGdY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-100-8wiSb7fUPf6EWW4xvxxh1w-1; Thu, 20 Jul 2023 11:24:34 -0400 X-MC-Unique: 8wiSb7fUPf6EWW4xvxxh1w-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 A70EC88D51C; Thu, 20 Jul 2023 15:23:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B9FC492C13; Thu, 20 Jul 2023 15:23:30 +0000 (UTC) From: Kevin Traynor To: Xiao Liang Cc: Konstantin Ananyev , Radu Nicolau , dpdk stable Subject: patch 'ipsec: fix NAT-T header length' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:31 +0100 Message-ID: <20230720151942.262154-140-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/aabb9693644d0e25ff6dabb3ae656bd53ddf1fcf Thanks. Kevin --- >From aabb9693644d0e25ff6dabb3ae656bd53ddf1fcf Mon Sep 17 00:00:00 2001 From: Xiao Liang Date: Tue, 11 Jul 2023 10:18:47 +0800 Subject: [PATCH] ipsec: fix NAT-T header length [ upstream commit 5d89d22e9e49771059ecc6383aa4313394fc72f7 ] UDP header and L2 header (if any) length is included in sa->hdr_len. Take care of that in L3 header and packet length calculation. Fixes: 01eef5907fc3 ("ipsec: support NAT-T") Signed-off-by: Xiao Liang Acked-by: Konstantin Ananyev Acked-by: Radu Nicolau --- lib/ipsec/esp_outb.c | 2 +- lib/ipsec/sa.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c index 1b0eeed07f..969eff5a6b 100644 --- a/lib/ipsec/esp_outb.c +++ b/lib/ipsec/esp_outb.c @@ -200,5 +200,5 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, (ph + sa->hdr_len - sizeof(struct rte_udp_hdr)); udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len - - sa->hdr_l3_off - sa->hdr_len); + sa->hdr_len + sizeof(struct rte_udp_hdr)); } diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c index c921699390..ccf40f0371 100644 --- a/lib/ipsec/sa.c +++ b/lib/ipsec/sa.c @@ -375,5 +375,5 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm) /* update l2_len and l3_len fields for outbound mbuf */ sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off, - sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0); + prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0); esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:11.451583888 +0100 +++ 0140-ipsec-fix-NAT-T-header-length.patch 2023-07-20 16:17:55.226752815 +0100 @@ -1 +1 @@ -From 5d89d22e9e49771059ecc6383aa4313394fc72f7 Mon Sep 17 00:00:00 2001 +From aabb9693644d0e25ff6dabb3ae656bd53ddf1fcf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5d89d22e9e49771059ecc6383aa4313394fc72f7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 9cbd9202f6..ec87b1dce2 100644 +index 1b0eeed07f..969eff5a6b 100644 @@ -24 +25 @@ -@@ -199,5 +199,5 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, +@@ -200,5 +200,5 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, @@ -32 +33 @@ -index 59a547637d..2297bd6d72 100644 +index c921699390..ccf40f0371 100644 @@ -35 +36 @@ -@@ -372,5 +372,5 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm) +@@ -375,5 +375,5 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)