From patchwork Tue Oct 31 21:44:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10035435 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1BF0560327 for ; Tue, 31 Oct 2017 21:44:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E60628B0C for ; Tue, 31 Oct 2017 21:44:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0184F28B14; Tue, 31 Oct 2017 21:44:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F58A28B0C for ; Tue, 31 Oct 2017 21:44:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753938AbdJaVol (ORCPT ); Tue, 31 Oct 2017 17:44:41 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:55476 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753728AbdJaVoh (ORCPT ); Tue, 31 Oct 2017 17:44:37 -0400 Received: by mail-io0-f195.google.com with SMTP id p186so1975314ioe.12 for ; Tue, 31 Oct 2017 14:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mZCqjPfjp4rbF273iD6Le+oxUut59v1vQ68rWn4xUBE=; b=vE2C76tUbD+u7zfqOEBVrbgUn37hsp6ObFBvYdi868WvGSgyPgK1N51MPjwSUUSGwn Dcu1CDtHmMRfh8YsWe1lGAo1cEQO24UgwIpm9HTSJ50wH6QwvKqawJShWzolyMl2Kb+x 86LVMYYlUH17VxuD7xiZTXvW+1dGmnGI/OGkrscJU5ihz4D/50K4LLULhIzH0IpHoUWs DJgQ9LMulpO1EHl54L8Lyo6HGllXzspG13+w0FPRL7GJOPwRjZ3IowFIPojBQM7C1OB8 UImbbDE6B8oAyhZ4B1ZIgPq9iA+tTR5ND18aeC/jigrCLzQl6FjRg+Kk4SficHDg5u/q O3nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mZCqjPfjp4rbF273iD6Le+oxUut59v1vQ68rWn4xUBE=; b=EgQa3a5K1RMByIB0sa8NsvptjynQGXxuLIvHruDFDOT0X2Qh5XVOIW+AeEC9uVlVd+ O7OjWfFv+hyB4W+wv22sFBYPu5e34H59eo0KiwqKTV150x5AFKpqttqR6H2Ieyd+uhWI 7BxZAx/CfS8q4gX4/7Utbtei6Q8j+3YsDMU8ko8jgZElPk4tqaRPYT+AfK/vEnI7VJFN kR6cG1y7byNdweF1B88ADZv6AaHI0k6R0VFnH8PvFdh+BmWr0T8mh+426BzVYuKrULD+ QDzRJP/NXhjuRUgWLVB6g3dgEtk0mRs+5rlkaBUtJJrsLsm49BjbbNpuLlW3GKrzOpB3 L4GQ== X-Gm-Message-State: AMCzsaUwr1/31FB7VhCpOnuj1N0IZmQya/buGHjnYvaGYLQvriplFh91 qH/Wpo2WCHeX0Tn8gCkM0iwQQg== X-Google-Smtp-Source: ABhQp+SWJC3VLedYaj7QrH9qATDLldTu03OFvGKpmxM7w1lRtieY2pSk9VTMSbbEy/ZpRY/A6HNKag== X-Received: by 10.36.95.2 with SMTP id r2mr5169912itb.25.1509486276651; Tue, 31 Oct 2017 14:44:36 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([172.22.112.48]) by smtp.gmail.com with ESMTPSA id n132sm1332854itn.25.2017.10.31.14.44.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 14:44:36 -0700 (PDT) From: Rajat Jain To: "Rafael J. Wysocki" , Pavel Machek , Len Brown , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, dtor@google.com, rajatxjain@gmail.com Cc: Rajat Jain Subject: [PATCH] PM / s2idle: Clear the events_check_enabled flag Date: Tue, 31 Oct 2017 14:44:24 -0700 Message-Id: <20171031214424.84783-1-rajatja@google.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-goog Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Problem: This flag does not get cleared currently in the suspend or resume path in the following cases: * In case some driver's suspend routine returns an error. * Successful s2idle case * etc? Why is this a problem: What happens is that the next suspend attempt could fail even though the user did not enable the flag by writing to /sys/power/wakeup_count. This is 1 use case how the issue can be seen (but similar use case with driver suspend failure can be thought of): 1. Read /sys/power/wakeup_count 2. echo count > /sys/power/wakeup_count 3. echo freeze > /sys/power/wakeup_count 4. Let the system suspend, and wakeup the system using some wake source that calls pm_wakeup_event() e.g. power button or something. 5. Note that the combined wakeup count would be incremented due to the pm_wakeup_event() in the resume path. 6. After resuming the events_check_enabled flag is still set. At this point if the user attempts to freeze again (without writing to /sys/power/wakeup_count), the suspend would fail even though there has been no wake event since the past resume. What this patch does: It moves the clearing of the flag to just before a resume is completed, so that it is always cleared for the corner cases mentioned above. Signed-off-by: Rajat Jain Acked-by: Pavel Machek --- kernel/power/suspend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index ccd2d20e6b06..0685c4499431 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -437,7 +437,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) error = suspend_ops->enter(state); trace_suspend_resume(TPS("machine_suspend"), state, false); - events_check_enabled = false; } else if (*wakeup) { error = -EBUSY; } @@ -582,6 +581,7 @@ static int enter_state(suspend_state_t state) pm_restore_gfp_mask(); Finish: + events_check_enabled = false; pm_pr_dbg("Finishing wakeup.\n"); suspend_finish(); Unlock: