From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7FF8C3A589 for ; Tue, 20 Aug 2019 13:47:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B182722DD3 for ; Tue, 20 Aug 2019 13:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308845; bh=bsiCW9RVMi7rzQxs3g0Ad67RNfT4DgoSU933epG+8Lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MXzXnwqfg3GWZD+aCkaQW7/r9NuNOFsDp5GJzBTMcuXOA2Ubq39w0BuzIg5XNFKij fhFD6KL8nU2njuSaLG3GkVVk5TetL9q8sMrSR7r6tW1lJ9VY4SZ6fu1zAagq/ssNT5 GKdz+auf/Ynw7VwBwoFAp9ricROPSY3ew/OYVpC4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730659AbfHTNrY (ORCPT ); Tue, 20 Aug 2019 09:47:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:35528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730202AbfHTNkp (ORCPT ); Tue, 20 Aug 2019 09:40:45 -0400 Received: from sasha-vm.mshome.net (unknown [12.236.144.82]) (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 253A8233A0; Tue, 20 Aug 2019 13:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308444; bh=bsiCW9RVMi7rzQxs3g0Ad67RNfT4DgoSU933epG+8Lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UwYCOm1Udb+yudZWswxZwIGa5qEqVu9xiZhsCI+/4dvGgqcEARlkCz3tu0CHWrvlP HBpgfacay5Cj8bEBdRFFbNmzB4zNMy6eIFulznnSSMG4LHzZ4eXWC5g0ORNqUoHDWj E7lkLlb8aqaohRVorLhU/ZcOQ2hmpYL9E1Kkdd7c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Keith Busch , Li Zhong , Sagi Grimberg , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.2 17/44] nvme-pci: Fix async probe remove race Date: Tue, 20 Aug 2019 09:40:01 -0400 Message-Id: <20190820134028.10829-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190820134028.10829-1-sashal@kernel.org> References: <20190820134028.10829-1-sashal@kernel.org> MIME-Version: 1.0 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: Keith Busch [ Upstream commit bd46a90634302bfe791e93ad5496f98f165f7ae0 ] Ensure the controller is not in the NEW state when nvme_probe() exits. This will always allow a subsequent nvme_remove() to set the state to DELETING, fixing a potential race between the initial asynchronous probe and device removal. Reported-by: Li Zhong Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sagi Grimberg Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index f9959eaaa185e..09ffd21d18096 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2712,7 +2712,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie) { struct nvme_dev *dev = data; - nvme_reset_ctrl_sync(&dev->ctrl); + flush_work(&dev->ctrl.reset_work); flush_work(&dev->ctrl.scan_work); nvme_put_ctrl(&dev->ctrl); } @@ -2778,6 +2778,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev)); + nvme_reset_ctrl(&dev->ctrl); nvme_get_ctrl(&dev->ctrl); async_schedule(nvme_async_probe, dev); -- 2.20.1