Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3713285pxv; Mon, 26 Jul 2021 10:02:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmwfRnDYtgGtAcv5gFZlbiYZx/JCX2+GSgFFoDhnYTbTBg6MerqWXEKbWFbD/+wUbwd1CW X-Received: by 2002:a05:6602:25da:: with SMTP id d26mr15617319iop.106.1627318961430; Mon, 26 Jul 2021 10:02:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627318961; cv=none; d=google.com; s=arc-20160816; b=0P8yw3caJZPM00IKxHH+14VPCJ4QqBa1ehGg+nRwOEQNRghSpSOkOGEeBbzfvXPy0z UiDCu6/n2/TqpWQTxvFtPEgwLCogFhlZJjgRUiwKFBCNnnxShw8cPMDJylptwInf/2aN 8ngpZIp8b4M9KboQeuhsrrfdYxGbto9Y4Ey/4heBbwaK23t7NptoTEZawi4A+Q4XtX15 t3ZLeuBsJ1QRSwrDakXP6QsA5Ltp8oDVxaqzNaqM322NC4NYrYLS1OfMTLyDv2uiXE99 qLVRodBgYQL46q7A18ZlXdLcAm1ENFr3QvaveAEZgVMwzixfsGwoGHAkB0cmsBGESG9D 7Cpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W6YQkHMQABc7gvfoye3oP5BvIlLtAu/pFP1fkSFvGbI=; b=JjwaOh4IZvG+W5TYiuqeBHKd1lp2Yun0AT75v890naqY01ebx0SGhhu2fCNAI0SDFS 5gFhufD/Up9cliHtni75RwhP3s8t6mb6okHU2RAxDMIxfxkuS5TDEVI8Z184heco5fvy LLk9ZaD7zSHZCYL8lk11Ok+IuCygdwZnqqkE9vK8yYf2Yv5l1Oa7B7YcJMsleHzu3Z9e ydTITWgQRs7ivQW/bDW8OFNEsJlfzPOh35zwS6Ei97aVPCyRFwvOzULHJqtK9H8ELINs aI38HzKMnNz8e8jtLoJVOoIVU8eTScBV42F2QPHnHlR6w1K8SyubJ5ELnrXL7B3XM65G gYTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Npqck5xn; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si513900iov.66.2021.07.26.10.02.29; Mon, 26 Jul 2021 10:02:41 -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=@linuxfoundation.org header.s=korg header.b=Npqck5xn; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238046AbhGZPlB (ORCPT + 99 others); Mon, 26 Jul 2021 11:41:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:38424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237539AbhGZPXV (ORCPT ); Mon, 26 Jul 2021 11:23:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2068F60240; Mon, 26 Jul 2021 16:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627315429; bh=tLNelaY5OO26pA7MsbTtNpHfSLxFzeY+E9m5ccJVEEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Npqck5xnHCuocsfI7Gg7nPzllxpxDTLqZpykA8maFVyKcxpOYvjXRi+yK3qRC1SnN 05oNDuMLXxRzTJcP8j0LhgC+zd7kdvX9ApfK+iQ4Ov7SsAeJU2rbOlXW2dvd2WGUgb 7NahcV7mpCQWfLEKqL27UwNTzvh2APY4fa/uz2aE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhihao Cheng , Sasha Levin Subject: [PATCH 5.10 093/167] nvme-pci: dont WARN_ON in nvme_reset_work if ctrl.state is not RESETTING Date: Mon, 26 Jul 2021 17:38:46 +0200 Message-Id: <20210726153842.516034407@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153839.371771838@linuxfoundation.org> References: <20210726153839.371771838@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhihao Cheng [ Upstream commit 7764656b108cd308c39e9a8554353b8f9ca232a3 ] Followling process: nvme_probe nvme_reset_ctrl nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING) queue_work(nvme_reset_wq, &ctrl->reset_work) --------------> nvme_remove nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DELETING) worker_thread process_one_work nvme_reset_work WARN_ON(dev->ctrl.state != NVME_CTRL_RESETTING) , which will trigger WARN_ON in nvme_reset_work(): [ 127.534298] WARNING: CPU: 0 PID: 139 at drivers/nvme/host/pci.c:2594 [ 127.536161] CPU: 0 PID: 139 Comm: kworker/u8:7 Not tainted 5.13.0 [ 127.552518] Call Trace: [ 127.552840] ? kvm_sched_clock_read+0x25/0x40 [ 127.553936] ? native_send_call_func_single_ipi+0x1c/0x30 [ 127.555117] ? send_call_function_single_ipi+0x9b/0x130 [ 127.556263] ? __smp_call_single_queue+0x48/0x60 [ 127.557278] ? ttwu_queue_wakelist+0xfa/0x1c0 [ 127.558231] ? try_to_wake_up+0x265/0x9d0 [ 127.559120] ? ext4_end_io_rsv_work+0x160/0x290 [ 127.560118] process_one_work+0x28c/0x640 [ 127.561002] worker_thread+0x39a/0x700 [ 127.561833] ? rescuer_thread+0x580/0x580 [ 127.562714] kthread+0x18c/0x1e0 [ 127.563444] ? set_kthread_struct+0x70/0x70 [ 127.564347] ret_from_fork+0x1f/0x30 The preceding problem can be easily reproduced by executing following script (based on blktests suite): test() { pdev="$(_get_pci_dev_from_blkdev)" sysfs="/sys/bus/pci/devices/${pdev}" for ((i = 0; i < 10; i++)); do echo 1 > "$sysfs/remove" echo 1 > /sys/bus/pci/rescan done } Since the device ctrl could be updated as an non-RESETTING state by repeating probe/remove in userspace (which is a normal situation), we can replace stack dumping WARN_ON with a warnning message. Fixes: 82b057caefaff ("nvme-pci: fix multiple ctrl removal schedulin") Signed-off-by: Zhihao Cheng Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 80e1d45b0668..fb48a88d1acb 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2596,7 +2596,9 @@ static void nvme_reset_work(struct work_struct *work) bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL); int result; - if (WARN_ON(dev->ctrl.state != NVME_CTRL_RESETTING)) { + if (dev->ctrl.state != NVME_CTRL_RESETTING) { + dev_warn(dev->ctrl.device, "ctrl state %d is not RESETTING\n", + dev->ctrl.state); result = -ENODEV; goto out; } -- 2.30.2