From patchwork Tue Apr 7 16:55:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 228129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8408C2BA1A for ; Tue, 7 Apr 2020 16:56:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B165B20730 for ; Tue, 7 Apr 2020 16:56:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="o6brO/Bc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726477AbgDGQ4B (ORCPT ); Tue, 7 Apr 2020 12:56:01 -0400 Received: from mail-wr1-f73.google.com ([209.85.221.73]:37701 "EHLO mail-wr1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726403AbgDGQ4B (ORCPT ); Tue, 7 Apr 2020 12:56:01 -0400 Received: by mail-wr1-f73.google.com with SMTP id 88so2309364wrq.4 for ; Tue, 07 Apr 2020 09:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=aTZRwuZGzS4fVQ/kLmjzku01IifWHY/aDBpFXXFyDlw=; b=o6brO/BcAgXUIMzZwil9h6j4BCs2mAteik00T/fg7znRvO6rLHGBk6mDw3X7IGdLaA Wh20/rPyKvvUXdjiQPeu1Sy2ZfMPagDf3BK8fCSmu6/lEQYSPC7b4ygDvETNfvJIE7NK paP7lUwY9Jx5kKJbK8Ysh5uG6hhW5HtZfI/qtzBM8+gWoaDIREC+43E1TdBQ588RuWgN ZIkm8zpaC5fdMwoT9t5XSRwAz8jpAC3fao+OF/2nCXp4AKWetSPMaReh1ha9cjV0y1BN hCuIjb8bFtDSbFm+UNbJGq+9ZoRQ/uS7hhBoUBGo3jWNh64MEmnRbv3sp5NHJVvE5EFP An4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=aTZRwuZGzS4fVQ/kLmjzku01IifWHY/aDBpFXXFyDlw=; b=PmHTsbtQyXbbA3kqdnPLhbtICVrhmaEsmlqeBe4j3uZWoRTHwFCJZySvUGwJVBXf3v oz5oFFOkvllNukUGWX1YB947Dnhf46OpHqPAhkfz6mpPxzcCsMHqFqvHroOx+Q4XpFgQ jYexsTP4vMXiVC/Al9cQkA7+Ap3mxxI2kExsFl5dn/HjOHv7/rtlcld6vKc/uElIXpdc AqgtmvuWQOIyvUr8z/G/fA+zdHmKxdCVcsmq1NIt13FFxwmwCUiCIeJJgXl6paJTvcG+ YQmixAA9WdwMeYb4x90drQWpA3IamwipT8GClvDeAnVtS3Pd88oSFBIWBVEZhB1uYUB9 6Snw== X-Gm-Message-State: AGi0PubBD6+f3BF/GKoZB67xecE2XE6ggigXkWH4SVouklN2Q1zR0vqm F8mGGeFxJ5mHGYIIiKO5v+ohP13TB/ROKw== X-Google-Smtp-Source: APiQypL+UUFDETDe3RsAJlngoI9gRUBQCKxKFNFKuqjhaffLD1FMrYNPjs2BLZ82bG0qGxYarU0OlFJGZie37A== X-Received: by 2002:a5d:4c87:: with SMTP id z7mr3963790wrs.39.1586278558038; Tue, 07 Apr 2020 09:55:58 -0700 (PDT) Date: Tue, 7 Apr 2020 17:55:37 +0100 In-Reply-To: Message-Id: <20200407165539.161505-3-gprocida@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.26.0.292.g33ef6b2f38-goog Subject: [PATCH 2/4] blk-mq: Allow timeouts to run while queue is freezing From: Giuliano Procida To: greg@kroah.com Cc: stable@vger.kernel.org, Giuliano Procida , Gabriel Krisman Bertazi , Brian King , Keith Busch , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Christoph Hellwig , Jens Axboe Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 71f79fb3179e69b0c1448a2101a866d871c66e7f upstream. In case a submitted request gets stuck for some reason, the block layer can prevent the request starvation by starting the scheduled timeout work. If this stuck request occurs at the same time another thread has started a queue freeze, the blk_mq_timeout_work will not be able to acquire the queue reference and will return silently, thus not issuing the timeout. But since the request is already holding a q_usage_counter reference and is unable to complete, it will never release its reference, preventing the queue from completing the freeze started by first thread. This puts the request_queue in a hung state, forever waiting for the freeze completion. This was observed while running IO to a NVMe device at the same time we toggled the CPU hotplug code. Eventually, once a request got stuck requiring a timeout during a queue freeze, we saw the CPU Hotplug notification code get stuck inside blk_mq_freeze_queue_wait, as shown in the trace below. [c000000deaf13690] [c000000deaf13738] 0xc000000deaf13738 (unreliable) [c000000deaf13860] [c000000000015ce8] __switch_to+0x1f8/0x350 [c000000deaf138b0] [c000000000ade0e4] __schedule+0x314/0x990 [c000000deaf13940] [c000000000ade7a8] schedule+0x48/0xc0 [c000000deaf13970] [c0000000005492a4] blk_mq_freeze_queue_wait+0x74/0x110 [c000000deaf139e0] [c00000000054b6a8] blk_mq_queue_reinit_notify+0x1a8/0x2e0 [c000000deaf13a40] [c0000000000e7878] notifier_call_chain+0x98/0x100 [c000000deaf13a90] [c0000000000b8e08] cpu_notify_nofail+0x48/0xa0 [c000000deaf13ac0] [c0000000000b92f0] _cpu_down+0x2a0/0x400 [c000000deaf13b90] [c0000000000b94a8] cpu_down+0x58/0xa0 [c000000deaf13bc0] [c0000000006d5dcc] cpu_subsys_offline+0x2c/0x50 [c000000deaf13bf0] [c0000000006cd244] device_offline+0x104/0x140 [c000000deaf13c30] [c0000000006cd40c] online_store+0x6c/0xc0 [c000000deaf13c80] [c0000000006c8c78] dev_attr_store+0x68/0xa0 [c000000deaf13cc0] [c0000000003974d0] sysfs_kf_write+0x80/0xb0 [c000000deaf13d00] [c0000000003963e8] kernfs_fop_write+0x188/0x200 [c000000deaf13d50] [c0000000002e0f6c] __vfs_write+0x6c/0xe0 [c000000deaf13d90] [c0000000002e1ca0] vfs_write+0xc0/0x230 [c000000deaf13de0] [c0000000002e2cdc] SyS_write+0x6c/0x110 [c000000deaf13e30] [c000000000009204] system_call+0x38/0xb4 The fix is to allow the timeout work to execute in the window between dropping the initial refcount reference and the release of the last reference, which actually marks the freeze completion. This can be achieved with percpu_refcount_tryget, which does not require the counter to be alive. This way the timeout work can do it's job and terminate a stuck request even during a freeze, returning its reference and avoiding the deadlock. Allowing the timeout to run is just a part of the fix, since for some devices, we might get stuck again inside the device driver's timeout handler, should it attempt to allocate a new request in that path - which is a quite common action for Abort commands, which need to be sent after a timeout. In NVMe, for instance, we call blk_mq_alloc_request from inside the timeout handler, which will fail during a freeze, since it also tries to acquire a queue reference. I considered a similar change to blk_mq_alloc_request as a generic solution for further device driver hangs, but we can't do that, since it would allow new requests to disturb the freeze process. I thought about creating a new function in the block layer to support unfreezable requests for these occasions, but after working on it for a while, I feel like this should be handled in a per-driver basis. I'm now experimenting with changes to the NVMe timeout path, but I'm open to suggestions of ways to make this generic. Signed-off-by: Gabriel Krisman Bertazi Cc: Brian King Cc: Keith Busch Cc: linux-nvme@lists.infradead.org Cc: linux-block@vger.kernel.org Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Giuliano Procida --- block/blk-mq.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 11a23bf73fd9..d13e70d40df9 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -628,7 +628,20 @@ static void blk_mq_rq_timer(unsigned long priv) }; int i; - if (blk_queue_enter(q, GFP_NOWAIT)) + /* A deadlock might occur if a request is stuck requiring a + * timeout at the same time a queue freeze is waiting + * completion, since the timeout code would not be able to + * acquire the queue reference here. + * + * That's why we don't use blk_queue_enter here; instead, we use + * percpu_ref_tryget directly, because we need to be able to + * obtain a reference even in the short window between the queue + * starting to freeze, by dropping the first reference in + * blk_mq_freeze_queue_start, and the moment the last request is + * consumed, marked by the instant q_usage_counter reaches + * zero. + */ + if (!percpu_ref_tryget(&q->q_usage_counter)) return; blk_mq_queue_tag_busy_iter(q, blk_mq_check_expired, &data); From patchwork Tue Apr 7 16:55:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 228128 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BEBAC2BB55 for ; Tue, 7 Apr 2020 16:56:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E651320768 for ; Tue, 7 Apr 2020 16:56:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="u/G+YiNz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726444AbgDGQ4H (ORCPT ); Tue, 7 Apr 2020 12:56:07 -0400 Received: from mail-wm1-f73.google.com ([209.85.128.73]:55375 "EHLO mail-wm1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726403AbgDGQ4H (ORCPT ); Tue, 7 Apr 2020 12:56:07 -0400 Received: by mail-wm1-f73.google.com with SMTP id e16so1177736wmh.5 for ; Tue, 07 Apr 2020 09:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ICm9U3yZy/Ev7sKd+9OKUZakrAzUhKVeWWqfMgFPpQM=; b=u/G+YiNz49YGzK/BWekqu7/L+5x8hBQe4fOW269mekCs0smq/nKvp+aMATTpJrwXzz JGUr+KOKCk0krNm9hrHabeX9xFYirsA3qmgmJzn9a/PKA2+s6RBdWtsVFnMmKBGI598L Q+fPl8PqQc1EwYjO2p91pmK9HFErg8KFUVzqzJsJuPnfIFvA+1lQ6rd57oCoijq05YjK YftHq0k7+GltRRPoQ3BWdaaFfBNnrI82ZlGm0i2GaFXQK/1mlLCb/uBeZdABl/fWC/Cs jkvUdQSjwHkQrquj6jMVJw2qVJ1tyd5PCo1OcRGNRM9eZpXq1jqhASQ9nu+a5xmUciIr qQmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ICm9U3yZy/Ev7sKd+9OKUZakrAzUhKVeWWqfMgFPpQM=; b=SMZZPrgqKbREonfAJsZ3CeKEyxgVjH2W5uxjulyuqcK7p45b+ToKDfpxSvTPbvergt DZ9cMVAAk+6fMARCJy6KmUcHL5X1aNZP8LF1V2hWz7RuqvR0tSjpqV5n3Cz6PpKVVAMN RMDZ2sxsqfgOfRs9hZmprowrSU04PGpodEpx5WPy0S6QchHyBtGjE0AtrxXxXxU73vrr xaCZE0ubgVeFQ9x6klTaC0tyQMEDP+sVXG+BBSVO6X45utsV48Tm58gTU+biUROf2i6z E6FPTR7L/qXkSpDSx6iQxZGKpuJi9DHM9SAX/5X+sFvT9zVxVlJEQQ4zNol/mxh23LBs V+Ow== X-Gm-Message-State: AGi0Pub7CCkBedeGNVEUlbYUw3OHvlhqcHUPPhaPO45zXaVL7eWNsErT 5KJz5X3NIXgijvoQLOEM5GMkF7mNb2nhlg== X-Google-Smtp-Source: APiQypKonT8sho7Fm5zQdHqP0SBns9B7Ah7mj/M/pcKg3iVfFFO2RoYl+SsxwPmpegFIhyxVhG0l2WEz7v7hlw== X-Received: by 2002:a5d:670f:: with SMTP id o15mr3669283wru.120.1586278564132; Tue, 07 Apr 2020 09:56:04 -0700 (PDT) Date: Tue, 7 Apr 2020 17:55:39 +0100 In-Reply-To: Message-Id: <20200407165539.161505-5-gprocida@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.26.0.292.g33ef6b2f38-goog Subject: [PATCH 4/4] blk-mq: Allow blocking queue tag iter callbacks From: Giuliano Procida To: greg@kroah.com Cc: stable@vger.kernel.org, Giuliano Procida , Jianchao Wang , Keith Busch , Jens Axboe Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 530ca2c9bd6949c72c9b5cfc330cb3dbccaa3f5b upstream. This change is a back-ported fix to the back-port of f5bbbbe4d6357, a439abbd6e707232b1f399e6df1a85ace42e8f9f. A recent commit runs tag iterator callbacks under the rcu read lock, but existing callbacks do not satisfy the non-blocking requirement. The commit intended to prevent an iterator from accessing a queue that's being modified. This patch fixes the original issue by taking a queue reference instead of reading it, which allows callbacks to make blocking calls. Fixes: f5bbbbe4d6357 ("blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter") Acked-by: Jianchao Wang Signed-off-by: Keith Busch Signed-off-by: Jens Axboe Signed-off-by: Giuliano Procida --- block/blk-mq-tag.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index bf356de30134..c1c654319287 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -484,11 +484,8 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, /* * Avoid potential races with things like queue removal. */ - rcu_read_lock(); - if (percpu_ref_is_zero(&q->q_usage_counter)) { - rcu_read_unlock(); + if (!percpu_ref_tryget(&q->q_usage_counter)) return; - } queue_for_each_hw_ctx(q, hctx, i) { struct blk_mq_tags *tags = hctx->tags; @@ -505,7 +502,7 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, bt_for_each(hctx, &tags->bitmap_tags, tags->nr_reserved_tags, fn, priv, false); } - rcu_read_unlock(); + blk_queue_exit(q); } static unsigned int bt_unused_tags(struct blk_mq_bitmap_tags *bt)