From patchwork Fri Mar 16 17:35:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10289687 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C112602C2 for ; Fri, 16 Mar 2018 17:36:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C3FD28FEF for ; Fri, 16 Mar 2018 17:36:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8056429004; Fri, 16 Mar 2018 17:36:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 212F928FEF for ; Fri, 16 Mar 2018 17:36:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbeCPRgA (ORCPT ); Fri, 16 Mar 2018 13:36:00 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:26480 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbeCPRf7 (ORCPT ); Fri, 16 Mar 2018 13:35:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1521221759; x=1552757759; h=from:to:cc:subject:date:message-id; bh=hOJbABi+6Gv+heU+be0lZpGGrUIlx50VvW+lXUoeu6A=; b=cN9CZe3zl+sDqOR6/lsLf6OdIJ3UKL7qCjH+YiYuX4pFfWDeMGrHSIwN oaJ8lahepdawiwOIyQvi6P6yv35kjjmGDdRFo1zfEbVrJ1NtkTeHGLKiw 78aIwz4YkMsqRDz4a2tj2w6yD4WPPZ0EthpjACjSJwOKKUX0ugF/Jjq+8 fC9iOMmQ3A5l+KnE/htgrc95lbFP+xmWngtUzstLDFSU2lMwx0Jj+6Dwl 4YtL8r09lIs6enslBEZXmOrb7EGTRFqB3c3ZWM3xGysfVmrkkhr0Nu5/J 4uopC0S2VVSvq55v/8Y0ev3yXEeFEoHvAWa/4KNgDyP4EjeveQi/lHQ09 A==; X-IronPort-AV: E=Sophos;i="5.48,316,1517846400"; d="scan'208";a="73661239" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 17 Mar 2018 01:35:18 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 16 Mar 2018 10:28:50 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.171.236]) by uls-op-cesaip01.wdc.com with ESMTP; 16 Mar 2018 10:35:17 -0700 From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , Ming Lei , Christoph Hellwig , Johannes Thumshirn , Tejun Heo , Oleksandr Natalenko , Martin Steigerwald , stable@vger.kernel.org Subject: [PATCH] Change synchronize_rcu() in scsi_device_quiesce() into synchronize_sched() Date: Fri, 16 Mar 2018 10:35:16 -0700 Message-Id: <20180316173516.3048-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.16.2 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since blk_queue_enter() uses rcu_read_lock_sched() scsi_device_quiesce() must use synchronize_sched(). Reported-by: Tejun Heo Fixes: 3a0a529971ec ("block, scsi: Make SCSI quiesce and resume work reliably") Signed-off-by: Bart Van Assche Cc: Hannes Reinecke Cc: Ming Lei Cc: Christoph Hellwig Cc: Johannes Thumshirn Cc: Tejun Heo Cc: Oleksandr Natalenko Cc: Martin Steigerwald Cc: stable@vger.kernel.org # v4.15 --- drivers/scsi/scsi_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 1d83f29aee74..0b99ee2fbbb5 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -3014,7 +3014,7 @@ scsi_device_quiesce(struct scsi_device *sdev) * unfreeze even if the queue was already frozen before this function * was called. See also https://lwn.net/Articles/573497/. */ - synchronize_rcu(); + synchronize_sched(); blk_mq_unfreeze_queue(q); mutex_lock(&sdev->state_mutex);