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 7F21FA046B for ; Mon, 24 Jun 2019 17:26:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 740DD1BED9; Mon, 24 Jun 2019 17:26:49 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E28A11BEAB for ; Mon, 24 Jun 2019 17:26:47 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60CE5308FBAF; Mon, 24 Jun 2019 15:26:47 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52FEA19C69; Mon, 24 Jun 2019 15:26:46 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:55 +0100 Message-Id: <20190624152525.19349-31-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 24 Jun 2019 15:26:47 +0000 (UTC) Subject: [dpdk-stable] patch 'net/iavf: fix Tx prepare to set positive rte_errno' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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 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/ad49d936dbf39c115b5e785e6b039e600478b164 Thanks. Kevin Traynor --- >From ad49d936dbf39c115b5e785e6b039e600478b164 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 5 Jun 2019 09:16:00 +0100 Subject: [PATCH] net/iavf: fix Tx prepare to set positive rte_errno [ upstream commit 5e129a2ddc0dc914a26448f29d5ac031da6d85cb ] Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Signed-off-by: Andrew Rybchenko Reviewed-by: Ferruh Yigit --- drivers/net/avf/avf_rxtx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c index 8c7a96727..52056c770 100644 --- a/drivers/net/avf/avf_rxtx.c +++ b/drivers/net/avf/avf_rxtx.c @@ -1699,5 +1699,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, if (!(ol_flags & PKT_TX_TCP_SEG)) { if (m->nb_segs > AVF_TX_MAX_MTU_SEG) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } @@ -1705,10 +1705,10 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, (m->tso_segsz > AVF_MAX_TSO_MSS)) { /* MSS outside the range are considered malicious */ - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } if (ol_flags & AVF_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -1717,5 +1717,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_validate_tx_offload(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } @@ -1723,5 +1723,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_net_intel_cksum_prepare(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:56.693632578 +0100 +++ 0031-net-iavf-fix-Tx-prepare-to-set-positive-rte_errno.patch 2019-06-24 16:18:55.049430799 +0100 @@ -1 +1 @@ -From 5e129a2ddc0dc914a26448f29d5ac031da6d85cb Mon Sep 17 00:00:00 2001 +From ad49d936dbf39c115b5e785e6b039e600478b164 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5e129a2ddc0dc914a26448f29d5ac031da6d85cb ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -12 +13 @@ - drivers/net/iavf/iavf_rxtx.c | 10 +++++----- + drivers/net/avf/avf_rxtx.c | 10 +++++----- @@ -15,5 +16,5 @@ -diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c -index 682e8aa08..0be3ede31 100644 ---- a/drivers/net/iavf/iavf_rxtx.c -+++ b/drivers/net/iavf/iavf_rxtx.c -@@ -1699,5 +1699,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c +index 8c7a96727..52056c770 100644 +--- a/drivers/net/avf/avf_rxtx.c ++++ b/drivers/net/avf/avf_rxtx.c +@@ -1699,5 +1699,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -21 +22 @@ - if (m->nb_segs > IAVF_TX_MAX_MTU_SEG) { + if (m->nb_segs > AVF_TX_MAX_MTU_SEG) { @@ -26,2 +27,2 @@ -@@ -1705,10 +1705,10 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, - (m->tso_segsz > IAVF_MAX_TSO_MSS)) { +@@ -1705,10 +1705,10 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, + (m->tso_segsz > AVF_MAX_TSO_MSS)) { @@ -34 +35 @@ - if (ol_flags & IAVF_TX_OFFLOAD_NOTSUP_MASK) { + if (ol_flags & AVF_TX_OFFLOAD_NOTSUP_MASK) { @@ -39 +40 @@ -@@ -1717,5 +1717,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1717,5 +1717,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -46 +47 @@ -@@ -1723,5 +1723,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1723,5 +1723,5 @@ avf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,