From patchwork Wed Feb 26 19:59:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 868903 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 4D143256C8B for ; Wed, 26 Feb 2025 19:59:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599958; cv=none; b=VHaY67liVQ3Wkjs/qUeF1gef0YkdFeitmIj5oN0Cu9RPPulb9VnlBznMbvZeE8WNMkslSd61J2nq00OGTiHMNM+7M5bTiGto5FYvA1dQOLeKJb3OSeQ+mOkEP708EQML2AXQGK7cbP9CJUBEEBzt4ycsQ3kfy2LT9UPvvZ7UIZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599958; c=relaxed/simple; bh=yBYQ10xYqvupj3cLB6Z51JIzDI6B7P/SvNMp935zzWg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZPxVmGaIl1LB3b/Bgj7mGA0KgfkmxnMEplvLqy7YIM6ZwFlM9Zo7y8kNzHS5haGwJ2KE7SgHJR+N/1R2upHkiey9jGt0MOlPrD6IbcZ4HDvI/FTubFBB0ttc7X5De4XYKR85BtRLASJhbQQKsMoLgZ5AcbXKAslfXU+WsxPvF1Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=MGCvkUf9; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=MGCvkUf9; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="MGCvkUf9"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="MGCvkUf9" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 719DF1F387; Wed, 26 Feb 2025 19:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599954; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JwO0/gaDg8J0sH8a6P82P5z42V5b4mLRLuPZ7KLgpvQ=; b=MGCvkUf9Qbsw/U7pv72/zu6zjQDtt5Ydf+v64PyGsUy4fEmghMNtDsMJQwg6b+4nyA6bv0 oBXE6LMomLoHFX1OAXgseXXOQHIAQ2a34zi5dHYSanwd7Ux6WINkuWgpuKvnGdLS0ZeoHy cW25UDmxIhq0NzLwu7mTJjbuFK//W9Y= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=MGCvkUf9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599954; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JwO0/gaDg8J0sH8a6P82P5z42V5b4mLRLuPZ7KLgpvQ=; b=MGCvkUf9Qbsw/U7pv72/zu6zjQDtt5Ydf+v64PyGsUy4fEmghMNtDsMJQwg6b+4nyA6bv0 oBXE6LMomLoHFX1OAXgseXXOQHIAQ2a34zi5dHYSanwd7Ux6WINkuWgpuKvnGdLS0ZeoHy cW25UDmxIhq0NzLwu7mTJjbuFK//W9Y= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F0EAB13A53; Wed, 26 Feb 2025 19:59:13 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id bW2ELZFyv2dLMgAAD6G6ig (envelope-from ); Wed, 26 Feb 2025 19:59:13 +0000 From: Marcos Paulo de Souza Date: Wed, 26 Feb 2025 16:59:01 -0300 Subject: [PATCH 1/5] printk: Rename suspend_console to console_suspend_all Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250226-printk-renaming-v1-1-0b878577f2e6@suse.com> References: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> In-Reply-To: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> To: Greg Kroah-Hartman , Eric Biederman , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Todd E Brandt , Jiri Slaby Cc: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-pm@vger.kernel.org, linux-serial@vger.kernel.org, Marcos Paulo de Souza X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1740599947; l=4788; i=mpdesouza@suse.com; s=20231031; h=from:subject:message-id; bh=yBYQ10xYqvupj3cLB6Z51JIzDI6B7P/SvNMp935zzWg=; b=zrnT3yx0F2MoLtIJp2AhyC1iNzfy4fhxdeGTi2s5QJTPVqhMhNXC2FD35987w1tZZZQsH6OsE RHljdJwQpf5AJ/+2nwp0001WVLBTm8OYWbiGe1dbrE8QPqeFbnzoTQU X-Developer-Key: i=mpdesouza@suse.com; a=ed25519; pk=/Ni/TsKkr69EOmdZXkp1Q/BlzDonbOBRsfPa18ySIwU= X-Rspamd-Queue-Id: 719DF1F387 X-Spam-Score: -4.51 X-Rspamd-Action: no action X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_TWELVE(0.00)[16]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL95jnbcaqr857snmuoeu7oxeq)]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: The function suspend_console has a misleading name, since it suspends all consoles, so rename it accordly. Signed-off-by: Marcos Paulo de Souza --- include/linux/console.h | 2 +- kernel/kexec_core.c | 2 +- kernel/power/hibernate.c | 8 ++++---- kernel/power/suspend.c | 2 +- kernel/printk/printk.c | 4 ++-- tools/power/pm-graph/config/custom-timeline-functions.cfg | 2 +- tools/power/pm-graph/sleepgraph.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h index eba367bf605d..fa5941f4f9c5 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -648,7 +648,7 @@ static inline void console_sysfs_notify(void) extern bool console_suspend_enabled; /* Suspend and resume console messages over PM events */ -extern void suspend_console(void); +extern void console_suspend_all(void); extern void resume_console(void); int mda_console_init(void); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index c0caa14880c3..8f95870030a3 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -1007,7 +1007,7 @@ int kernel_kexec(void) error = -EBUSY; goto Restore_console; } - suspend_console(); + console_suspend_all(); error = dpm_suspend_start(PMSG_FREEZE); if (error) goto Resume_console; diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 1f87aa01ba44..a18f6016ce6c 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -411,7 +411,7 @@ int hibernation_snapshot(int platform_mode) goto Thaw; } - suspend_console(); + console_suspend_all(); pm_restrict_gfp_mask(); error = dpm_suspend(PMSG_FREEZE); @@ -547,7 +547,7 @@ int hibernation_restore(int platform_mode) int error; pm_prepare_console(); - suspend_console(); + console_suspend_all(); pm_restrict_gfp_mask(); error = dpm_suspend_start(PMSG_QUIESCE); if (!error) { @@ -586,7 +586,7 @@ int hibernation_platform_enter(void) goto Close; entering_platform_hibernation = true; - suspend_console(); + console_suspend_all(); error = dpm_suspend_start(PMSG_HIBERNATE); if (error) { if (hibernation_ops->recover) @@ -896,7 +896,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data) if (error) goto dpm_complete; - suspend_console(); + console_suspend_all(); error = dpm_suspend(PMSG_FREEZE); if (error) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 09f8397bae15..f296dd0a1a18 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -502,7 +502,7 @@ int suspend_devices_and_enter(suspend_state_t state) if (error) goto Close; - suspend_console(); + console_suspend_all(); suspend_test_start(); error = dpm_suspend_start(PMSG_SUSPEND); if (error) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 80910bc3470c..6cfb1e6d3613 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2733,11 +2733,11 @@ module_param_named(console_no_auto_verbose, printk_console_no_auto_verbose, bool MODULE_PARM_DESC(console_no_auto_verbose, "Disable console loglevel raise to highest on oops/panic/etc"); /** - * suspend_console - suspend the console subsystem + * console_suspend_all - suspend the console subsystem * * This disables printk() while we go into suspend states */ -void suspend_console(void) +void console_suspend_all(void) { struct console *con; diff --git a/tools/power/pm-graph/config/custom-timeline-functions.cfg b/tools/power/pm-graph/config/custom-timeline-functions.cfg index 4f80ad7d7275..80ba55250163 100644 --- a/tools/power/pm-graph/config/custom-timeline-functions.cfg +++ b/tools/power/pm-graph/config/custom-timeline-functions.cfg @@ -122,7 +122,7 @@ freeze_processes: freeze_kernel_threads: pm_restrict_gfp_mask: acpi_suspend_begin: -suspend_console: +console_suspend_all: acpi_pm_prepare: syscore_suspend: arch_enable_nonboot_cpus_end: diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 918eae58b0b4..114c3d0c6619 100755 --- a/tools/power/pm-graph/sleepgraph.py +++ b/tools/power/pm-graph/sleepgraph.py @@ -210,7 +210,7 @@ class SystemValues: 'hibernate_preallocate_memory': {}, 'create_basic_memory_bitmaps': {}, 'swsusp_write': {}, - 'suspend_console': {}, + 'console_suspend_all': {}, 'acpi_pm_prepare': {}, 'syscore_suspend': {}, 'arch_enable_nonboot_cpus_end': {}, From patchwork Wed Feb 26 19:59:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 868902 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 EFAAE25C6F9 for ; Wed, 26 Feb 2025 19:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599964; cv=none; b=D5MAZKsoMbE7JuE7uap+9Vbu+3GaVXsSYsOgqgb6D6+kuv49a2TCXukNIKaUIGRcTDJsT6wu+OubhSXw/USKIQaEi/D756p1NmIL5QHbyjfR/nNGXlYFrDY2yo5DLafEAVe/KPyF6Yc1rnixeBgILqhMh0b3oWU2MKbZpYfUPTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599964; c=relaxed/simple; bh=o4dSv2Q4KBStBPNP7ZCwyp3Xj3sypPx1cqkkCUPu63k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iAd4hRuh9Kcf1jTRuWGcJExxH68FdxlqHXDEGieJfBwvnuTPTPj8CdyahmWFetSeCA+ZVCsPx6g79yrUpyEUa6Fhxx6pLrLIa2wn20uT2dAQE8/+SDs2xTxkc2zEpw3cRG697qU7AI72SA0HBYAosU0usvaXhhLq7hNckX7QL5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=qPwVt1Cc; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=qPwVt1Cc; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="qPwVt1Cc"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="qPwVt1Cc" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CD89D1F38A; Wed, 26 Feb 2025 19:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599957; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u40wel1uByZ+NuxZjQ9Eq88cyevFevGwKfBlTGuYmDo=; b=qPwVt1Cc1fHH2nKJ8cMSNKZCYR1By1k9TyvRld0TI3KeJGKI8VldjC1kuB9+MsU+DAQ1QR nFgfd/t8ZMzNPLBY1iT2Hs5MQt/Vjs3Qtob6Ng5/OP6IKavzpORqtOE9Eyt9utVe7Rnqny o6To2KvLf/QIST3K6K1DqIjN3HD1ZTs= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599957; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u40wel1uByZ+NuxZjQ9Eq88cyevFevGwKfBlTGuYmDo=; b=qPwVt1Cc1fHH2nKJ8cMSNKZCYR1By1k9TyvRld0TI3KeJGKI8VldjC1kuB9+MsU+DAQ1QR nFgfd/t8ZMzNPLBY1iT2Hs5MQt/Vjs3Qtob6Ng5/OP6IKavzpORqtOE9Eyt9utVe7Rnqny o6To2KvLf/QIST3K6K1DqIjN3HD1ZTs= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 58CB213A53; Wed, 26 Feb 2025 19:59:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4cFaCJVyv2dPMgAAD6G6ig (envelope-from ); Wed, 26 Feb 2025 19:59:17 +0000 From: Marcos Paulo de Souza Date: Wed, 26 Feb 2025 16:59:02 -0300 Subject: [PATCH 2/5] printk: Rename resume_console to console_resume_all Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250226-printk-renaming-v1-2-0b878577f2e6@suse.com> References: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> In-Reply-To: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> To: Greg Kroah-Hartman , Eric Biederman , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Todd E Brandt , Jiri Slaby Cc: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-pm@vger.kernel.org, linux-serial@vger.kernel.org, Marcos Paulo de Souza X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1740599947; l=5062; i=mpdesouza@suse.com; s=20231031; h=from:subject:message-id; bh=o4dSv2Q4KBStBPNP7ZCwyp3Xj3sypPx1cqkkCUPu63k=; b=eMPqNrB0UnFvEc27q5UbM6ptmyIqQUxeZ1y9TkP23XXXhdu3RbT7teaugAudqjEZZDtKG3DdZ 1fnkdYMObgrBMG2Ucq75IhCtkaDgjnwlPypdFhWKFZWL7yZEQlSelfg X-Developer-Key: i=mpdesouza@suse.com; a=ed25519; pk=/Ni/TsKkr69EOmdZXkp1Q/BlzDonbOBRsfPa18ySIwU= X-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, suse.com:email, suse.com:mid] X-Spam-Score: -4.30 X-Spam-Flag: NO The function resume_console has a misleading name, since it resumes all consoles, so rename it accordly. Signed-off-by: Marcos Paulo de Souza --- include/linux/console.h | 2 +- kernel/kexec_core.c | 2 +- kernel/power/hibernate.c | 8 ++++---- kernel/power/suspend.c | 6 +++--- kernel/printk/printk.c | 2 +- tools/power/pm-graph/config/custom-timeline-functions.cfg | 2 +- tools/power/pm-graph/sleepgraph.py | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h index fa5941f4f9c5..0d48e0deb213 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -649,7 +649,7 @@ extern bool console_suspend_enabled; /* Suspend and resume console messages over PM events */ extern void console_suspend_all(void); -extern void resume_console(void); +extern void console_resume_all(void); int mda_console_init(void); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 8f95870030a3..6fcc46f3eb39 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -1061,7 +1061,7 @@ int kernel_kexec(void) Resume_devices: dpm_resume_end(PMSG_RESTORE); Resume_console: - resume_console(); + console_resume_all(); thaw_processes(); Restore_console: pm_restore_console(); diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index a18f6016ce6c..c9f60670a261 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -437,7 +437,7 @@ int hibernation_snapshot(int platform_mode) if (error || !in_suspend) pm_restore_gfp_mask(); - resume_console(); + console_resume_all(); dpm_complete(msg); Close: @@ -561,7 +561,7 @@ int hibernation_restore(int platform_mode) } dpm_resume_end(PMSG_RECOVER); pm_restore_gfp_mask(); - resume_console(); + console_resume_all(); pm_restore_console(); return error; } @@ -634,7 +634,7 @@ int hibernation_platform_enter(void) Resume_devices: entering_platform_hibernation = false; dpm_resume_end(PMSG_RESTORE); - resume_console(); + console_resume_all(); Close: hibernation_ops->end(); @@ -920,7 +920,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data) dpm_resume: dpm_resume(PMSG_THAW); - resume_console(); + console_resume_all(); dpm_complete: dpm_complete(PMSG_THAW); diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index f296dd0a1a18..c3da3db58cdf 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -521,9 +521,9 @@ int suspend_devices_and_enter(suspend_state_t state) suspend_test_start(); dpm_resume_end(PMSG_RESUME); suspend_test_finish("resume devices"); - trace_suspend_resume(TPS("resume_console"), state, true); - resume_console(); - trace_suspend_resume(TPS("resume_console"), state, false); + trace_suspend_resume(TPS("console_resume_all"), state, true); + console_resume_all(); + trace_suspend_resume(TPS("console_resume_all"), state, false); Close: platform_resume_end(state); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 6cfb1e6d3613..ef259660563a 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2760,7 +2760,7 @@ void console_suspend_all(void) synchronize_srcu(&console_srcu); } -void resume_console(void) +void console_resume_all(void) { struct console_flush_type ft; struct console *con; diff --git a/tools/power/pm-graph/config/custom-timeline-functions.cfg b/tools/power/pm-graph/config/custom-timeline-functions.cfg index 80ba55250163..0321b59518f3 100644 --- a/tools/power/pm-graph/config/custom-timeline-functions.cfg +++ b/tools/power/pm-graph/config/custom-timeline-functions.cfg @@ -128,7 +128,7 @@ syscore_suspend: arch_enable_nonboot_cpus_end: syscore_resume: acpi_pm_finish: -resume_console: +console_resume_all: acpi_pm_end: pm_restore_gfp_mask: thaw_processes: diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 114c3d0c6619..e2261f33a082 100755 --- a/tools/power/pm-graph/sleepgraph.py +++ b/tools/power/pm-graph/sleepgraph.py @@ -216,7 +216,7 @@ class SystemValues: 'arch_enable_nonboot_cpus_end': {}, 'syscore_resume': {}, 'acpi_pm_finish': {}, - 'resume_console': {}, + 'console_resume_all': {}, 'acpi_pm_end': {}, 'pm_restore_gfp_mask': {}, 'thaw_processes': {}, @@ -3459,7 +3459,7 @@ def parseTraceLog(live=False): tracewatch = ['irq_wakeup'] if sysvals.usekprobes: tracewatch += ['sync_filesystems', 'freeze_processes', 'syscore_suspend', - 'syscore_resume', 'resume_console', 'thaw_processes', 'CPU_ON', + 'syscore_resume', 'console_resume_all', 'thaw_processes', 'CPU_ON', 'CPU_OFF', 'acpi_suspend'] # extract the callgraph and traceevent data From patchwork Wed Feb 26 19:59:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 868901 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 AAC5225E44D for ; Wed, 26 Feb 2025 19:59:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599972; cv=none; b=S7Sh6swfCRtEOP8UFLOOgVaXT4BC3xbb7ycoVeef5YZYbGByjIhGXBoVfYWUk7IxU5VATgmXkx9bBb61tGjC3NUDLJC3nbK8yNRPQ/BbbHrykddrNlKKuBr3jZMhG94KFczn3xflWAcHupwmoEsbHVhYFMf1uYVV8rIVf05ILPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740599972; c=relaxed/simple; bh=JRnPNS2R+SoIrKYk5hs0jEUL60OqbTaEnku8x/ZnQT4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dbNkeLOv63ftzQWGFSzaYBLNOdRe/93UWVueN7TWbxCTS+yVWxtA5iQ3dGmvYseytO00BPCLZjiD19C4pCs3owIOf3hDWFaxz2MiO2Jr6r5q/zU2I5JPwiefLbj/57VnN/VP0VDGBeTI0Vr0kthCeY1NB1XR0kynO2se3jV4Ba0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=gu5rAJ4l; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=gu5rAJ4l; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="gu5rAJ4l"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="gu5rAJ4l" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2A803211A1; Wed, 26 Feb 2025 19:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599969; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P3WmfFEnCvDs4KrvRf1+gcJdaZ6nkRrsX2UH5OZ2D/Y=; b=gu5rAJ4ln2UxWzssNDciupNk61EvKVzSJankbY07PY9XaK3SnqBmfZj8lsUw62H0oO5eMj GMJoxtpmApYaTW1HI3w0aoDX8Gr58rp2mmDyTi1yM5GLcISMc6wo7pvpRZ4sXtKpyOtgCr u2LGAjokAzm1aecIi73WSBfpa6jYdTw= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740599969; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P3WmfFEnCvDs4KrvRf1+gcJdaZ6nkRrsX2UH5OZ2D/Y=; b=gu5rAJ4ln2UxWzssNDciupNk61EvKVzSJankbY07PY9XaK3SnqBmfZj8lsUw62H0oO5eMj GMJoxtpmApYaTW1HI3w0aoDX8Gr58rp2mmDyTi1yM5GLcISMc6wo7pvpRZ4sXtKpyOtgCr u2LGAjokAzm1aecIi73WSBfpa6jYdTw= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AA30713A53; Wed, 26 Feb 2025 19:59:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id myk8HKByv2ddMgAAD6G6ig (envelope-from ); Wed, 26 Feb 2025 19:59:28 +0000 From: Marcos Paulo de Souza Date: Wed, 26 Feb 2025 16:59:05 -0300 Subject: [PATCH 5/5] printk: Check CON_SUSPEND when unblanking a console Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250226-printk-renaming-v1-5-0b878577f2e6@suse.com> References: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> In-Reply-To: <20250226-printk-renaming-v1-0-0b878577f2e6@suse.com> To: Greg Kroah-Hartman , Eric Biederman , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Todd E Brandt , Jiri Slaby Cc: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-pm@vger.kernel.org, linux-serial@vger.kernel.org, Marcos Paulo de Souza X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1740599947; l=1376; i=mpdesouza@suse.com; s=20231031; h=from:subject:message-id; bh=JRnPNS2R+SoIrKYk5hs0jEUL60OqbTaEnku8x/ZnQT4=; b=YZG7GhXC7DlbzU/tfnWu5ZJWEdMcKKy+w3hDjFcb440sfvdbAMzpmhJ3Bxk21gPTiahZl9MRA xAt8RkWljJoCoHFjFTT5BAcz42UiIfBD1jRnQDzOo0STCf7ts7Cddnd X-Developer-Key: i=mpdesouza@suse.com; a=ed25519; pk=/Ni/TsKkr69EOmdZXkp1Q/BlzDonbOBRsfPa18ySIwU= X-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWELVE(0.00)[16]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLsew83exbyfiapi7twtunf83p)]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, suse.com:email, suse.com:mid] X-Spam-Score: -4.30 X-Spam-Flag: NO The commit 9e70a5e109a4 ("printk: Add per-console suspended state") introduced the CON_SUSPENDED flag for consoles. The suspended consoles will stop receiving messages, so don't unblank suspended consoles because it won't be showing anything either way. Signed-off-by: Marcos Paulo de Souza --- kernel/printk/printk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fbbaec06c9f3..4b7ed40bf808 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3342,7 +3342,12 @@ void console_unblank(void) */ cookie = console_srcu_read_lock(); for_each_console_srcu(c) { - if ((console_srcu_read_flags(c) & CON_ENABLED) && c->unblank) { + short flags = console_srcu_read_flags(c); + + if (flags & CON_SUSPENDED) + continue; + + if ((flags & CON_ENABLED) && c->unblank) { found_unblank = true; break; } @@ -3379,7 +3384,12 @@ void console_unblank(void) cookie = console_srcu_read_lock(); for_each_console_srcu(c) { - if ((console_srcu_read_flags(c) & CON_ENABLED) && c->unblank) + short flags = console_srcu_read_flags(c); + + if (flags & CON_SUSPENDED) + continue; + + if ((flags & CON_ENABLED) && c->unblank) c->unblank(); } console_srcu_read_unlock(cookie);