Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3355456imm; Mon, 4 Jun 2018 02:04:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK5dwisTRGDkxc8NOjn2Pfk/vaiVL/LJ6++GXjH27s3Qts6tV6iwxqV9G54d1EKIxMlvxDL X-Received: by 2002:a62:f206:: with SMTP id m6-v6mr10918201pfh.171.1528103042994; Mon, 04 Jun 2018 02:04:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528103042; cv=none; d=google.com; s=arc-20160816; b=Dl6GcTlNkA/3XelOXTkcB4c4AnbxSrNFyR+Cf2GYQitQVSEIMp+LEN7VuID/NQj14v f8i7aTpXo/GltcU4AZ+lNIkj1k2hNy2YSQKlixNWpLpQbQRL3UGzfqBWpiq5H71pUEwZ XCpAd8cEvYv0enHn2YB6X7wG/REUa7hjfxq5deRLXTxG0SYSgTjUeDmeiH2QOqcrtzAS qG+Yc9OdpoYHY9gGKSETpZZ72daJbn9JIww1IPBB/EyPYlghXbwGosq8XTt0ROyE7fXN iTUenyGb0T43eQbGaIe3Xh12zx/bVC6+/qxo6BaKxix5dcrVxvkWFA/aiaVNaWTP9xM4 OPnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=5UWZDNmCU7KlowXwS/5pzx+AXirYeWyoklngChiqdTU=; b=lGE+iKX4LfUncEZP/EyfOJZWWZYV6DnoubeIU3vuO8kWAOKJSRAjg9qV8358385rZI G5ZSfEvjTu83hJy4kFFpvVBHz1hkMg9iszzOfb7dbfNxOR046Asf4UpTHTqfVlUCJeNM OehiKKkiJTkhoOmPbb9hoFew+cM0Fps1tXNMBNg4lsGXkJGNUcF6o03AbLxASBiZwqqU HENsycG/A0lpG5irdYGUs5mq70MlMCdmxmvZIZfol4jTWEMMQVIJsomXcuiSM3QoDv+Z YAD8Ffl0Ek9Vd1UyFS37VjP0JuoxWfSfPtE/IKpuVpNThzFJNqyjmyA9/P0/xmUxoYSA Si+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=BxNuLKv9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5-v6si46204626plh.340.2018.06.04.02.03.48; Mon, 04 Jun 2018 02:04:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=BxNuLKv9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093AbeFDJDT (ORCPT + 99 others); Mon, 4 Jun 2018 05:03:19 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:46538 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbeFDJDR (ORCPT ); Mon, 4 Jun 2018 05:03:17 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5490Ufx143936; Mon, 4 Jun 2018 09:03:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2017-10-26; bh=5UWZDNmCU7KlowXwS/5pzx+AXirYeWyoklngChiqdTU=; b=BxNuLKv91Z+MfLI1+4218P0nUNVCUKWIoIhLWayiqPg+7G1o+5u9OP5TMtyln2oRLMiy stfQuCtsCGm+88wm21DPPQd/iTaRHsaRbs+7YGmTSyNAYCngNCwcOOhmjhemkps+Fkjl Qh5WdZX2ZwGJ8GBsTywG7YAHdfLu8BzXi6uCnQKEG2/7efOARrbGFAv3lmxLlEBn9Fy/ pCu/zlUnGgDLa7hXEfrz0feN/8LoJ1T7MnTkkuxMKoA48NdxXOPoN747wCMfQpqYlVcV vopqa0AHsbts7Aw6AVIKZEuvk+aJFNyprjHAwAe49WP2SokKRGWLsCzeIFTkm12Gq4It eg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2jbvypam5y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 04 Jun 2018 09:03:03 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w54932ic009855 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Jun 2018 09:03:02 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w54931eB002898; Mon, 4 Jun 2018 09:03:01 GMT Received: from will-ThinkCentre-M910s.cn.oracle.com (/10.182.70.254) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 04 Jun 2018 02:03:01 -0700 From: Jianchao Wang To: axboe@kernel.dk, ming.lei@redhat.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] blk-mq: return when BLK_MQ_S_STOPPED in blk_mq_run_work_fn Date: Mon, 4 Jun 2018 17:03:55 +0800 Message-Id: <1528103035-8009-1-git-send-email-jianchao.w.wang@oracle.com> X-Mailer: git-send-email 2.7.4 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8913 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=880 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806040113 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org if hctx is stopped, don't run the queue in blk_mq_run_work_fn. Fixes: 15fe8a9 (blk-mq: remove blk_mq_delay_queue()) Cc: Ming Lei Signed-off-by: Jianchao Wang --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 9ce9cac..d0ee928 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1578,7 +1578,7 @@ static void blk_mq_run_work_fn(struct work_struct *work) * If we are stopped, don't run the queue. */ if (test_bit(BLK_MQ_S_STOPPED, &hctx->state)) - clear_bit(BLK_MQ_S_STOPPED, &hctx->state); + return; __blk_mq_run_hw_queue(hctx); } -- 2.7.4