Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp23865imm; Tue, 17 Jul 2018 13:11:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdUVCSf5FueYJv+GKIn55vIIMh67Z0QR3QxcOHVYqGENT/3dtT6NK1wKCzlODbXEDHTC9Eb X-Received: by 2002:a17:902:8d96:: with SMTP id v22-v6mr2952782plo.176.1531858294935; Tue, 17 Jul 2018 13:11:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858294; cv=none; d=google.com; s=arc-20160816; b=C6ZCFvvF8vq6+gCwiM21IuWm015O/QTOoldMymlFkPLnZo3CPaOHDMs+sWpEkP95OL D38Zi0+ZzX85LMAsXQJtJWTkIupMebkYQiTUc8sTADZ1u/Qy/nIQBb+YwPfdhs0klptu BVGTg6Y1unmhaBoN8Fxb9NNoSpdF0vagm6WUKNs6qmhkHXyBAruK75mCvNxdwK3KYITR juwRdMQpWzfH03hN28qK0Y3RTRFxgbxFHwgo0DYUQ4d84raXrXrMJt6+2P7QNVzfBUXd C+bm2cVybm6x3t1gp3OiDoJ6LAdXL+mRCFxbVfy7b8kTpwTj+OvmR9ksZsWc5FzfDXPr lopw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:dkim-signature :arc-authentication-results; bh=+G0S39J+Vy75Rg5jyaCIHI9BgUpN8rrwAB9oj0wbW/s=; b=zuKUuO9xG4Ev0BBDl6TD6/jg50NyCGVyPAM2MpwWtH8uwAWBi4HEHrwPjPtFI8w8VX DKiCtFIbN5n0bED8kCmHvMHNUYhX4u0Gr7iJCLkkzOsJLAUIGAfk6X1j1HZ4840KQ+A/ lLlYEyHbn4j+E/qYSV0L2As2I4aIh6kxzdEcar6rMdxwXkSAlDeSaqaywOdosOm6x04X tBFlXP5Uw7lSv8rlAiYqApo43tF3S4s8Zf577Ab1fTC4tHgmoE+NQnxAFOEP3iuN/9gv 7LHBhlTiwf97aAYYDIzUOOC6J3kN8W8z8pOBfDhUSSwRIV0JPy9gEgl2dACyaK0t7D2M ofOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eIHNnKXG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h89-v6si1580593pld.378.2018.07.17.13.11.19; Tue, 17 Jul 2018 13:11:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eIHNnKXG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730214AbeGQUoU (ORCPT + 99 others); Tue, 17 Jul 2018 16:44:20 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37167 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729754AbeGQUoU (ORCPT ); Tue, 17 Jul 2018 16:44:20 -0400 Received: by mail-wr1-f68.google.com with SMTP id q10-v6so2427037wrd.4 for ; Tue, 17 Jul 2018 13:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=+G0S39J+Vy75Rg5jyaCIHI9BgUpN8rrwAB9oj0wbW/s=; b=eIHNnKXG0lF7WuI8l6/FJeCtAmM+CXjAf7sWSCX4LJeoMTWZZ68b00rFxrOTHDj6BI wuwI9VJMIV1SDXLgNTcxMHLHMlnu1OpTJqyRK6grolZ+zOUKtkKPN9/V/qbuNGs55KnZ Vw85q5lrDKRaecFsEZ0rFqlFDXa6FglWgFnyk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=+G0S39J+Vy75Rg5jyaCIHI9BgUpN8rrwAB9oj0wbW/s=; b=ClsXmaBdmEE0aBxGgr6i66OeGcI3bdtcm/tbahcq7Y5n0n/wbDgWFZZFzA0M6uEHyB XuEmEYqxsNaPc6osnAub4uauN+VQ2EL+f5jR+dE1zicCFHeANuQiz4Lu3SP6peE+vcpV fwr9etnHvCBTt3rfAhxPvsO5j0ECZSZlW0bbO9owoOD9LXkzD1Dyyzwv4hBX3bDuROQL 4YR8L26WWeEJJo/GvqQkHGMey19DJ4W3NG+4cAyTntr657EVunEu3brvA6lpLuOzuyJ1 J9c30sCQabTmbWR+g08KzXZ11W0c/NFSPBdQ0eWrg2N7N5hzb8TbUjIy+5n19gLZVEzC idUQ== X-Gm-Message-State: AOUpUlEni9VwT6rN14TyPqQEJwptGoX9mXburfDgh3icc5h+MCcJqAqW KOR/2gmekzx0nhEF6WMI54U2kBXGx+fpB1s6/aaeeUeO X-Received: by 2002:adf:b243:: with SMTP id y3-v6mr2505107wra.90.1531858204825; Tue, 17 Jul 2018 13:10:04 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a1c:c243:0:0:0:0:0 with HTTP; Tue, 17 Jul 2018 13:10:04 -0700 (PDT) In-Reply-To: <1531809089-8927-1-git-send-email-mojha@codeaurora.org> References: <1531809089-8927-1-git-send-email-mojha@codeaurora.org> From: John Stultz Date: Tue, 17 Jul 2018 13:10:04 -0700 Message-ID: Subject: Re: [PATCH v5] time: Fix extra sleeptime injection when suspend fails To: Mukesh Ojha Cc: Thomas Gleixner , lkml , gkohli@codeaurora.org, cpandya@codeaurora.org, neeraju@codeaurora.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 16, 2018 at 11:31 PM, Mukesh Ojha wrote: > Currently, there exists a corner case assuming when there is > only one clocksource e.g RTC, and system failed to go to > suspend mode. While resume rtc_resume() injects the sleeptime > as timekeeping_rtc_skipresume() returned 'false' (default value > of sleeptime_injected) due to which we can see mismatch in > timestamps. > > This issue can also come in a system where more than one > clocksource are present and very first suspend fails. > > Success case: > ------------ > {sleeptime_injected=false} > rtc_suspend() => timekeeping_suspend() => timekeeping_resume() => > > (sleeptime injected) > rtc_resume() > > Failure case: > ------------ > {failure in sleep path} {sleeptime_injected=false} > rtc_suspend() => rtc_resume() > > {sleeptime injected again which was not required as the suspend failed} > > Fix this by handling the boolean logic properly. > > Originally-by: Thomas Gleixner > Signed-off-by: Mukesh Ojha > --- > Changes in V5: > * Took extra variable `inject_sleeptime` to take care of injecting sleeptime > inside timekeeping_resume(). > * Inverted the return logic inside timekeeping_skipresume() instead of doing > it in rtc_resume(). > * Updated commit description. Thanks again, I'lll get this queued up for testing. thanks -john