From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id D4ABD374C for ; Tue, 20 Jun 2017 18:26:59 +0200 (CEST) Received: from pure.maildistiller.com (unknown [10.110.50.29]) by dispatch1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTP id 51AB080095; Tue, 20 Jun 2017 16:26:59 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx2-us4.ppe-hosted.com (unknown [10.110.49.251]) by pure.maildistiller.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 90A5D6006E; Tue, 20 Jun 2017 16:26:57 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 3884120095; Tue, 20 Jun 2017 16:26:57 +0000 (UTC) Received: from [192.168.38.17] (84.52.114.114) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Tue, 20 Jun 2017 17:26:53 +0100 To: Yuanhan Liu , Andy Moreton References: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org> <1497958550-13600-18-git-send-email-yliu@fridaylinux.org> CC: dpdk stable From: Andrew Rybchenko Message-ID: Date: Tue, 20 Jun 2017 19:26:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <1497958550-13600-18-git-send-email-yliu@fridaylinux.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [84.52.114.114] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.100.1062-23140.005 X-TM-AS-Result: No--15.877900-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-MDID: 1497976018-kZvUHfNQjbvK Subject: Re: [dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' has been queued to stable release 17.05.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 Jun 2017 16:27:00 -0000 Hi, On 06/20/2017 02:35 PM, Yuanhan Liu wrote: > Hi, > > FYI, your patch has been queued to stable release 17.05.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 06/22/17. So please > shout if anyone has objections. We have found out that the patch itself introduces the regression which is fixed in commit 0c27441ee0923bd221fc021b917ed03b02a94ad3 Author: Andy Moreton Date: Thu May 25 13:58:30 2017 +0100 net/sfc/base: let caller know that queue is already flushed Tx/Rx queue may be already flushed due to Tx/Rx error on the queue or MC reboot. Caller needs to know that the queue is already flushed to avoid waiting for flush done event. Signed-off-by: Andy Moreton Signed-off-by: Andrew Rybchenko which is not marked as a fix to be included in stable. So, please, either skip both patches (this one and 0c27441ee09 mentioned above) or, if it is possible, include both into the stable. Ideally squashed into one, if so, changeset description should be: net/sfc/base: let caller know that queue is already flushed MCDI results returned in req.emr_rc have already been translated from MC_CMD_ERR_* to errno names, so using an MC_CMD_ERR_* value is incorrect. Tx/Rx queue may be already flushed due to Tx/Rx error on the queue or MC reboot. Caller needs to know that the queue is already flushed to avoid waiting for flush done event. Signed-off-by: Andy Moreton Signed-off-by: Andrew Rybchenko Thanks, Andrew. > Thanks. > > --yliu > > --- > From f2c835cd8aa6351ff8cd4667e910192b96dd2be6 Mon Sep 17 00:00:00 2001 > From: Andy Moreton > Date: Sat, 27 May 2017 08:55:30 +0100 > Subject: [PATCH] net/sfc/base: fix error code usage in common code > > [ upstream commit 7236d2bfe0acc48330e3c2a3dfac4ada9a792cd8 ] > > MCDI results returned in req.emr_rc have already been translated > from MC_CMD_ERR_* to errno names, so using an MC_CMD_ERR_* value > is incorrect. > > Fixes: e7cd430c864f ("net/sfc/base: import SFN7xxx family support") > > Signed-off-by: Andy Moreton > Signed-off-by: Andrew Rybchenko > --- > drivers/net/sfc/base/ef10_rx.c | 2 +- > drivers/net/sfc/base/ef10_tx.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c > index b65faed..9d6756c 100644 > --- a/drivers/net/sfc/base/ef10_rx.c > +++ b/drivers/net/sfc/base/ef10_rx.c > @@ -137,7 +137,7 @@ efx_mcdi_fini_rxq( > > efx_mcdi_execute_quiet(enp, &req); > > - if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) { > + if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) { > rc = req.emr_rc; > goto fail1; > } > diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c > index 0f8e9b1..dfa9e0b 100644 > --- a/drivers/net/sfc/base/ef10_tx.c > +++ b/drivers/net/sfc/base/ef10_tx.c > @@ -148,7 +148,7 @@ efx_mcdi_fini_txq( > > efx_mcdi_execute_quiet(enp, &req); > > - if ((req.emr_rc != 0) && (req.emr_rc != MC_CMD_ERR_EALREADY)) { > + if ((req.emr_rc != 0) && (req.emr_rc != EALREADY)) { > rc = req.emr_rc; > goto fail1; > }