From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id EB5205681 for ; Tue, 20 Nov 2018 20:14:52 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 576263086265; Tue, 20 Nov 2018 19:14:52 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45B30604A4; Tue, 20 Nov 2018 19:14:51 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: Qi Zhang , dpdk stable Date: Tue, 20 Nov 2018 19:12:13 +0000 Message-Id: <20181120191252.30277-23-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 20 Nov 2018 19:14:52 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe: do not return internal code' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Tue, 20 Nov 2018 19:14:53 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 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/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 9972726126c75a95009675f3cff505c3c0e010a3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Sep 2018 15:18:11 +0100 Subject: [PATCH] net/ixgbe: do not return internal code [ upstream commit 8fd55a07941a3297208b7820fc8e544431fc5150 ] In case of a temporary failure the ixgbe driver can return the internal error IXGBE_ERR_RESET_FAILED to the application. Instead, return -EAGAIN as per the public API specification. Fixes: cddaf87a1ecb ("lib: fix unused values") Signed-off-by: Luca Boccassi Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 26b192737..eab9e2e7e 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1620,5 +1620,10 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev) if ((diag != IXGBE_SUCCESS) && (diag != IXGBE_ERR_INVALID_MAC_ADDR)) { PMD_INIT_LOG(ERR, "VF Initialization Failure: %d", diag); - return diag; + /* + * This error code will be propagated to the app by + * rte_eth_dev_reset, so use a public error code rather than + * the internal-only IXGBE_ERR_RESET_FAILED + */ + return -EAGAIN; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.021733559 +0000 +++ 0023-net-ixgbe-do-not-return-internal-code.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,14 +1,15 @@ -From 8fd55a07941a3297208b7820fc8e544431fc5150 Mon Sep 17 00:00:00 2001 +From 9972726126c75a95009675f3cff505c3c0e010a3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 3 Sep 2018 15:18:11 +0100 Subject: [PATCH] net/ixgbe: do not return internal code +[ upstream commit 8fd55a07941a3297208b7820fc8e544431fc5150 ] + In case of a temporary failure the ixgbe driver can return the internal error IXGBE_ERR_RESET_FAILED to the application. Instead, return -EAGAIN as per the public API specification. Fixes: cddaf87a1ecb ("lib: fix unused values") -Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Qi Zhang