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 BEC2FA0093 for ; Tue, 19 May 2020 14:59:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B0A501D61A; Tue, 19 May 2020 14:59:17 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id C52C21D626 for ; Tue, 19 May 2020 14:59:15 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id h17so15773336wrc.8 for ; Tue, 19 May 2020 05:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e6L2/UK7pdaiCl9L+SGO1DA6iMGxcROyIDJEr8rBIJw=; b=goV3wqYeYy7knOGWG1QaTBJ+o/Jk5rvqyaWwq0TcqgeihNirpcPSBFJby0kKw+b2CB i66tHyN9BQ2pnNoY0T1YFjrJwbJqU27dOJ0NyB/kP/rxyNHgh89QF5vO8jv6pKVY2bqz jkUTSyqDALqCRrOzNVeUSKS5ong0nP7wwLQcmk1+CQpFs+WjG4tK+bG2hfeIizLVmzsE X6Ip1RTgDxHxD5N/IEcp+M/U1310G2aOj9ZYZmJZ4rHEk3xn/XiSS/zDIzilMnVoP1LW BzXRjh89E4KEaoc9yp69xB3ldBWzrrlUCgT/Et5zzf/HYHP3XTc7nyoqa91cSNLAm+yz VwxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e6L2/UK7pdaiCl9L+SGO1DA6iMGxcROyIDJEr8rBIJw=; b=HUh28bxKvNMUsPsYvoMZMdiX/7gD83HL+phAM42I5vlOtIeTSLimTJrem5SlVDzw0f hRyveECkBQGHVMUpz5N8rc/JZE8v57xurl9LSYUoXx/FfRAxU2CmgMkrBQk7kxLN64Lm eC2Gp9h0d/aDbq16O3ileqcA36FkYpQc8ml9yHQgySE852tAIFDVr2ZhfAyhf6frzc1A rLTl6rxQnoeb/ZZPPjirmr5taxe/T9mbddp0UKyc7P7K9ALfhfU+vxL/3XjkZuhwLCyB 528Slj7Ao0XJkAowAzHCCRz5L9ed8i4aygD6Ap02uDaz9kYIZGUlP+inmZOoAyoRkXlv T4Tg== X-Gm-Message-State: AOAM533Fafm+2zEVtYz99Rf8Ake311FTUqZVAiKWdnZJfiMe2FUOJY40 UyK7ld5ZCv3zT/eACQK0Iuc= X-Google-Smtp-Source: ABdhPJzLvDmOUYD92kYrXIu9Bokt/zwlY44Hz92StXyg6iUVNbFp8M+1EIQrSpn+o8wERGvFHl8pmg== X-Received: by 2002:adf:e5c6:: with SMTP id a6mr11715859wrn.180.1589893155532; Tue, 19 May 2020 05:59:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a14sm3708139wme.21.2020.05.19.05.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Tue, 19 May 2020 13:53:39 +0100 Message-Id: <20200519125804.104349-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix Rx queue start failure path' has been queued to stable release 19.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 stable release 19.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 05/21/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. Thanks. Luca Boccassi --- >From a42ef6f777cf507e8ce502a6e971ef906a1bdf2e 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 f589ece757..891709fd04 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -822,10 +822,12 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) return 0; fail_mac_filter_default_rxq_set: + sfc_rx_qflush(sa, sw_index); sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr); + rxq_info->state = SFC_RXQ_INITIALIZED; fail_dp_qstart: - sfc_rx_qflush(sa, sw_index); + efx_rx_qdestroy(rxq->common); fail_rx_qcreate: fail_bad_contig_block_size: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.994701028 +0100 +++ 0029-net-sfc-fix-Rx-queue-start-failure-path.patch 2020-05-19 13:56:18.215501747 +0100 @@ -1,13 +1,14 @@ -From a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b Mon Sep 17 00:00:00 2001 +From a42ef6f777cf507e8ce502a6e971ef906a1bdf2e 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") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko