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 74439A046B for ; Mon, 24 Jun 2019 17:26:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 69E0C1BCD4; Mon, 24 Jun 2019 17:26:31 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 633921BE34 for ; Mon, 24 Jun 2019 17:26:29 +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 D44C63688E; Mon, 24 Jun 2019 15:26:28 +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 C492919C69; Mon, 24 Jun 2019 15:26:27 +0000 (UTC) From: Kevin Traynor To: Shahed Shaikh Cc: Rasesh Mody , dpdk stable Date: Mon, 24 Jun 2019 16:24:45 +0100 Message-Id: <20190624152525.19349-21-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.30]); Mon, 24 Jun 2019 15:26:28 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnx2x: fix interrupt flood' 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/a4c0a5ba78bd2763a0437c502beb98332d974c87 Thanks. Kevin Traynor --- >From a4c0a5ba78bd2763a0437c502beb98332d974c87 Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Tue, 4 Jun 2019 11:53:49 -0700 Subject: [PATCH] net/bnx2x: fix interrupt flood [ upstream commit f0219d98defd92297c688855d25294805ec89a3d ] PMD sets up and clears the slow path interrupt status block in dev_start and dev_stop flow and slow path interrupt status block DMA memory for device is allocated in dev_configure flow. This situation creates a state where, after dev_stop is called, and if there is a slow path interrupt from device, PMD sees the old value of status block consumer in dev_start flow, since DMA memory for status block belongs to old configuration and dev_start will result in new slow path interrupt status block configuration. And since PMD fails to ack new slow path interrupt with correct status block consumer value, device continues to trigger interrupt causing an interrupt flood. Fix is to create and destroy status block DMA memory in dev_start and dev_stop flow instead of dev_configure and dev_close flow. Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Shahed Shaikh Acked-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x.c | 10 ++++++++++ drivers/net/bnx2x/bnx2x_ethdev.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 0698b1a8a..e9f05a73a 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -2402,4 +2402,7 @@ static void bnx2x_free_mem(struct bnx2x_softc *sc) bnx2x_free_ilt_lines_mem(sc); + + /* free the host hardware/software hsi structures */ + bnx2x_free_hsi_mem(sc); } @@ -2452,4 +2455,11 @@ static int bnx2x_alloc_mem(struct bnx2x_softc *sc) } + /* allocate the host hardware/software hsi structures */ + if (bnx2x_alloc_hsi_mem(sc) != 0) { + PMD_DRV_LOG(ERR, sc, "bnx2x_alloc_hsi_mem was failed"); + bnx2x_free_mem(sc); + return -ENXIO; + } + return 0; } diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index c628cdc0f..c23f4b1a6 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -207,11 +207,4 @@ bnx2x_dev_configure(struct rte_eth_dev *dev) } - /* allocate the host hardware/software hsi structures */ - if (bnx2x_alloc_hsi_mem(sc) != 0) { - PMD_DRV_LOG(ERR, sc, "bnx2x_alloc_hsi_mem was failed"); - bnx2x_free_ilt_mem(sc); - return -ENXIO; - } - bnx2x_dev_rxtx_init_dummy(dev); return 0; @@ -294,7 +287,4 @@ bnx2x_dev_close(struct rte_eth_dev *dev) memset(&(dev->data->dev_link), 0 , sizeof(struct rte_eth_link)); - /* free the host hardware/software hsi structures */ - bnx2x_free_hsi_mem(sc); - /* free ilt */ bnx2x_free_ilt_mem(sc); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:56.183680860 +0100 +++ 0021-net-bnx2x-fix-interrupt-flood.patch 2019-06-24 16:18:55.021431459 +0100 @@ -1 +1 @@ -From f0219d98defd92297c688855d25294805ec89a3d Mon Sep 17 00:00:00 2001 +From a4c0a5ba78bd2763a0437c502beb98332d974c87 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f0219d98defd92297c688855d25294805ec89a3d ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 5f353a7ef..5a47fd8fe 100644 +index 0698b1a8a..e9f05a73a 100644 @@ -57 +58 @@ -index 567dc5560..11a20e210 100644 +index c628cdc0f..c23f4b1a6 100644 @@ -60 +61 @@ -@@ -208,11 +208,4 @@ bnx2x_dev_configure(struct rte_eth_dev *dev) +@@ -207,11 +207,4 @@ bnx2x_dev_configure(struct rte_eth_dev *dev) @@ -72 +73 @@ -@@ -295,7 +288,4 @@ bnx2x_dev_close(struct rte_eth_dev *dev) +@@ -294,7 +287,4 @@ bnx2x_dev_close(struct rte_eth_dev *dev)