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 AE5E0A04B1 for ; Thu, 5 Nov 2020 13:42:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A8B83C7F2; Thu, 5 Nov 2020 13:42:39 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id E9E24C80C for ; Thu, 5 Nov 2020 13:42:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580155; 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=HmjbtrMGA+CuMLjvEa5ZovsQPwdQtarmKoxYZ/3fnI4=; b=Q6NLXI13/obACl0Xc/399eicfzZz68g1+Gfb7gegvllheQAvrZ16bznGFsRFb6llp4mvcQ hngufgtnerS9Ok9NjkZb+X3u9AtARg1tMb8HWs7b/a0ilMnpXPiwyHZy5Bruxzix/PWBqL iUM1MitRGHF74VY7b7JFtMDW64Z6fDg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-NydW6mZyPheodwsFvD1ncg-1; Thu, 05 Nov 2020 07:42:32 -0500 X-MC-Unique: NydW6mZyPheodwsFvD1ncg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 943A58049E7; Thu, 5 Nov 2020 12:42:31 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92D2A5C3E1; Thu, 5 Nov 2020 12:42:30 +0000 (UTC) From: Kevin Traynor To: Steve Yang Cc: Beilei Xing , dpdk stable Date: Thu, 5 Nov 2020 12:40:14 +0000 Message-Id: <20201105124015.306404-67-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'net/avf: fix scattered Rx enabling' has been queued to LTS release 18.11.11 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.11 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/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/aa377726851d1cbef236e78c951406ee844ea28d Thanks. Kevin. --- >From aa377726851d1cbef236e78c951406ee844ea28d Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Wed, 4 Nov 2020 17:49:58 +0000 Subject: [PATCH] net/avf: 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/avf/avf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index 5dc543e16b..d1cfdeb357 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -254,5 +254,5 @@ avf_init_rxq(struct rte_eth_dev *dev, struct avf_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 * AVF_VLAN_TAG_SIZE) > buf_size) { + rxq->max_pkt_len > buf_size) { dev_data->scattered_rx = 1; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.832369646 +0000 +++ 0067-net-avf-fix-scattered-Rx-enabling.patch 2020-11-05 12:38:54.279896050 +0000 @@ -1 +1 @@ -From 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d Mon Sep 17 00:00:00 2001 +From aa377726851d1cbef236e78c951406ee844ea28d Mon Sep 17 00:00:00 2001 @@ -3,2 +3,4 @@ -Date: Fri, 4 Sep 2020 07:29:02 +0000 -Subject: [PATCH] net/iavf: fix scattered Rx enabling +Date: Wed, 4 Nov 2020 17:49:58 +0000 +Subject: [PATCH] net/avf: fix scattered Rx enabling + +[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ] @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/iavf/iavf_ethdev.c | 2 +- + drivers/net/avf/avf_ethdev.c | 2 +- @@ -19,5 +20,5 @@ -diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index 28ca3fa8f7..ec4b1a1487 100644 ---- a/drivers/net/iavf/iavf_ethdev.c -+++ b/drivers/net/iavf/iavf_ethdev.c -@@ -287,5 +287,5 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) +diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c +index 5dc543e16b..d1cfdeb357 100644 +--- a/drivers/net/avf/avf_ethdev.c ++++ b/drivers/net/avf/avf_ethdev.c +@@ -254,5 +254,5 @@ avf_init_rxq(struct rte_eth_dev *dev, struct avf_rx_queue *rxq) @@ -26 +27 @@ -- (rxq->max_pkt_len + 2 * IAVF_VLAN_TAG_SIZE) > buf_size) { +- (rxq->max_pkt_len + 2 * AVF_VLAN_TAG_SIZE) > buf_size) {