From patchwork Wed Jan 30 08:16:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 10787823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E3D2746 for ; Wed, 30 Jan 2019 08:17:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EE362E351 for ; Wed, 30 Jan 2019 08:17:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 029472E35C; Wed, 30 Jan 2019 08:16:59 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 91F112E357 for ; Wed, 30 Jan 2019 08:16:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728371AbfA3IQ6 (ORCPT ); Wed, 30 Jan 2019 03:16:58 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51528 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730142AbfA3IQ5 (ORCPT ); Wed, 30 Jan 2019 03:16:57 -0500 Received: by mail-wm1-f68.google.com with SMTP id b11so20627816wmj.1 for ; Wed, 30 Jan 2019 00:16:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=6lyGIVRnQ1BZvQ2ddIjLm1Fs9ngmnkEvH1AhMLp+N2Y=; b=OftG1KsKOarpHCwPtS6SGEeDQz//JSHkDh6FbZgPEbNADXVGHgC7QcGsFawMwIj557 tdY1JNElo/xPW/bzdizrfqcxKwEEKbLw88AIqyNPKXDEO7OuF4GIt73+VD+IfaSNcib+ hWe/H80y1eYeD7Z2WmAN6MnWTRGlZgg5hEP4g= 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=6lyGIVRnQ1BZvQ2ddIjLm1Fs9ngmnkEvH1AhMLp+N2Y=; b=YmWH4qk96rFPFI8APGV24/A4nOBi731kwachZq5L80m8XfqU9vRA+Y9fOFhkV4JX7J CqK6NGJzggW33yzAKjiFXwlaHWaM2HYTIBG6M1xU65/HKVDYnG8jAPilaqUa5HYwBheg iilX9gnuFN0tbAkPicEjXm3DSKE/ErJ4RmX9XCwQH4nPW3UaJMDHWq3OQbjpWCRvIJre 95snKe7shqZslqtW6l8o1hl+F9rzhJsdZycVRG8VGpDMHA8svuVR3NSgN98RVtT3QZOL zkhYDhtnXLB/oeMilhGeIFA7i4RMYWnmPtQVJs+eA3ACddl3/LcDnqUt2fJDTJy5tcZr yWZQ== X-Gm-Message-State: AJcUukfdpbO/fhuVoYzHxtuHd9iBgQmbj6neTii2EuE2/tV7yHAVRmON +d/mio52RnH6lXzi8511zwVuyA== X-Google-Smtp-Source: ALg8bN4X9PAHIE82svv2XmbTltSN2N7UeURKnK285EY/7L5ZaBqwYT92eBN53UCyQgudHlAmYKAjiA== X-Received: by 2002:a1c:67c2:: with SMTP id b185mr22603694wmc.96.1548836214254; Wed, 30 Jan 2019 00:16:54 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:f:6020:79e5:6689:e4d2:d212]) by smtp.gmail.com with ESMTPSA id t5sm1952500wmd.15.2019.01.30.00.16.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Jan 2019 00:16:53 -0800 (PST) From: Vincent Guittot To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, rjw@rjwysocki.net, ulf.hansson@linaro.org, biju.das@bp.renesas.com Cc: geert@linux-m68k.org, linux-renesas-soc@vger.kernel.org, Vincent Guittot Subject: [PATCH] PM-runtime: fix deadlock with ktime Date: Wed, 30 Jan 2019 09:16:34 +0100 Message-Id: <1548836194-15264-1-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A deadlock has been seen when swicthing clocksources which use PM runtime. The call path is: change_clocksource ... write_seqcount_begin ... timekeeping_update ... sh_cmt_clocksource_enable ... rpm_resume pm_runtime_mark_last_busy ktime_get do read_seqcount_begin while read_seqcount_retry .... write_seqcount_end Although we should be safe because we haven't yet changed the clocksource at that time, we can't because of seqcount protection. Use ktime_get_mono_fast_ns instead which is lock safe for such case Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers") Reported-by: Biju Das Signed-off-by: Vincent Guittot --- drivers/base/power/runtime.c | 10 +++++----- include/linux/pm_runtime.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 457be03..708a13f 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -130,7 +130,7 @@ u64 pm_runtime_autosuspend_expiration(struct device *dev) { int autosuspend_delay; u64 last_busy, expires = 0; - u64 now = ktime_to_ns(ktime_get()); + u64 now = ktime_get_mono_fast_ns(); if (!dev->power.use_autosuspend) goto out; @@ -909,7 +909,7 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) * If 'expires' is after the current time, we've been called * too early. */ - if (expires > 0 && expires < ktime_to_ns(ktime_get())) { + if (expires > 0 && expires < ktime_get_mono_fast_ns()) { dev->power.timer_expires = 0; rpm_suspend(dev, dev->power.timer_autosuspends ? (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC); @@ -928,7 +928,7 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) int pm_schedule_suspend(struct device *dev, unsigned int delay) { unsigned long flags; - ktime_t expires; + u64 expires; int retval; spin_lock_irqsave(&dev->power.lock, flags); @@ -945,8 +945,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay) /* Other scheduled or pending requests need to be canceled. */ pm_runtime_cancel_pending(dev); - expires = ktime_add(ktime_get(), ms_to_ktime(delay)); - dev->power.timer_expires = ktime_to_ns(expires); + expires = ktime_get_mono_fast_ns() + (u64)delay * NSEC_PER_MSEC); + dev->power.timer_expires = expires; dev->power.timer_autosuspends = 0; hrtimer_start(&dev->power.suspend_timer, expires, HRTIMER_MODE_ABS); diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 54af4ee..fed5be7 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -105,7 +105,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev) static inline void pm_runtime_mark_last_busy(struct device *dev) { - WRITE_ONCE(dev->power.last_busy, ktime_to_ns(ktime_get())); + WRITE_ONCE(dev->power.last_busy, ktime_get_mono_fast_ns()); } static inline bool pm_runtime_is_irq_safe(struct device *dev)