Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3086342ybt; Mon, 29 Jun 2020 15:01:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcMQGpnowYB0AFMJSvsgCASkferZmLhFnNS/ANYswNMN5gj92NR9wWdLusAmGOuGnYoaZj X-Received: by 2002:a05:6402:c83:: with SMTP id cm3mr20452462edb.307.1593468062607; Mon, 29 Jun 2020 15:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468062; cv=none; d=google.com; s=arc-20160816; b=Mh1GmgQ2rjzIcFlbN0emIcOSON9ddzt1Es3wxBlJPAbvB/gdusGZBAcxagfx8cUzgZ vtZiBhZKpuP1ehaWO5lylj+83s4O8gimfUsDY/hA6bVA9EMwW9koXms4wRpObJlBMLV3 C5cJ0jLFNpHaKZi6csyB7c+q2a7S+Hf1Gu4dmuQc5paG+FFOvdBi4gCmzrSl10lRosQt oNJYhfIrhkp9pL8Mav8ypzUAqYUAvwA/VvF7UVChcehXbpUH0MLv1SFSNKVfBnZNqoON Qe4HmrRJLpBgwtMNT0AyC3ORFtv3UavgMB+S2e2h8Lqu31VG4gChmcGmZKoHNAS0kfmg vi1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+IV0esOFutSZhTgPQUK15s8DOlUsMS0v6g4v0yNs8wc=; b=m1+xweJpbMtEKxOi/eCXUl6cij0k/zft1cHE1qQ0jauyQfSmT/VonkKxxhUs2tx8lG YTPi1qTnX0IJk9hFAu2f+T9ingNfnTUTVIvGYDFvENgxFPaw36UpGGGKMIppQpw4A+I4 cN4eexobf8VGljGrtf0MFlP71/OVffDaw/xH0yOLTFi55JDNTduPPPjWLJgMuLjGs2la 5sYTLNX4vfGLgIZ/kMxEkwQ7XSKGrISu5g2vUDOgHB6WLAVYQ0x0qMGrTru2hHR25D7M pvlbbDX0A9EbyKmu7UGbNBmkdHMd3gZdK7DrD/LUvjYjMSoEzBm2VFJlfCrRpT847r0Z puAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y5vHhWjR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs14si529906ejb.569.2020.06.29.15.00.39; Mon, 29 Jun 2020 15:01:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y5vHhWjR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404713AbgF2V5f (ORCPT + 99 others); Mon, 29 Jun 2020 17:57:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:56886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726481AbgF2Sf3 (ORCPT ); Mon, 29 Jun 2020 14:35:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5259024707; Mon, 29 Jun 2020 15:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444042; bh=Xv6s/hhVZVL9IE+xoCVPrgrKTX+scJkpBD1WMF/fTJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5vHhWjRsxVbxFGuewov+aMCP6GvNe+n184vtKRxYfUDqevi+IYrJ8pdEZa4ef9OX yV1EXaOOXMnzEytIEXo1iniz5JRkAhOrE9INCbmmJI0mDRzwPcZiVShkT2DbKnhAVd 7MLgOpHrUudpYQw7XmelSCWyTkJL/4DVr05aYOxs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Lobakin , Igor Russkikh , Michal Kalderon , "David S . Miller" , Sasha Levin Subject: [PATCH 5.7 149/265] net: qede: stop adding events on an already destroyed workqueue Date: Mon, 29 Jun 2020 11:16:22 -0400 Message-Id: <20200629151818.2493727-150-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Lobakin [ Upstream commit 4079c7f7a2a00ab403c177ce723b560de59139c3 ] Set rdma_wq pointer to NULL after destroying the workqueue and check for it when adding new events to fix crashes on driver unload. Fixes: cee9fbd8e2e9 ("qede: Add qedr framework") Signed-off-by: Alexander Lobakin Signed-off-by: Igor Russkikh Signed-off-by: Michal Kalderon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_rdma.c b/drivers/net/ethernet/qlogic/qede/qede_rdma.c index 2d873ae8a234d..668ccc9d49f83 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_rdma.c +++ b/drivers/net/ethernet/qlogic/qede/qede_rdma.c @@ -105,6 +105,7 @@ static void qede_rdma_destroy_wq(struct qede_dev *edev) qede_rdma_cleanup_event(edev); destroy_workqueue(edev->rdma_info.rdma_wq); + edev->rdma_info.rdma_wq = NULL; } int qede_rdma_dev_add(struct qede_dev *edev, bool recovery) @@ -325,7 +326,7 @@ static void qede_rdma_add_event(struct qede_dev *edev, if (edev->rdma_info.exp_recovery) return; - if (!edev->rdma_info.qedr_dev) + if (!edev->rdma_info.qedr_dev || !edev->rdma_info.rdma_wq) return; /* We don't want the cleanup flow to start while we're allocating and -- 2.25.1