From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.67 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793077350; b=Aa8UIY7VW0uOV4G9bsCI/J1ghEOKGvacKNi/cLy9FSRj3Z5dHLpQekZUhPjA5Ed1g+GB w1TAq0BBjwPWjIJD498mhO6xNGP74GCiCW+PI+UkMSZz3EvwKKxN3LHSBTs78RVc5vVtW wuLew5pABKEP1W7vIElrivQqjr6S9tGHbTfWrUKl7LgwQY96ul5/JNVMFlsVZnXibfjnk WsfzKgafONOdlRqGyV6NOH97ZZkM1w9YnWoGD3wb9Fxd7HAvKnUKdp+NPhBWEk/uEyu7R hkVrqWrj84/SsLfPjkBTCbdLLWtXsG8jBLkQwkNTwDcLPxdijiDRhq+V2X9GGOiMPHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793077350; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=yzZEC/TrZrxGucG9Xp1MOjisRqHlcLyLSCjwMz8NQVc=; b=T/67yXHOyQqRisQ3qF4REFfrNXFq16xIDfrBXTbeC8namv5Z4M2ZsVoUEjtA9NoOf8+x iELzbZpQTfs1jTFwJ9DVAyeGKGL0AUh7Yjx2j0PHvyVeelrUo2e/NFgbQAvHdO25/yYwY 32kb3R6S7ufia6FYVkkuLYAUmECAJEITPxF1a7Wzps6Dr4Wt5zIriecSiXUOTM++pYAT5 kmy0QXXBrMuErOmw3loqWpokbt0R2LaFQK773S12niYgRoup7nqv1gSOfzDqLRbg0oM0r kATTv/IJrfWqpvq6ZjjW+zTRj93DYYvhvb2G7FhwjqLbBTf4KxWBgZDwzpc+DgHRvIg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=c5XSdy4z; arc=none smtp.remote-ip=74.125.82.67 Received: from mail-dl1-f67.google.com (mail-dl1-f67.google.com [74.125.82.67]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26DF5606A31B for ; Tue, 27 Oct 2026 05:02:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 26DF5606A31B 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=c5XSdy4z Received: by mail-dl1-f67.google.com with SMTP id a92af1059eb24-1438d9363fbso601578c88.0 for ; Mon, 26 Oct 2026 22:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793077349; x=1793682149; 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:content-type; bh=yzZEC/TrZrxGucG9Xp1MOjisRqHlcLyLSCjwMz8NQVc=; b=c5XSdy4ztScAIiHgbPzGCVSJIwwkHGig0lgK23rWrPwg2l/EKPeyBzJ4Gk4qh1LNAI MqpDU3M93ZSDM+ZfHyQTNPLIYH7LKE6PTt6HVbeNcuEYx91FkUq3yXneMCsmRLiYZyhk COvqB26ApyfjUcwF4LFaatMeEEo8DskjXHgjAbZ1c4pF2HSwBqpsYIherHx/ZA5Qpyto 59XFgop9BtU2vW5DsMfa4F4kmX/QOuT6surKOluEPqHhb6F7/B/AaksXrGCW/u/Lfzmg pONuPLkyFV2rhOkOmDTHeBv1j29LBBawuHyOHuKvN8USegNEiNFStaFRuMu8BYEzFllU cipQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793077349; x=1793682149; 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:content-type; bh=yzZEC/TrZrxGucG9Xp1MOjisRqHlcLyLSCjwMz8NQVc=; b=vlh5ioyFC7vO7IPV6nxDZJwYC6mmWHdXErV8d4Ze3w6xZ4gIaW7Wnh++/NJV7rOV0j Q8tCf73syaxUJMHN4KowNjGDcD667W2UG+oXBuM6qvy8B2Vg9f0U07CAPmkFyTr0j5YQ AGR2ekwmSSHig2sSO9ggg36WfbiOCus+XaCbiIyPCyDHAFewMzr1La2JyBA6cl0nUAAP HW+CZROBq1C+VkQxtlTDVhBNlg2+vLAq1daH0FG+pymbeclY/waysqLJu784Yx1qZdeR tOCsFT/CrGSnDbEP370jpOBAmX9AotkyNtRUEMj4qP/J2TxL7hQeL7rRBhQbawE6D6uk jxtg== X-Forwarded-Encrypted: i=1; AKwUvBy7H62IgCxxN/g1SE8NkL03/fv71v0+tQETUzSOPJBx+f+9k4AehbqaC47Auq6k/WKAtPXcQz0s2M16cSg=@vger.kernel.org X-Gm-Message-State: AFq9FYLAN0joZ0gU5z3aH+lLzQwkjxQmz2Zaxx8ZSbEX2RG+IltXllPK Rxg5zllWmGLQ2WnPyMPA0S/9raCgy1lMLwqR2kayyajViEHedHGJVi+C X-Gm-Gg: AYBFou3Tgpc3p0bLvRobF6jyzjde4kGLwk78Ev0gp98c2rSrlm1OhrkLvPO0Arsl5dK lEZkCP1dfa6bUspggMzu9JpEJxV7xinFirlGyAdgBK5rLJEVmn7jVSlQvuhHf/autigaBLEAkPJ AIrJaXE76wRMCKvTKUdpGLs1sipC85sOTA7cg9BnnGt+QS4s8KWGScn2bjDp64ECEtSTZtApPgK Y84HMoi1rDgj9eEwlAdcsBlBcDrhiHjkcEqatybC2VWOqjxBFz4VZRjjGEs7VWsbTLIfG/eu7EW J+YWnyJ/xtk6V5YNe4gHXXXF2+/Mzsr8fEg/soJ3jogk5YCwqjwEUNWJ/9mq+FCfPqWAIQ/KhZg qTjWFosi6o74tKkI0CweYfWR8GRryKu03SLujPoggTcLu6f8/V9OboNGz0NpLo6yYJexeVO4Gie 6njddltnX3BmsX5OEdzvIME+cPIF4OKkZE7/V+VppGlI6DUTo1nzMeshbW6in9uuMSJQAPAwVDi LYgkpI5wzkEmlH8MnJhJEQSvzH2yRD0DiVRrCeaoFsRwg0kJDHP0TBNVO3BvsVTL2u8UdDWd4cO kAMF/bxWtandZKqo X-Received: by 2002:a05:701b:4505:10b0:15b:1959:15e0 with SMTP id a92af1059eb24-1a3c76669abmr2075046c88.4.1793077348863; Mon, 26 Oct 2026 22:02:28 -0700 (PDT) Received: from blue.tailcc13ef.ts.net (104.194.64.109.16clouds.com. [104.194.64.109]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-198a020df20sm35374587c88.6.2026.10.26.22.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 22:02:28 -0700 (PDT) From: Yao Yiqi To: deller@gmx.de, tzimmermann@suse.de, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, yaoyiqi3@huawei.com, stable@vger.kernel.org Subject: [PATCH v3] fbcon: Avoid cancel_delayed_work_sync() in atomic context Date: Tue, 27 Oct 2026 13:02:15 +0800 Message-ID: <20261027050215.612762-1-yyaqia@gmail.com> X-Mailer: git-send-email 2.56.0 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yao Yiqi fbcon_cursor() can be reached from the console printing path, which runs in atomic context. When the VT software cursor is enabled (vc_cursor_type & CUR_SW), it calls fbcon_del_cursor_work(), which uses cancel_delayed_work_sync() and therefore may sleep. With CONFIG_DEBUG_ATOMIC_SLEEP enabled, the following is reported: BUG: sleeping function called from invalid context at kernel/workqueue.c:4722 in_atomic(): 1, irqs_disabled(): 1, non_block: 0 ... __cancel_work_sync fbcon_del_cursor_work fbcon_cursor hide_cursor vt_console_print console_unlock ... Make the default helper safe: fbcon_del_cursor_work() only stops blinking, using cancel_delayed_work(), which is allowed in any context. Every "stop blinking" call site keeps using it, including fbcon_cursor(). Only fbcon_release(), which is about to free @par and must ensure that no callback is still using it, calls the separate fbcon_del_cursor_work_sync(). New call sites therefore get the safe variant by default. cancel_delayed_work() does not wait for a callback that is already running. Since fb_flashcursor() re-arms itself, a callback that has already been dequeued by process_one_work() can queue the work again after fbcon_del_cursor_work() returns. Add a cursor_blink_on flag to struct fbcon_par: fbcon_add_cursor_work() sets it, fbcon_del_cursor_work() clears it, and fb_flashcursor() checks it after taking console_lock and returns without drawing or re-arming once blinking has been stopped. Keep the requeue inside the console_lock section so that the flag check and the requeue are not split by a concurrent stop. Fixes: 3b0fb6ab25dd ("fbcon: Use delayed work for cursor") Cc: stable@vger.kernel.org Assisted-by: Opencode:deepseek-v4.1-flash Signed-off-by: Yao Yiqi --- Changes in v3: - Add cursor_blink_on to struct fbcon_par so a callback that has already been dequeued by process_one_work() cannot re-arm the work after fbcon_del_cursor_work() has stopped blinking. - Keep the requeue inside console_lock so the flag check and the requeue are atomic with the stop. Changes in v2: - Reworked per review (sashiko-AI): do not guess the context with in_interrupt()/irqs_disabled(). fbcon_del_cursor_work() is now non-synchronizing by default and therefore safe from any context; fbcon_del_cursor_work_sync() is added for fbcon_release(), the only path that frees @par and needs to drain the work. - Move the requeue in fb_flashcursor() under console_lock so a running callback cannot re-arm the work after the non-synchronizing cancel. drivers/video/fbdev/core/fbcon.c | 41 +++++++++++++++++++++++++++----- drivers/video/fbdev/core/fbcon.h | 1 + 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 94abbb5ac766..0847dcf18416 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -410,7 +410,8 @@ static void fb_flashcursor(struct work_struct *work) if (par->currcon != -1) vc = vc_cons[par->currcon].d; - if (!vc || !con_is_visible(vc) || + if (!par->cursor_blink_on || + !vc || !con_is_visible(vc) || fbcon_info_from_console(vc->vc_num) != info || vc->vc_deccm != 1) { console_unlock(); @@ -422,25 +423,53 @@ static void fb_flashcursor(struct work_struct *work) par->bitops->cursor(vc, info, enable, get_fg_color(vc, info, c), get_bg_color(vc, info, c)); - console_unlock(); + /* + * Re-arm under console_lock so that a concurrent + * fbcon_del_cursor_work() cannot race with this requeue. + */ queue_delayed_work(system_power_efficient_wq, &par->cursor_work, par->cur_blink_jiffies); + console_unlock(); } static void fbcon_add_cursor_work(struct fb_info *info) { struct fbcon_par *par = info->fbcon_par; - if (fbcon_cursor_blink) - queue_delayed_work(system_power_efficient_wq, &par->cursor_work, - par->cur_blink_jiffies); + if (!fbcon_cursor_blink) + return; + + par->cursor_blink_on = true; + queue_delayed_work(system_power_efficient_wq, &par->cursor_work, + par->cur_blink_jiffies); } +/* + * Stop the cursor blink. + * + * Does not wait for a callback that is already running, so it is safe to + * call from any context. + * + * console_lock serializes this with the requeue in fb_flashcursor(); + * otherwise a running callback could re-arm the work. + */ static void fbcon_del_cursor_work(struct fb_info *info) { struct fbcon_par *par = info->fbcon_par; + par->cursor_blink_on = false; + cancel_delayed_work(&par->cursor_work); +} + +/* + * Stop the cursor blink and wait for a running callback to finish before + * @par is freed. May sleep, only for teardown paths. + */ +static void fbcon_del_cursor_work_sync(struct fb_info *info) +{ + struct fbcon_par *par = info->fbcon_par; + cancel_delayed_work_sync(&par->cursor_work); } @@ -765,7 +794,7 @@ static void fbcon_release(struct fb_info *info) if (info->fbcon_par) { struct fbcon_par *par = info->fbcon_par; - fbcon_del_cursor_work(info); + fbcon_del_cursor_work_sync(info); kfree(par->cursor_state.mask); kfree(par->cursor_data); kfree(par->cursor_src); diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h index d93a89877d04..6a2f7f6e5a8c 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -97,6 +97,7 @@ struct fbcon_par { int blank_state; int graphics; bool initialized; + bool cursor_blink_on; int rotate; char *cursor_data; #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION -- 2.56.0