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 4843AA034F for ; Tue, 1 Mar 2022 11:45:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 431A0407FF; Tue, 1 Mar 2022 11:45:21 +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 EDA5A426DF for ; Tue, 1 Mar 2022 11:45:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131519; 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=eMTUlyL4MH+qzk+K9BpINTdmmWSP/Z6jtDzmcFq5ILo=; b=bYY85EUS98mxdA2138sIB5zirjn9Axjt/yi9OiU3C81uBBx6QkhxX5yn4aILMeon489D26 6/Vy3Iyz+capxnfEkvjp8EDLvTq5PiqaHwvWgXz00A/i4BJz1H1Gdk4xA54XbL94i1Vs9Q +Pb4jpKGUqFuiB2YkPboJsoAVkiQFNM= 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-396-ejhQuYjmNaCsyipR8PRAzg-1; Tue, 01 Mar 2022 05:45:16 -0500 X-MC-Unique: ejhQuYjmNaCsyipR8PRAzg-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 6B39751DC; Tue, 1 Mar 2022 10:45:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66C14752D2; Tue, 1 Mar 2022 10:45:14 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix segmentation offload buffer size' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:19 +0000 Message-Id: <20220301104300.334382-63-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/15ff989ca85ff5a4b6b9520224c8bd68247e456e Thanks. Kevin --- >From 15ff989ca85ff5a4b6b9520224c8bd68247e456e Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 15 Feb 2022 15:50:23 +0000 Subject: [PATCH] net/iavf: fix segmentation offload buffer size [ upstream commit 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e ] This fix commit ff8b8bcd2ebe, which resulted in incorrect buffer size being computed for non IPses TSO packets. Fixes: ff8b8bcd2ebe ("net/iavf: fix segmentation offload condition") Signed-off-by: Radu Nicolau Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index b0fed1b992..29ab1b84f2 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2465,7 +2465,8 @@ 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_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_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_L4_MASK) hdrlen += m->l3_len + m->l4_len; @@ -2475,4 +2476,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, hdrlen += ipseclen; bufsz = hdrlen + tlen; + } else if ((m->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) && + (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | + RTE_MBUF_F_TX_UDP_SEG))) { + hdrlen += m->outer_l3_len + m->l3_len + ipseclen; + if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK) + hdrlen += m->l4_len; + bufsz = hdrlen + tlen; + } else { bufsz = m->data_len; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.114010793 +0000 +++ 0063-net-iavf-fix-segmentation-offload-buffer-size.patch 2022-03-01 10:41:01.351244108 +0000 @@ -1 +1 @@ -From 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e Mon Sep 17 00:00:00 2001 +From 15ff989ca85ff5a4b6b9520224c8bd68247e456e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 41244055e5..ca54c70dd0 100644 +index b0fed1b992..29ab1b84f2 100644 @@ -22 +23 @@ -@@ -2464,7 +2464,8 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, +@@ -2465,7 +2465,8 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, @@ -34 +35 @@ -@@ -2474,4 +2475,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc, +@@ -2475,4 +2476,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,