Received: by 10.192.165.156 with SMTP id m28csp1086025imm; Wed, 11 Apr 2018 12:08:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/+OuDAy763wvBsoldShvRPkZByZ9LPREVhUcUYCskGC3lve6mk73Jg2C97SeIltXqXXHr+ X-Received: by 2002:a17:902:9898:: with SMTP id s24-v6mr5155134plp.51.1523473715402; Wed, 11 Apr 2018 12:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523473715; cv=none; d=google.com; s=arc-20160816; b=UF3NfMSjj+y22fnI2gumz8oVLlmUCyIQDNbk7p2fGPv+aOM4wjXLMgmeej1cuVzPOZ v1kUpCDVdeRmSw/lgxpmJMhlCyWrv52Bjlw8hi2M8JEz0FKGXiVT/BMLYcyWZqZAaFy6 cvV4BWfttQ/MgwJatm66cPO/jeDN/Tf/5laDOYkv+zhiGEf+/cCn4ujvlEwmRtf6QBDn CIdYtZtS6DYRKofWj09eTTjX6qqLqH8VU+TtVx05xscoNEZ4kPy6DsagachqSTp6Yf2M 06V4rN8cGdN4VkwUqBAp4Q6oWpUb75SarfwthO5AND80uXZpHqX1w4uPhjokbiQy4xZ6 LwEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=EvmZf7pDunr0D9SpdQay3IElfVPG9ybIR1bk+pAIeaA=; b=HIGMn9zeRc3mG+cJkcoDpJjhAAWnIghc/KZfwRMeW4fJDPSr9FBdUio5Ra8CLemCon QPmebsLmh6GWs2mwamPvDrSXZYGZ/xsUqW8LssxewvAOS2oA+uce21SF5z2D/UWWfWhV lVY4jBn1RaGrWcbVAwXiETmHxS1rhz3n9fb2S560J3JBCjFvTk8tvsBervkdG80gLOvb Zo9AcMnbTLyQP5xaZ/Ieb1rqAmOz+IShHEvJ20r1hHNz0JY0IYJTj7wJ3yEDyD5E+i1y XLJzIiH1w7LIiyI1tCc8OpIToePQEBXt1DBio+TQGlDkDn2Oeckb53+FWt3ae8FiA9PK +HsA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i63si1337710pfk.159.2018.04.11.12.07.57; Wed, 11 Apr 2018 12:08:35 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934878AbeDKTEi (ORCPT + 99 others); Wed, 11 Apr 2018 15:04:38 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:39918 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933967AbeDKTEf (ORCPT ); Wed, 11 Apr 2018 15:04:35 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 952ADBAC; Wed, 11 Apr 2018 19:04:34 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Yi , Ming Lei , Jens Axboe , Sasha Levin Subject: [PATCH 4.9 262/310] blk-mq: fix kernel oops in blk_mq_tag_idle() Date: Wed, 11 Apr 2018 20:36:41 +0200 Message-Id: <20180411183633.935508832@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ 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: ffff893bf9bc8000 [ 440.788359] RIP: 0010:[] [] __blk_mq_tag_idle+0x24/0x40 [ 440.798697] RSP: 0018:ffff893bf9bcbd10 EFLAGS: 00010286 [ 440.805538] RAX: 0000000000000000 RBX: ffff895bb131dc00 RCX: 000000000000011f [ 440.814426] RDX: 00000000ffffffff RSI: 0000000000000120 RDI: ffff895bb131dc00 [ 440.823301] RBP: ffff893bf9bcbd10 R08: 000000000001b860 R09: 4a51d361c00c0000 [ 440.832193] R10: b5907f32b4cc7003 R11: ffffd6cabfb57000 R12: ffff894bafd1e008 [ 440.841091] R13: 0000000000000001 R14: ffff895baf770000 R15: 0000000000000080 [ 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: 00000000001407e0 [ 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 [nvme_rdma] [ 440.928079] [] nvme_rdma_del_ctrl_work+0x17/0x20 [nvme_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 Signed-off-by: Greg Kroah-Hartman --- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1592,7 +1592,8 @@ static void blk_mq_exit_hctx(struct requ { unsigned flush_start_tag = set->queue_depth; - blk_mq_tag_idle(hctx); + if (blk_mq_hw_queue_mapped(hctx)) + blk_mq_tag_idle(hctx); if (set->ops->exit_request) set->ops->exit_request(set->driver_data,