From patchwork Wed Jun 29 01:11:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: XiongXin X-Patchwork-Id: 12899250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC3ADC433EF for ; Wed, 29 Jun 2022 03:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbiF2Dpk (ORCPT ); Tue, 28 Jun 2022 23:45:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbiF2Dpj (ORCPT ); Tue, 28 Jun 2022 23:45:39 -0400 Received: from mailgw.kylinos.cn (unknown [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B452218343; Tue, 28 Jun 2022 20:45:38 -0700 (PDT) X-UUID: 9d20ce9404824614b58d2fa31a7004c1-20220629 X-GW-Reason: 13103 X-Policy-Incident: 5pS25Lu25Lq66LaF6L+HNeS6uumcgOimgeWuoeaguA== X-Content-Feature: ica/max.line-size 74 audit/email.address 1 dict/notice 1 dict/time 1 meta/cnt.alert 1 X-CPASD-INFO: f988679151534d35a96f4c0a9043a517@r4lyWGNpZ2FhUXd_g6d-b4FqZpZkj1C we2pUZY9lXVeVgnxsTWBnX1OEgnBQYl5dZFZ3dG9RYmBgYlB_i4Jyj1RiXmCCVHSTgKhzWGpkZw== X-CLOUD-ID: f988679151534d35a96f4c0a9043a517 X-CPASD-SUMMARY: SIP:-1,APTIP:-2.0,KEY:0.0,FROMBLOCK:1,OB:2.0,URL:-5,TVAL:182. 0,ESV:0.0,ECOM:-5.0,ML:0.0,FD:0.0,CUTS:143.0,IP:-2.0,MAL:-5.0,PHF:-5.0,PHC:-5 .0,SPF:4.0,EDMS:-5,IPLABEL:4480.0,FROMTO:0,AD:0,FFOB:2.0,CFOB:2.0,SPC:0,SIG:- 5,AUF:8,DUF:135,ACD:2,DCD:2,SL:0,EISP:0,AG:0,CFC:0.576,CFSR:0.037,UAT:0,RAF:0 ,IMG:-5.0,DFA:0,DTA:0,IBL:-2.0,ADI:-5,SBL:0,REDM:0,REIP:0,ESB:0,ATTNUM:0,EAF: 0,CID:-5.0,VERSION:2.3.17 X-CPASD-ID: 9d20ce9404824614b58d2fa31a7004c1-20220629 X-CPASD-BLOCK: 1000 X-CPASD-STAGE: 1 X-UUID: 9d20ce9404824614b58d2fa31a7004c1-20220629 X-User: xiongxin@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1270190514; Wed, 29 Jun 2022 09:12:15 +0800 From: xiongxin To: rafael@kernel.org, len.brown@intel.com, pavel@ucw.cz, xiongxin@kylinos.cn, luriwen@kylinos.cn Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH -next 1/2] PM: suspend: expand the assignment scope of the pm_suspend_target_state Date: Wed, 29 Jun 2022 09:11:45 +0800 Message-Id: <20220629011146.299521-2-xiongxin@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220629011146.299521-1-xiongxin@kylinos.cn> References: <20220629011146.299521-1-xiongxin@kylinos.cn> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The pm_suspend_target_state variable can be used as a suspend state identifier and given to the specific device driver as a code judgment; Because the suspend_prepare() function is time-consuming for the operation of freezing processes, and this stage is actually in the suspend stage, it is necessary to expand the scope of the pm_suspend_target_state variable to be assigned to the suspend state at enter_state() function; Another reason is that the specific device driver can locate whether it is in the suspend state based on this variable, so as to determine the validity of its wake-up source. Signed-off-by: xiongxin --- kernel/power/suspend.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 827075944d28..c754b084ec03 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -564,6 +564,12 @@ static int enter_state(suspend_state_t state) if (state == PM_SUSPEND_TO_IDLE) s2idle_begin(); + /* + * Expand the scope of suspend state for suspend operations + * performed from the /sys/power/state entry. + */ + pm_suspend_target_state = state; + if (sync_on_suspend_enabled) { trace_suspend_resume(TPS("sync_filesystems"), 0, true); ksys_sync_helper(); @@ -590,6 +596,7 @@ static int enter_state(suspend_state_t state) pm_pr_dbg("Finishing wakeup.\n"); suspend_finish(); Unlock: + pm_suspend_target_state = PM_SUSPEND_ON; mutex_unlock(&system_transition_mutex); return error; } From patchwork Wed Jun 29 01:11:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: XiongXin X-Patchwork-Id: 12899253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B32ACCA481 for ; Wed, 29 Jun 2022 03:45:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbiF2Dpn (ORCPT ); Tue, 28 Jun 2022 23:45:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbiF2Dpn (ORCPT ); Tue, 28 Jun 2022 23:45:43 -0400 Received: from mailgw.kylinos.cn (unknown [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A8D418343; Tue, 28 Jun 2022 20:45:41 -0700 (PDT) X-UUID: 78fabd2e204b48a492c26a37b27e5e8d-20220629 X-GW-Reason: 13103 X-Policy-Incident: 5pS25Lu25Lq66LaF6L+HNeS6uumcgOimgeWuoeaguA== X-Content-Feature: ica/max.line-size 73 audit/email.address 1 dict/adv 1 dict/contack 1 dict/job 1 dict/notice 1 dict/operate 1 dict/time 1 meta/cnt.alert 1 X-CPASD-INFO: 79a2431c46c548daab49de3fa2ab5c91@gImbUmFlX5NgVqWBg3uvm4GTZGmUkVO 1o2yBlGOTZVGVgnxsTWBnX1OEgnBQYl5dZFZ3dG9RYmBgYlB_i4Jyj1RiXmCCVHSTgHlzgWRiYw== X-CLOUD-ID: 79a2431c46c548daab49de3fa2ab5c91 X-CPASD-SUMMARY: SIP:-1,APTIP:-2.0,KEY:0.0,FROMBLOCK:1,OB:2.0,URL:-5,TVAL:182. 0,ESV:0.0,ECOM:-5.0,ML:0.0,FD:0.0,CUTS:195.0,IP:-2.0,MAL:-5.0,PHF:-5.0,PHC:-5 .0,SPF:4.0,EDMS:-5,IPLABEL:4480.0,FROMTO:0,AD:0,FFOB:2.0,CFOB:2.0,SPC:0,SIG:- 5,AUF:6,DUF:133,ACD:2,DCD:2,SL:0,EISP:0,AG:0,CFC:0.512,CFSR:0.049,UAT:0,RAF:0 ,IMG:-5.0,DFA:0,DTA:0,IBL:-2.0,ADI:-5,SBL:0,REDM:0,REIP:0,ESB:0,ATTNUM:0,EAF: 0,CID:-5.0,VERSION:2.3.17 X-CPASD-ID: 78fabd2e204b48a492c26a37b27e5e8d-20220629 X-CPASD-BLOCK: 1000 X-CPASD-STAGE: 1 X-UUID: 78fabd2e204b48a492c26a37b27e5e8d-20220629 X-User: xiongxin@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 596082055; Wed, 29 Jun 2022 09:12:15 +0800 From: xiongxin To: rafael@kernel.org, len.brown@intel.com, pavel@ucw.cz, xiongxin@kylinos.cn, luriwen@kylinos.cn Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH -next 2/2] PM: suspend: advanced pm_wakeup_clear() for normal suspend/hibernate Date: Wed, 29 Jun 2022 09:11:46 +0800 Message-Id: <20220629011146.299521-3-xiongxin@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220629011146.299521-1-xiongxin@kylinos.cn> References: <20220629011146.299521-1-xiongxin@kylinos.cn> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org pm_wakeup_clear() will clear the wakeup source, which can ensure that it is not disturbed by useless wakeup signals when doing suspend/hibernate; At the beginning of the suspend/hibernate process, the notifier mechanism is used to notify other device drivers. This action is time-consuming (second-level time-consuming). If the process fails due to the received wakeup signal during the execution of these functions, it can better improve the experience of failing suspend/hibernate returns; Therefore, it is recommended here that for the suspend/hibernate process normally called from /sys/power/state, the pm_wakeup_clear() function should be brought before the notifier call; for the freeze_process() function called from other places, the original logic is kept; The pm_suspend_target_state variable is used here to identify whether the suspend process is going normally. Signed-off-by: xiongxin --- kernel/power/process.c | 5 ++++- kernel/power/suspend.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kernel/power/process.c b/kernel/power/process.c index 3068601e585a..3fde0240b3d1 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -131,7 +131,10 @@ int freeze_processes(void) if (!pm_freezing) atomic_inc(&system_freezing_cnt); - pm_wakeup_clear(0); + if (pm_suspend_target_state != PM_SUSPEND_ON) + pm_wakeup_clear(1); + else + pm_wakeup_clear(0); pr_info("Freezing user space processes ... "); pm_freezing = true; error = try_to_freeze_tasks(true); diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index c754b084ec03..f4259f6c1cc2 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -569,6 +569,12 @@ static int enter_state(suspend_state_t state) * performed from the /sys/power/state entry. */ pm_suspend_target_state = state; + /* + * Put pm_wakeup_clear() before the notifier notification chain to + * optimize in the suspend process, the wakeup signal can interrupt + * the suspend in advance and fail to return. + */ + pm_wakeup_clear(0); if (sync_on_suspend_enabled) { trace_suspend_resume(TPS("sync_filesystems"), 0, true);