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 ADBC5A0093 for ; Thu, 28 May 2020 18:24:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A7ED61DC1E; Thu, 28 May 2020 18:24:39 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 8C0A81D996 for ; Thu, 28 May 2020 18:24:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683077; 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=th0sO+FqJZoctd6C7ku4ZOZVzjK2P+NuFQCrX+1yJcs=; b=XKfl2xegnbbfCZoZgIibuPd8uIIxCY+jUWejOAZpVuAbEaylngtSjg/h39nMu+Lc4WashC TM7WznvAelNwDdRXFxo8Is+addFMEH7auF65Oe10i+RLnDytwpBNwYwA+vTOrh0pc71bXD zBY8w/69yAtdyIa50RunPbR9bAiAUIM= 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-74-H2UvFi3ZOQ2ioHf-alO0Cg-1; Thu, 28 May 2020 12:24:32 -0400 X-MC-Unique: H2UvFi3ZOQ2ioHf-alO0Cg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E92FE464; Thu, 28 May 2020 16:24:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FF1B60C05; Thu, 28 May 2020 16:24:30 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 28 May 2020 17:22:00 +0100 Message-Id: <20200528162322.7863-13-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix Rx queue start failure path' has been queued to LTS release 18.11.9 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.9 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/03/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/bc2e943cd0832eff0c43e37a7119b978c408f952 Thanks. Kevin. --- >From bc2e943cd0832eff0c43e37a7119b978c408f952 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Thu, 5 Mar 2020 15:48:55 +0000 Subject: [PATCH] net/sfc: fix Rx queue start failure path [ upstream commit a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b ] Call correct cleanup operations on failure in Rx queue start function. Fixes: df1bfde4ff0d ("net/sfc: factor out libefx-based Rx datapath") Fixes: 28944ac098aa ("net/sfc: implement Rx queue start and stop operations") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 984914b4e1..2d506c3860 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -751,8 +751,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) fail_mac_filter_default_rxq_set: + sfc_rx_qflush(sa, sw_index); sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); + rxq->state = SFC_RXQ_INITIALIZED; fail_dp_qstart: - sfc_rx_qflush(sa, sw_index); + efx_rx_qdestroy(rxq->common); fail_rx_qcreate: -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:12:59.849699186 +0100 +++ 0013-net-sfc-fix-Rx-queue-start-failure-path.patch 2020-05-28 17:12:59.052557509 +0100 @@ -1 +1 @@ -From a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b Mon Sep 17 00:00:00 2001 +From bc2e943cd0832eff0c43e37a7119b978c408f952 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f589ece757..891709fd04 100644 +index 984914b4e1..2d506c3860 100644 @@ -22 +23 @@ -@@ -823,8 +823,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) +@@ -751,8 +751,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) @@ -26,2 +27,2 @@ - sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr); -+ rxq_info->state = SFC_RXQ_INITIALIZED; + sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); ++ rxq->state = SFC_RXQ_INITIALIZED;