Received: by 10.213.65.68 with SMTP id h4csp1897825imn; Mon, 19 Mar 2018 16:50:14 -0700 (PDT) X-Google-Smtp-Source: AG47ELuoKpgzcfuKZWBOcS4VKkcoJU3wM5OVlKGjPKq2LVqV2jnrbCl4ACf4m6Fvx+TMCXXcXM0s X-Received: by 10.98.32.134 with SMTP id m6mr11827785pfj.27.1521503414583; Mon, 19 Mar 2018 16:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521503414; cv=none; d=google.com; s=arc-20160816; b=EU21YMlZ2xmZSOowz/X0Ub6t/uaaXC3yT8SrhKltI8EzBHes+EAw1ULeSzF2gk80Gg B1cHouRj0iTha6ww/8KTRdEZNUteM3eIs7wWrIwTZ6JAXDMxDrc6UQgAueg89745CtnA x5XMj55v3KmdAF6BaYrILutni+AQlkHIQy5FBGBoQlEnGv7JNwJZn8hIs7iHQW4e2Tfm mcsftBtbbKjM1myll4zLbS94+VJWUgSKzZPIwlptX3Ff8ML2+sORfBPi5jIxMY5Q9Y2s RpRPhdyHnwok9gZQPkvXrAbvqFJc0T5E+2tPI3EOyfWk6liUzSZe52V8V5lPgXpGSedt zL7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=/53dMywhgyb/NABz1SMsAIp1A+uc8Ho6xRfHew4QBvY=; b=oTD4kvwEbjzD5cUZSut8XlM+M3Hj5g4DnS7N2/9FDnQSw8H53kufw0OyAuYEvogg1k WfKxbEFQRz/+ayWmnwRrSA5TGCP22fGNYHufb+Sf6I7PtfG2QavzDbk8fzYvk/kEPk1e g6gqFlRU8QM8Ymlx1w9o8ZtS9u2BRb5NtbM3K9uykveXF5qZzUfYa47WG8oIoLNwU95N HEZEHJqUO5kqE7K8kKdv/BfyABndwra8O+1bH2vqjH7EOeZAiCqYylc36Ac7aDUycL2s E3IywQvrIVVJb7u/NmYY/WsH23wa56X/iOv5Ade2fqd32mk31gGnjj24XHxm5QiYtHWp SfwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=iJnqja61; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 79si248845pga.440.2018.03.19.16.49.58; Mon, 19 Mar 2018 16:50:14 -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=@microsoft.com header.s=selector1 header.b=iJnqja61; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967623AbeCSQ4X (ORCPT + 99 others); Mon, 19 Mar 2018 12:56:23 -0400 Received: from mail-co1nam03on0139.outbound.protection.outlook.com ([104.47.40.139]:6160 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966761AbeCSQLc (ORCPT ); Mon, 19 Mar 2018 12:11:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=/53dMywhgyb/NABz1SMsAIp1A+uc8Ho6xRfHew4QBvY=; b=iJnqja61aXWF5uD2A/xvx7hzvfkuHE7L8j4oQqVLpZYBpTCb/DV77G9//vvQHbKuDORvmol4o4/+JbicJOf3NaRCupDcpqQ67k4wfZ3H81e91jP0T/DufGLTA0xzQomOi6ESWEA4/ZfZ3nNG+g6D30uMNetVw0Bw4VtjTtiLmSE= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0888.namprd21.prod.outlook.com (52.132.132.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:11:24 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:11:24 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Ming Lei , Jens Axboe , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 159/167] blk-mq: fix kernel oops in blk_mq_tag_idle() Thread-Topic: [PATCH AUTOSEL for 4.4 159/167] blk-mq: fix kernel oops in blk_mq_tag_idle() Thread-Index: AQHTv5yMkzSUgCLaBUiR7jaJwVMTwA== Date: Mon, 19 Mar 2018 16:08:41 +0000 Message-ID: <20180319160513.16384-159-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0888;7:Kc3ewHO3HEhWWY26sIKvI5WaphVs7AKIRlANiNMRUjatioCWX9fkceGgl6suPaatA5GVpyomyabifr6jeQzkkucssDhC1f1OWoxqaEfQu8K976BKvC/vxaY/xOr8Qika92BkRSJ5CL86SejKvTO0cREHg3VJh6sY9IU98BcGvD5g8CamkGPQ3NySW5StizSKDC6fT1DqN0q+4hGQd9ybLFMcgGgVJPjlJpsm5U1+EU/GHEdlusyIOol/Yr2kbnv8;20:Ju4cGwkJSP3N5MqtpKt6MPh48KB32mLsE1EEMSltzQ3LXphVSPVjXsq3dKDD8QrIVQ1vIdNQ252FsAirpnOEZCr4232ChyRmMeoNOHAtdLoPKnK33b+wx4z91E8oirIQA8S5c91excZX6yxjtXN+ZufZB1law8YrUT42SaPTz28= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d5cabac9-53e2-442c-2239-08d58db41044 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0888; x-ms-traffictypediagnostic: DM5PR2101MB0888: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0888;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0888; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(51234002)(189003)(199004)(6486002)(72206003)(106356001)(86362001)(575784001)(3660700001)(6436002)(68736007)(53936002)(107886003)(8936002)(81166006)(8676002)(81156014)(2906002)(6116002)(4326008)(6512007)(1076002)(86612001)(66066001)(25786009)(7736002)(3846002)(305945005)(5660300001)(99286004)(5250100002)(110136005)(478600001)(36756003)(54906003)(2501003)(6506007)(186003)(59450400001)(26005)(14454004)(6666003)(2900100001)(316002)(2950100002)(102836004)(10290500003)(3280700002)(97736004)(76176011)(10090500001)(22452003)(105586002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0888;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: XQLRLH+xnwZQtXy+RpI64uELL3oA/NOYpK1Feigu76wFeWkhoBClXrnSZ6HW+HK9tnnl7ElH0rAjpSS1QWcTDN1kRzb7r9AWX3BwVDVFpgNgUKjvLwCVCE9k7tETyuir6V+Ma+B7516aCT/Ze3VcyCsL7lT1j/Y3Ake+5LtT3TTYPDzlX0ViwwRya6o/3ha2JxXrXEeet/RDb36dfv6wyQE2Q6NaNyGb1H/JxVe6IVJL1hO87w4/o5iqMJhKV7HSTL62xKnp4FZLb5xZaZ9uGNmb1hkO6wRSV7fg6DMu0/1VeCK9ru2w7mZ7PSvFE01DXd3jecyuAz1CTzn67nLvsA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5cabac9-53e2-442c-2239-08d58db41044 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:08:42.0159 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0888 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ming Lei [ Upstream commit 8ab0b7dc73e1b3e2987d42554b2bff503f692772 ] HW queues may be unmapped in some cases, such as blk_mq_update_nr_hw_queues= (), then we need to check it before calling blk_mq_tag_idle(), otherwise the following kernel oops can be triggered, so fix it by checking if the hw queue is unmapped since it doesn't make sense to idle the tags any more after hw queues are unmapped. [ 440.771298] Workqueue: nvme-wq nvme_rdma_del_ctrl_work [nvme_rdma] [ 440.779104] task: ffff894bae755ee0 ti: ffff893bf9bc8000 task.ti: ffff893= bf9bc8000 [ 440.788359] RIP: 0010:[] [] __blk_m= q_tag_idle+0x24/0x40 [ 440.798697] RSP: 0018:ffff893bf9bcbd10 EFLAGS: 00010286 [ 440.805538] RAX: 0000000000000000 RBX: ffff895bb131dc00 RCX: 00000000000= 0011f [ 440.814426] RDX: 00000000ffffffff RSI: 0000000000000120 RDI: ffff895bb13= 1dc00 [ 440.823301] RBP: ffff893bf9bcbd10 R08: 000000000001b860 R09: 4a51d361c00= c0000 [ 440.832193] R10: b5907f32b4cc7003 R11: ffffd6cabfb57000 R12: ffff894bafd= 1e008 [ 440.841091] R13: 0000000000000001 R14: ffff895baf770000 R15: 00000000000= 00080 [ 440.849988] FS: 0000000000000000(0000) GS:ffff894bbdcc0000(0000) knlGS:= 0000000000000000 [ 440.859955] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 440.867274] CR2: 0000000000000008 CR3: 000000103d098000 CR4: 00000000001= 407e0 [ 440.876169] Call Trace: [ 440.879818] [] blk_mq_exit_hctx+0xd8/0xe0 [ 440.887051] [] blk_mq_free_queue+0xf0/0x160 [ 440.894465] [] blk_cleanup_queue+0xd9/0x150 [ 440.901881] [] nvme_ns_remove+0x5b/0xb0 [nvme_core] [ 440.910068] [] nvme_remove_namespaces+0x3b/0x60 [nvme= _core] [ 440.919026] [] __nvme_rdma_remove_ctrl+0x2b/0xb0 [nvm= e_rdma] [ 440.928079] [] nvme_rdma_del_ctrl_work+0x17/0x20 [nvm= e_rdma] [ 440.937126] [] process_one_work+0x17a/0x440 [ 440.944517] [] worker_thread+0x278/0x3c0 [ 440.951607] [] ? manage_workers.isra.24+0x2a0/0x2a0 [ 440.959760] [] kthread+0xcf/0xe0 [ 440.966055] [] ? insert_kthread_work+0x40/0x40 [ 440.973715] [] ret_from_fork+0x58/0x90 [ 440.980586] [] ? insert_kthread_work+0x40/0x40 [ 440.988229] Code: 5b 41 5c 5d c3 66 90 0f 1f 44 00 00 48 8b 87 20 01 00 = 00 f0 0f ba 77 40 01 19 d2 85 d2 75 08 c3 0f 1f 80 00 00 00 00 55 48 89 e5 = ff 48 08 48 8d 78 10 e8 7f 0f 05 00 5d c3 0f 1f 00 66 2e 0f [ 441.011620] RIP [] __blk_mq_tag_idle+0x24/0x40 [ 441.019301] RSP [ 441.024052] CR2: 0000000000000008 Reported-by: Zhang Yi Tested-by: Zhang Yi Signed-off-by: Ming Lei Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 96bd8d9a9ad7..8649dbf06ce4 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1634,7 +1634,8 @@ static void blk_mq_exit_hctx(struct request_queue *q, { unsigned flush_start_tag =3D set->queue_depth; =20 - blk_mq_tag_idle(hctx); + if (blk_mq_hw_queue_mapped(hctx)) + blk_mq_tag_idle(hctx); =20 if (set->ops->exit_request) set->ops->exit_request(set->driver_data, --=20 2.14.1