From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71A62A04DD for ; Wed, 28 Oct 2020 11:47:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5EABA4C89; Wed, 28 Oct 2020 11:47:09 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 7F7D0CA00 for ; Wed, 28 Oct 2020 11:47:07 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id s9so5140707wro.8 for ; Wed, 28 Oct 2020 03:47:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uLZGtWeyM3bbC8temx2ZDk9G/a43HvANgGNCMoRTeRg=; b=NQXw053fO2sBnhpGvyTXr85TqZSJvBAiNLP+5GsvdOLsZz10mAAr2vfLxJnaJ79Mj6 A6CfJgKaan4D2WNWWUA3+aIN4DUakAeqi/WqI0BDuM2Aw+0cF5JaqFrMFxVD7/Bl8RK0 pT4H45WbXPOcOVa3fN1K/wkW+72iNpnduWOOYnNx62sd98NZnBHaz2fBvIGBiDylvMk3 4jdyB9ad5bMICA6BD2/kBUrTIP0W64vwubuJzM6RXnVOq3D/pi8O4YHog+Bu3lfMLWP1 JP/T/6x/+7Kbkc/xp5c/6/V5qpHYlMp1XeP9SEQXBn2MV+1X/g5cA2kuodH6B89Um+I9 0lqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uLZGtWeyM3bbC8temx2ZDk9G/a43HvANgGNCMoRTeRg=; b=jMbdwZeHbF2gByoA0xyuEeFltkQcrfhZQ2uHXmleok+ag5J4dfsQkF9n0PDLKxeuVx tLMcFoanESneNR8E4Nbys0vh6R7cWdvbBpA8KFQ5gr9l/EzXjmC+TlPp7p0MDPUGxTJD quofTRUaBnzwg5fnGXk+Zcr+8APw7zo0/x7ataK76xLQOIWw2sLqbvTFicWnZhbm2ljJ qp+2fZ9wLvv/wNMQt/bn6m9Xjooar/kZU/4CLdYKAiM+r0Ht6jrwN49Ia/7s8gDFn0jL J/uZWc6Y02iXWoO32d2YM1thbMfUQFqBpr3DZoObJzA3nmTnBPY63+jr/FHOUww+8Axw MngQ== X-Gm-Message-State: AOAM5319Qe8oFzqsCrSIbwByU6E2mMSYGOElMmVOYGjoOGxLl4a+IFBJ e530I3wrsNMtwRC8dkuhPXY= X-Google-Smtp-Source: ABdhPJxLfYonDsj7auySPP6RqoAmIk7HhB5dZRaK/+mbXX2ZAcI44COJwb0sgOX13bRytke+QPyw/w== X-Received: by 2002:a5d:4a82:: with SMTP id o2mr8375846wrq.10.1603882026181; Wed, 28 Oct 2020 03:47:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k16sm5723272wmi.5.2020.10.28.03.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Steve Yang Cc: Beilei Xing , dpdk stable Date: Wed, 28 Oct 2020 10:42:59 +0000 Message-Id: <20201028104606.3504127-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix scattered Rx enabling' has been queued to stable release 19.11.6 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 stable release 19.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 10/30/20. 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. Thanks. Luca Boccassi --- >From 7b4464ccbcb451f3c66e9bbcbc3da766e60cdd94 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Fri, 4 Sep 2020 07:29:02 +0000 Subject: [PATCH] net/iavf: fix scattered Rx enabling [ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ] No need to add additional vlan tag size for max packet size, the queue's Rx Max Frame Size (rxq->max_pkt_len) already includes the vlan header size in iavf. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Steve Yang Acked-by: Beilei Xing --- drivers/net/iavf/iavf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 8ddd4aad9a..1556c146ea 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -263,7 +263,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) rxq->max_pkt_len = max_pkt_len; if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) || - (rxq->max_pkt_len + 2 * IAVF_VLAN_TAG_SIZE) > buf_size) { + rxq->max_pkt_len > buf_size) { dev_data->scattered_rx = 1; } IAVF_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.416870174 +0000 +++ 0020-net-iavf-fix-scattered-Rx-enabling.patch 2020-10-28 10:35:11.440829082 +0000 @@ -1,14 +1,15 @@ -From 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d Mon Sep 17 00:00:00 2001 +From 7b4464ccbcb451f3c66e9bbcbc3da766e60cdd94 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Fri, 4 Sep 2020 07:29:02 +0000 Subject: [PATCH] net/iavf: fix scattered Rx enabling +[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ] + No need to add additional vlan tag size for max packet size, the queue's Rx Max Frame Size (rxq->max_pkt_len) already includes the vlan header size in iavf. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") -Cc: stable@dpdk.org Signed-off-by: Steve Yang Acked-by: Beilei Xing @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index 28ca3fa8f7..ec4b1a1487 100644 +index 8ddd4aad9a..1556c146ea 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c -@@ -286,7 +286,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) +@@ -263,7 +263,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) rxq->max_pkt_len = max_pkt_len; if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||