Received: by 2002:a05:7412:9c07:b0:fa:6e18:a558 with SMTP id lr7csp777133rdb; Sun, 28 Jan 2024 08:27:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiycg4lBOBLwiRwZh1YkSuLaouPwSx7Qg8h6VPVo74Wdo1YhIL8If+Hd9dybafzyWZ5JNF X-Received: by 2002:a05:6214:1d27:b0:681:83d2:9a77 with SMTP id f7-20020a0562141d2700b0068183d29a77mr4778210qvd.68.1706459277648; Sun, 28 Jan 2024 08:27:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706459277; cv=pass; d=google.com; s=arc-20160816; b=Ga3rJzmKUsqyMmkCYYhYqYhOpkCHUlaupvDcd1K+VV6c+XoBiXfKWVs7Ki7SI9ln5/ Rd89IcZzxs6YODhLqHdHZp4RZlrhZQCogtm16hd/x2j0u+51WaqmDRxtt0k71mXTue+u MyVEP/5kgnI1QhU1/OfN9ZspAbIeHAofkevmbdnemCb20o6qI8FjekkkIktQngo1gwq9 Jmtkp2SNZ176ZuXNKYt8jFQVSP+SnRfpHvedqtjkxT3aQIgJsJdQjXVjIFlF/VWNRS5K bxEFhv5wvnxQRbTKXN0jpgUAsFnuIQn8Nnl4FJK/qXKuHHJ9DrcBnhBQWfA+OyadjOAd 35Sg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=64jBVn5GfcHt3ffqBl51PCYjh/B0BKFGGKKsTHvOG04=; fh=yCl2Hr/rmtARhl3WqPMth7NjRg762W/5l/QZq9tKyXI=; b=T1xwT2QcLRqCJ31279GDOSaEAw3YT14dByncldQpAmw6Kps6W4x9P6s9F5e+5gSq94 4PXTCzJ/KQXW8Th9iwe3JbhS/pxvdfb9YRI+LGIOxw+QDnmsWqnFlm2JtVLLdoZYkNH8 Km9Dma0FhgBYJhfc0gPCc9U2z3mQECApYONy8duxU+OubaP578AOhs+NYGMcU/lHkmUT 8laclqoN6soBx9wa/cfBZQZOdIi4mIHL8z+tpDutzkKYqF/6yUkWM9lGX8kGHZIysZIi lE41coLRQR0LixDpAhkdCrJD+F23veBvWkyueA1R7i1j0GwJk1Zr3Sy4urBrgdEFzCm0 ZW2Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sJLEApAk; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41743-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41743-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id 12-20020a0562140ccc00b0068c4223caaasi2713240qvx.224.2024.01.28.08.27.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 08:27:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-41743-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sJLEApAk; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41743-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41743-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 68EDD1C2098E for ; Sun, 28 Jan 2024 16:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 61B5364CE5; Sun, 28 Jan 2024 16:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sJLEApAk" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5171B64CC4; Sun, 28 Jan 2024 16:13:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458433; cv=none; b=i3x5i7stzvO2OeQJz1GhxZz8qFuxVOR78oLJKoJvCvvAKJD/dnjTojPZTlGbWbIxgqoTfTjFInK/xjn0be5bTN/FTCYjPqYEF3YChVvUipWzbv9nLw7Ijq264Rmed7zP6BYxT7Iie5ABPG3r6/xb3RpfIWmFq20PH3WgQ3860EQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458433; c=relaxed/simple; bh=yJ1Oj3swyiAjLs0NVZWmoFRw1rXXItNVrGGLG54VkcA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R5Pedq5KeThaEa2KTSVjZ/s17u/uGZO7UZxNoyUIY2M9S3hlwZBwTShiFsDCnHNnMBY6BM7671EWpuxW6zPTy4xDsTj6VcNyDKK6VixU3F51HfuKaCO5uXgA6/tdDJBYL8PZvRnfyZ+iw/DKZjVQpMmC+WVVTVo3DancqQuhwtA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sJLEApAk; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B0EEC43390; Sun, 28 Jan 2024 16:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706458433; bh=yJ1Oj3swyiAjLs0NVZWmoFRw1rXXItNVrGGLG54VkcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sJLEApAkgPjqT6xPuN/CecWnpeWW6MfZZMoYu2yIHN8EkvYvkANsvl1aIRBx3Tzg3 Ovw+nA+3Tzd0qbFRer4BWjdcS5NbKnBiRhLIVvg3a094C2WG9DTZLEcrtqQIuhTDLe fWwuvPnrYI7Q7cv5yNAwG+Wo9IQst2ABvX9C9jVWwxzJ0SdwWUpaoq/+jsvTKS9rbs yk+alIV9V8UqctNU/zPnXQSTayyJOfJa+ZaQA4TnGsa9v0Ie0bMhb8n0/dJ9GuyEir Aq7eDb1DJAnVz0FPY59owUBojt5eVKS7JGqSWeoqzGKoztXPvyegf34eORPeSB9QYG 8O3RNqNd1h/fg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ming Lei , Jan Kara , Kemeng Shi , Changhui Zhong , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 22/31] blk-mq: fix IO hang from sbitmap wakeup race Date: Sun, 28 Jan 2024 11:12:52 -0500 Message-ID: <20240128161315.201999-22-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240128161315.201999-1-sashal@kernel.org> References: <20240128161315.201999-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.14 Content-Transfer-Encoding: 8bit From: Ming Lei [ Upstream commit 5266caaf5660529e3da53004b8b7174cab6374ed ] In blk_mq_mark_tag_wait(), __add_wait_queue() may be re-ordered with the following blk_mq_get_driver_tag() in case of getting driver tag failure. Then in __sbitmap_queue_wake_up(), waitqueue_active() may not observe the added waiter in blk_mq_mark_tag_wait() and wake up nothing, meantime blk_mq_mark_tag_wait() can't get driver tag successfully. This issue can be reproduced by running the following test in loop, and fio hang can be observed in < 30min when running it on my test VM in laptop. modprobe -r scsi_debug modprobe scsi_debug delay=0 dev_size_mb=4096 max_queue=1 host_max_queue=1 submit_queues=4 dev=`ls -d /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*/block/* | head -1 | xargs basename` fio --filename=/dev/"$dev" --direct=1 --rw=randrw --bs=4k --iodepth=1 \ --runtime=100 --numjobs=40 --time_based --name=test \ --ioengine=libaio Fix the issue by adding one explicit barrier in blk_mq_mark_tag_wait(), which is just fine in case of running out of tag. Cc: Jan Kara Cc: Kemeng Shi Reported-by: Changhui Zhong Signed-off-by: Ming Lei Link: https://lore.kernel.org/r/20240112122626.4181044-1-ming.lei@redhat.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-mq.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/block/blk-mq.c b/block/blk-mq.c index 20ecd0ab616f..76b5b65ca62f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1870,6 +1870,22 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, wait->flags &= ~WQ_FLAG_EXCLUSIVE; __add_wait_queue(wq, wait); + /* + * Add one explicit barrier since blk_mq_get_driver_tag() may + * not imply barrier in case of failure. + * + * Order adding us to wait queue and allocating driver tag. + * + * The pair is the one implied in sbitmap_queue_wake_up() which + * orders clearing sbitmap tag bits and waitqueue_active() in + * __sbitmap_queue_wake_up(), since waitqueue_active() is lockless + * + * Otherwise, re-order of adding wait queue and getting driver tag + * may cause __sbitmap_queue_wake_up() to wake up nothing because + * the waitqueue_active() may not observe us in wait queue. + */ + smp_mb(); + /* * It's possible that a tag was freed in the window between the * allocation failure and adding the hardware queue to the wait -- 2.43.0