From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47CE3A0C4C for ; Mon, 12 Jul 2021 15:14:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41741406B4; Mon, 12 Jul 2021 15:14:43 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 2C2A94069E for ; Mon, 12 Jul 2021 15:14:42 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso14424985wmh.4 for ; Mon, 12 Jul 2021 06:14:42 -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=Epbjc9mSYF/NWn6Nn8TVw0vw03ALsRuDTnvv/yCcAeY=; b=Rfxe87u5kG1btZ5KO9tiFmrLt9IKwkp+2WkclTufBV7DCmFTv4v652A0ccsSvPru2z 9PeYYv+p/DKIRZet/GsU9lPcEkGGmEmJ8goOHtMsAQsUOOILFTBQa8x8K0YfcWJ/X1v+ vn6tOu/XT/kHgJ92JPd7BeSqrSQoyl+lrWbPjkluPHq1t7B1zKTZeEnKPBrbkHTZXZty vfzygF9kup1hPW5KjQhcWLaNuiZAFuU6TD34ojt7v2YlubzUIHgBty65DNA0McdyD8c8 rKdpabG7NzYpzwnZ4esKnr0Lmynt5O9H3eJuH8AXdCAo4wGeApWP0sx1gnoTlkjHmzdA 3Etw== 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=Epbjc9mSYF/NWn6Nn8TVw0vw03ALsRuDTnvv/yCcAeY=; b=X8vJ6kb/LXfinDQSk7Rv4ku79KWMxE9pq2FM3CLOLSlrLMzADow5iWnjRPVsE1icqF EBGqxqr3bnbMFmXiTebDKWki2gcqcEHyCDEXgLqeizJycobpf2ZkY3i+i9iJ1ejnyvDZ GVZw0bLTJlRdwMER3OjEUBG5F7707ZR/jrjTiTc3BBluSYRxX1QVZ+366g2OPNFOUkko ArIHe3mN3JwARaAgSEkd3Oh8mnYRZJNVbSVjeps4eivaHxJtMapp6XwobDOtLJawye8F 9JmvxJZ3BkeTdFxZbhZGm7MBL2s1aCzP569ZKXVJ5SvEWxlsIVYpMjM+L0a+jjhxTnxp 1/iw== X-Gm-Message-State: AOAM532pH/PZMmxzagRVSUSNHnKTagr/yLFnj+L79s8oS2xRUEjYx3Po vFoMleRIrSpQhgdzbCWATQQ= X-Google-Smtp-Source: ABdhPJx2ZgIcmnre1QCQfljHIVdZUbkQ2KhIcMhKfSYL8rZQo3ip5wqMoNr4XdqrIjirOGi9LYWW5w== X-Received: by 2002:a05:600c:6d8:: with SMTP id b24mr725078wmn.111.1626095681978; Mon, 12 Jul 2021 06:14:41 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id a12sm15200192wrh.26.2021.07.12.06.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:14:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:05:22 +0100 Message-Id: <20210712130551.2462159-87-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: invoke device removal event on recovery failure' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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 07/14/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/42382a70ec904026f9a36f1dea43c94459af01b4 Thanks. Luca Boccassi --- >From 42382a70ec904026f9a36f1dea43c94459af01b4 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Jun 2021 08:43:32 +0530 Subject: [PATCH] net/bnxt: invoke device removal event on recovery failure [ upstream commit 8ac3cbba621ad1887b069b271115faf76bf04b75 ] When the driver receives RESET_NOTIFY async event from FW or detects a FW fatal error condition, it tries to recover from the error. When the driver fails to recover from the error condition, fixed to send device removal event to the application. Fixes: df6cd7c1f73a ("net/bnxt: handle reset notify async event from FW") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 934bcb0ec4..466b39d2a8 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4130,6 +4130,10 @@ err_start: err: bp->flags |= BNXT_FLAG_FATAL_ERROR; bnxt_uninit_resources(bp, false); + if (bp->eth_dev->data->dev_conf.intr_conf.rmv) + rte_eth_dev_callback_process(bp->eth_dev, + RTE_ETH_EVENT_INTR_RMV, + NULL); PMD_DRV_LOG(ERR, "Failed to recover from FW reset\n"); } @@ -6141,6 +6145,7 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev) static struct rte_pci_driver bnxt_rte_pmd = { .id_table = bnxt_pci_id_map, .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC | + RTE_PCI_DRV_INTR_RMV | RTE_PCI_DRV_PROBE_AGAIN, /* Needed in case of VF-REPs * and OVS-DPDK */ -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.108519346 +0100 +++ 0087-net-bnxt-invoke-device-removal-event-on-recovery-fai.patch 2021-07-12 13:41:36.738127776 +0100 @@ -1 +1 @@ -From 8ac3cbba621ad1887b069b271115faf76bf04b75 Mon Sep 17 00:00:00 2001 +From 42382a70ec904026f9a36f1dea43c94459af01b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8ac3cbba621ad1887b069b271115faf76bf04b75 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 70d10b9341..ba3d0e7f31 100644 +index 934bcb0ec4..466b39d2a8 100644 @@ -25 +26 @@ -@@ -4347,6 +4347,10 @@ err_start: +@@ -4130,6 +4130,10 @@ err_start: @@ -33 +33,0 @@ - pthread_mutex_unlock(&bp->err_recovery_lock); @@ -36 +36,2 @@ -@@ -6501,6 +6505,7 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev) + +@@ -6141,6 +6145,7 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)