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 7182CA0032 for ; Fri, 24 Jun 2022 17:02:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DB304280C; Fri, 24 Jun 2022 17:02:18 +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 1A6924280C for ; Fri, 24 Jun 2022 17:02:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082935; 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=XpVypuGUoQrhlxqbUmaz5aN59rdB/oE0FxFrzSLLztw=; b=Dx2wSRMyqzEbYNsZbf9fCspvmcFNwfTdErsJTOcJbfkomkaQoInMFyIsrp8mxC2pNZJzxH VvKGpMOMMpIr2KCE49Q2DIlyzKnGrUapCfIE4mQNHR8RfPFcEzEU+KqGAa5cpsSDaKYBY9 TL9ljKQAShuZV4dJHfpk6m2D/1fb4qk= 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-292-JH72LaoAMu-I69d9Vaa8AA-1; Fri, 24 Jun 2022 11:02:12 -0400 X-MC-Unique: JH72LaoAMu-I69d9Vaa8AA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37792101E989; Fri, 24 Jun 2022 15:02:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48D3610725; Fri, 24 Jun 2022 15:02:11 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Fan Zhang , dpdk stable Subject: patch 'net/iavf: fix NAT-T payload length' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:17 +0100 Message-Id: <20220624150148.1855580-9-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-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.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 06/27/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/362a219f40d67f802a0c9a5c0e72886d6a5be012 Thanks. Kevin --- >From 362a219f40d67f802a0c9a5c0e72886d6a5be012 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Wed, 25 May 2022 14:59:12 +0100 Subject: [PATCH] net/iavf: fix NAT-T payload length [ upstream commit 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 ] Correct the length calculation used for NAT-T Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: Radu Nicolau Acked-by: Fan Zhang --- drivers/net/iavf/iavf_ipsec_crypto.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c index fa1cecc1e1..75f05ee558 100644 --- a/drivers/net/iavf/iavf_ipsec_crypto.c +++ b/drivers/net/iavf/iavf_ipsec_crypto.c @@ -1119,9 +1119,12 @@ iavf_ipsec_crypto_compute_l4_payload_length(struct rte_mbuf *m, */ - if (s->udp_encap.enabled) + if (s->udp_encap.enabled) { ol4_len = sizeof(struct rte_udp_hdr); - - l3_len = m->l3_len; - l4_len = m->l4_len; + l3_len = m->l3_len - ol4_len; + l4_len = l3_len; + } else { + l3_len = m->l3_len; + l4_len = m->l4_len; + } return rte_pktmbuf_pkt_len(m) - (ol2_len + ol3_len + ol4_len + -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.255443633 +0100 +++ 0009-net-iavf-fix-NAT-T-payload-length.patch 2022-06-24 15:51:08.850984025 +0100 @@ -1 +1 @@ -From 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 Mon Sep 17 00:00:00 2001 +From 362a219f40d67f802a0c9a5c0e72886d6a5be012 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d5e6bb6b964674bed75fcf954ea4cd6c796c8e4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org