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 9DEC54326F for ; Thu, 2 Nov 2023 14:14:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF72942E1E; Thu, 2 Nov 2023 14:14:37 +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 72DFF42E1A for ; Thu, 2 Nov 2023 14:14:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930876; 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=KKd7+I5eHlyGhC5wJKhEHp6S342Cevzudrs9tClEDP4=; b=RU6ioEtk2TxZQWNsAg+/S+4CcZwZI1tb6RRP/LjCsB1yb0pWdyhcF7FJWtLJP5pjRt6bZB siTLXUmMx49HfEgYpweC4Ggh7/XxxsHgxRaAWasn1jk6sJokUxZJo5e8TXVlDAdobfBzhu I/OEUzZ0HDvrBFYX8da1B6BngEF5sMg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-vpc7am4TMrqmb-lZrLJ-wg-1; Thu, 02 Nov 2023 09:14:34 -0400 X-MC-Unique: vpc7am4TMrqmb-lZrLJ-wg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A575C88CDC8; Thu, 2 Nov 2023 13:14:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0DDC474FA0; Thu, 2 Nov 2023 13:14:33 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix TSO with big segments' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:11 +0000 Message-ID: <20231102131254.315947-65-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/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/49e338a2b26ce9b5f586bbf6aba3f21b388d8848 Thanks. Kevin --- >From 49e338a2b26ce9b5f586bbf6aba3f21b388d8848 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 27 Sep 2023 11:41:46 +0200 Subject: [PATCH] net/iavf: fix TSO with big segments [ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ] Packets to be segmented with TSO are usually larger than MTU. Plus, a single segment for the whole packet may be used: in OVS case, an external rte_malloc'd buffer is used for packets received from vhost-user ports. Before this fix, TSO packets were dropped by net/iavf with the following message: 2023-09-18T14:08:52.739Z|00610|dpdk(pmd-c31/id:11)|ERR|iavf_prep_pkts(): INVALID mbuf: bad data_len=[2962] Remove the check on data_len. Fixes: 19ee91c6bd9a ("net/iavf: check illegal packet sizes") Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index bef06800de..7374d36499 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2787,5 +2787,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, struct iavf_tx_queue *txq = tx_queue; struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id]; - uint16_t max_frame_size = dev->data->mtu + IAVF_ETH_OVERHEAD; struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); @@ -2816,7 +2815,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, } - /* check the data_len in mbuf */ - if (m->data_len < IAVF_TX_MIN_PKT_LEN || - m->data_len > max_frame_size) { + if (m->pkt_len < IAVF_TX_MIN_PKT_LEN) { rte_errno = EINVAL; return i; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.402328603 +0000 +++ 0065-net-iavf-fix-TSO-with-big-segments.patch 2023-11-02 13:09:40.878163544 +0000 @@ -1 +1 @@ -From 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 Mon Sep 17 00:00:00 2001 +From 49e338a2b26ce9b5f586bbf6aba3f21b388d8848 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 21a06b8351..c6ef6af1d8 100644 +index bef06800de..7374d36499 100644 @@ -31 +32 @@ -@@ -3637,5 +3637,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -2787,5 +2787,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -37 +38 @@ -@@ -3666,7 +3665,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -2816,7 +2815,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,