From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 9955AA0679 for ; Tue, 30 Apr 2019 19:02:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8E5425A6A; Tue, 30 Apr 2019 19:02:16 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 17EB95A6A for ; Tue, 30 Apr 2019 19:02:15 +0200 (CEST) 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 mx1.redhat.com (Postfix) with ESMTPS id 7E57B2D800; Tue, 30 Apr 2019 17:02:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FCCF17CF9; Tue, 30 Apr 2019 17:02:13 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: dpdk stable Date: Tue, 30 Apr 2019 18:01:14 +0100 Message-Id: <20190430170133.2331-19-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 30 Apr 2019 17:02:14 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix scattered Rx enabling' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 05/07/19. 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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From f7763164455b458fce6dc32145e871f4f912b080 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 27 Mar 2019 19:00:05 +0800 Subject: [PATCH] net/i40e: fix scattered Rx enabling [ upstream commit 756cea41e9b8108ee8887b63abc357c1f678f480 ] No need to add additional vlan tag size for max packet size, since for i40e, the queue's Rx Max Frame Size (rxq->max_pkt_len) already includes the vlan header size. Fixes: a3c83a2527e1 ("net/i40e: enable runtime queue setup") Fixes: 4861cde46116 ("i40e: new poll mode driver") Fixes: c1715402df8f ("i40evf: fix jumbo frame support") Signed-off-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev_vf.c | 3 +-- drivers/net/i40e/i40e_rxtx.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 100e71cc8..ae0812bff 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1725,7 +1725,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq) if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) || - (rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) { + rxq->max_pkt_len > buf_size) dev_data->scattered_rx = 1; - } return 0; diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 8f727fae6..58ed8145d 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1719,5 +1719,5 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev, RTE_PKTMBUF_HEADROOM); int use_scattered_rx = - ((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size); + (rxq->max_pkt_len > buf_size); if (i40e_rx_queue_init(rxq) != I40E_SUCCESS) { @@ -2709,7 +2709,6 @@ i40e_rx_queue_init(struct i40e_rx_queue *rxq) /* Check if scattered RX needs to be used. */ - if ((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) { + if (rxq->max_pkt_len > buf_size) dev_data->scattered_rx = 1; - } /* Init the RX tail regieter. */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.717553037 +0100 +++ 0019-net-i40e-fix-scattered-Rx-enabling.patch 2019-04-30 17:58:13.798139964 +0100 @@ -1 +1 @@ -From 756cea41e9b8108ee8887b63abc357c1f678f480 Mon Sep 17 00:00:00 2001 +From f7763164455b458fce6dc32145e871f4f912b080 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 756cea41e9b8108ee8887b63abc357c1f678f480 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index add7b2223..87c45f278 100644 +index 100e71cc8..ae0812bff 100644 @@ -25 +26 @@ -@@ -1786,7 +1786,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq) +@@ -1725,7 +1725,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)