From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DE723EE1F3 for ; Thu, 23 Apr 2026 12:55:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776948960; cv=none; b=B/uqBf++Bh2k+vAV54VDQy05vqNfoc0Y8goBEZ4x7yOGE6TtbR/b8coU9Q5KgXnRy4MlawvaP24fbEBhrQCrmUZx5OcEjWsJW2TkOCgHrp0b5vhdNDylQApXOs66po0tiNEKPMcc32sf5PEJJs3tw2BDvJirt+kUgNg8bRHDhRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776948960; c=relaxed/simple; bh=gFRQZa+5+6T/UvUfG+iSQp84/qWQUKfeR2MbrBywW4U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=eydQocOk/TPNrcIqH3wU5WdZzA3wj3g02RGKHEcieILdWDgfllln84r//eLoW5peYrgWfSUhhh059+DwVh2T7NpttGkLYoe4hkPgg5ypvOqMqLtyn6n9ByUsTQyA8yu3hoZsRPZLzNVsB1y3YepcHpvOg4C+mD5FT2slltg8ZSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=av/y1B1l; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="av/y1B1l" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so30334445e9.1 for ; Thu, 23 Apr 2026 05:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776948957; x=1777553757; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gnRdDLrWpQ9VAViP+Lb+FjcuP4xTGaJIWlgeZ0peEtU=; b=av/y1B1lrej3T/vobG74hzQ2dW8Ku/bUTC+WW23Qt3Kdh4tQyxZq7TzurPLzove91s RFm0iT9EY23YPcvdX6PpE0GG1nPtv3V7HyRHp/FYAQ+tpjX3jZ3XxAPIyulCcTrojWtL VKWqF3uIQrDphJ0cw1zlBXFh2wpSO4b4OgQXsEBqX4JyI3hIdiAS0R5YwbhmLkPev3gl XrdQTsEBmaUQmbaJ2Il9OCwsSP38sADmAvZo7IWrIl17tFvFvpD23Rrxc9pjnk5szZrk p/f6iFHgsFfqQoyvlRBmwnNz1ep/kiDP8sCJFN4mOVW+I+XY28xLabjdUehad5W7j2r1 EKVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776948957; x=1777553757; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gnRdDLrWpQ9VAViP+Lb+FjcuP4xTGaJIWlgeZ0peEtU=; b=e660+sYRblVDV+B0JUe0fXtrNg3EQp9HHxykY/vN12CSB+rGNWIDyTG+VOyQiTK28W GKL85vrFBrdvTJ89iABv0RYamGhTFu1v1s5MSryV+vPZauvM02J0FQzM+/D9LFY2Fmwd 04f7UAqeMPOwvrQllVKcZUfo3VflHh0AIG3UyraGvwQxziXesPZmjveYd8JR6flx8FBC EQxY66dt6Zy/hhAWr6vXFX0lulYFInW2LAifYtm6oP+MnuDpGgeogLkzrREmEwdDxUwO 1HZNYh4i7tbRn+jI0c2MSJZ19qEZRuqPG6syirwUWqEjCtdW6MG2Z4XMSJ0OuxxRONbB bAHg== X-Gm-Message-State: AOJu0YxT2ZP+6fIyS0PGcKfT+mwxwUG2CmPgan1EMPasBpXJ83TgNH0d ZFsoLK5pOcRwRY7gA/dvVhQmR0JfRZn5VUxLvqmMW/ZPe/0SIBxD7Swq X-Gm-Gg: AeBDievGFcpwTzJ2su1i847obMSQDHDbKpvErelwNCUA2p8YQm8B0xr74YcVu50S6/Y ragD8uS66c3bzd/cROFAzYa8KkXKL44qe9VUNGXCK5v4g9zGo2/CDJQFwLBciIghh5PuXSlzzn3 ii+JelfXCOKwJ0gaYQTUNg8GpD8II9xzTrliEaxeJtHAvFbU4bTxA0GTpOko3t8SdloD4CkqFcQ /koF+do7uKYg+Pl5Fmvc5ob8j+uQxPcuuIlmqOGfKbxOsdM3eqOhhV0EdP4CutIH2lfgOZuFgLy 8oeovwIotDwt4K4dyePa1tr0VYqGOPZDNKaeiIg7R4itDi4OiZIeARrSe6ljQFFUgAATOpDS86q 2vZHCzCmfRJlQBAF2epGwBf4y9Pvnc2SeLRFpllhufxwZRSHPTpEbxLYjv8d4i2MGfby0zMZwUP lCLu86YdXvACe0PJYr5Kkrd6xgQdfeEJw3qU9UTFvfF3LVEhmyysQJWe1iAdr0tTZgTOu+cm5Fk 0lPS3N9j2vMcLDImkA= X-Received: by 2002:a05:600c:570f:b0:488:a502:8955 with SMTP id 5b1f17b1804b1-488fb882f13mr284091745e9.4.1776948956507; Thu, 23 Apr 2026 05:55:56 -0700 (PDT) Received: from fedora (185-147-214-8.mad.as62651.net. [185.147.214.8]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cb1176sm54409368f8f.3.2026.04.23.05.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 05:55:55 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ming Lei , Michael Wu Subject: [PATCH] sched: disable preemption around blk_flush_plug in sched_submit_work Date: Thu, 23 Apr 2026 20:55:28 +0800 Message-ID: <20260423125528.2917171-1-tom.leiming@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On preemptible kernels, a three-way deadlock can occur involving blk_mq_freeze_queue and blk_mq_dispatch_list: - Task A holds a filesystem lock (e.g., f2fs io_rwsem) and enters __bio_queue_enter(), waiting for mq_freeze_depth == 0 - Task B holds mq_freeze_depth=1 (elevator_change) and waits for q_usage_counter to reach zero in blk_mq_freeze_queue_wait() - Task C is going to sleep waiting for the filesystem lock. Before sleeping, schedule() calls sched_submit_work() -> blk_flush_plug() -> blk_mq_dispatch_list(), which acquires q_usage_counter via percpu_ref_get(). If Task C gets preempted before percpu_ref_put(), it will not be scheduled back because the task is already in uninterruptible sleep state (TASK_UNINTERRUPTIBLE). This means it holds the percpu_ref indefinitely, preventing freeze from completing. This is fundamentally an ABBA deadlock between queue freeze and the filesystem lock, exposed by preemption creating an artificial hold on q_usage_counter during the plug flush. Fix by disabling preemption around blk_flush_plug() in sched_submit_work(). The _notrace variants are used since this runs in scheduler context. preempt_enable_no_resched_notrace() is correct because we are already inside __schedule() and about to pick the next task. Fixes: 73c101011926 ("block: initial patch for on-stack per-task plugging") Reported-by: Michael Wu Tested-by: Michael Wu Link: https://lore.kernel.org/linux-block/20260417082744.30124-1-michael@allwinnertech.com/ Signed-off-by: Ming Lei --- kernel/sched/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b7f77c165a6e..4217aaaa8e47 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6966,7 +6966,9 @@ static inline void sched_submit_work(struct task_struct *tsk) * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. */ + preempt_disable_notrace(); blk_flush_plug(tsk->plug, true); + preempt_enable_no_resched_notrace(); lock_map_release(&sched_map); } -- 2.53.0