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 2E7ACA034F for ; Tue, 1 Mar 2022 11:45:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2894D426E1; Tue, 1 Mar 2022 11:45:20 +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 7537C407FF for ; Tue, 1 Mar 2022 11:45:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131518; 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=VAVKFSUNFtG48G/E+QvwFvMkH//mczSXciprfJyqkMk=; b=T3zXNBUqfC84cs9ER0xAdDvRzJq6OZJQpJxDFpBFIX9lhg1RrXaF3cn7rj7vP4Tf9A5/td w/9zvnWForDWxI1udcGl6561BkklVJdlAcmm+lIPqi7jXeR6lTk5tSP38kaOCMLdI+3et6 RHHYdHAiG8YtwC6XvwS49eJl+RXFnvg= 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-611-9nCYFnmLPMSjBfT3mkiG8w-1; Tue, 01 Mar 2022 05:45:15 -0500 X-MC-Unique: 9nCYFnmLPMSjBfT3mkiG8w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12BCC1868335; Tue, 1 Mar 2022 10:45:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 110C46FB08; Tue, 1 Mar 2022 10:45:12 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix segmentation offload condition' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:18 +0000 Message-Id: <20220301104300.334382-62-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/dbb1c537251dea2dba61bdf91cb0e74aa408f920 Thanks. Kevin --- >From dbb1c537251dea2dba61bdf91cb0e74aa408f920 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Mon, 22 Nov 2021 15:30:00 +0000 Subject: [PATCH] net/iavf: fix segmentation offload condition [ upstream commit ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 ] Apply segmentation offload when requested for non tunneled packets e.g. IPsec transport mode. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: Radu Nicolau Reviewed-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index ba272bb211..b0fed1b992 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2465,8 +2465,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, /* calculate data buffer size less set header lengths */ - if ((m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) && - (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | - RTE_MBUF_F_TX_UDP_SEG))) { - hdrlen += m->outer_l3_len; + if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) { + if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) + hdrlen += m->outer_l3_len; if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK) hdrlen += m->l3_len + m->l4_len; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.085602512 +0000 +++ 0062-net-iavf-fix-segmentation-offload-condition.patch 2022-03-01 10:41:01.349244107 +0000 @@ -1 +1 @@ -From ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 Mon Sep 17 00:00:00 2001 +From dbb1c537251dea2dba61bdf91cb0e74aa408f920 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff8b8bcd2ebef5d951bf442c44a71b0b3a0413c9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 59623ac820..94819e59b2 100644 +index ba272bb211..b0fed1b992 100644 @@ -22 +23 @@ -@@ -2429,8 +2429,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, +@@ -2465,8 +2465,7 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,