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 E854B4326F for ; Thu, 2 Nov 2023 14:14:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2B9342E0E; Thu, 2 Nov 2023 14:14:40 +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 F1EFF42DE6 for ; Thu, 2 Nov 2023 14:14:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930878; 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=tF/wBQBqC6qEGrkB6G3uuk/P/Gw1avwuS5JaiTiKhQA=; b=FxGgFq9dJzY7taqNISonHll4KB/IHLwVGtSMtDcxpqqet48nV3bUQ2/Kk0Pi7y7MUqowb1 jT+XUpgwh0YfuYXvPza/ctjDG7cer/l6MVm/l5vAVRFGdkTiByDtn+fWqpoCtuwBIHoX/L 4eqxi/FagaO2mHhR3Z/rgdfQOLhQZkU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-225-xwnRHdQyNi6PB5SBThuDqw-1; Thu, 02 Nov 2023 09:14:37 -0400 X-MC-Unique: xwnRHdQyNi6PB5SBThuDqw-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 C97612806047; Thu, 2 Nov 2023 13:14:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F3D8474FA0; Thu, 2 Nov 2023 13:14:35 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix TSO with big segments' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:13 +0000 Message-ID: <20231102131254.315947-67-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/1b21ab31ce9b43241fc71f56e8ddf1832594132f Thanks. Kevin --- >From 1b21ab31ce9b43241fc71f56e8ddf1832594132f Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 27 Sep 2023 11:41:48 +0200 Subject: [PATCH] net/ice: fix TSO with big segments [ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ] 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/ice with the following message: 2023-09-18T13:34:31.064Z|00020|dpdk(pmd-c31/id:22)|ERR|ice_prep_pkts(): INVALID mbuf: bad data_len=[2962] Remove the check on data_len. Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes") Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 6e91cc226b..9db511acdc 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3491,7 +3491,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, uint64_t ol_flags; struct rte_mbuf *m; - struct ice_tx_queue *txq = tx_queue; - struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id]; - uint16_t max_frame_size = dev->data->mtu + ICE_ETH_OVERHEAD; for (i = 0; i < nb_pkts; i++) { @@ -3510,7 +3507,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, } - /* check the data_len in mbuf */ - if (m->data_len < ICE_TX_MIN_PKT_LEN || - m->data_len > max_frame_size) { + if (m->pkt_len < ICE_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.449482010 +0000 +++ 0067-net-ice-fix-TSO-with-big-segments.patch 2023-11-02 13:09:40.881163554 +0000 @@ -1 +1 @@ -From d7b35f53cadd6f228b3787f8dceca5481c034740 Mon Sep 17 00:00:00 2001 +From 1b21ab31ce9b43241fc71f56e8ddf1832594132f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index d5513e9e93..ee9cb7b955 100644 +index 6e91cc226b..9db511acdc 100644 @@ -31 +32 @@ -@@ -3686,7 +3686,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3491,7 +3491,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -39 +40 @@ -@@ -3705,7 +3702,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3510,7 +3507,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,