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: 157055 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5647136jaa; Wed, 30 Jan 2019 00:16:58 -0800 (PST) X-Google-Smtp-Source: ALg8bN6jB5GWPe4AFlpZzKJEEFpHKMWDbt162LEM6GxqeEqe2c1YzXeLq9kfDiZH5FBnxxqyJFV2 X-Received: by 2002:a62:8a51:: with SMTP id y78mr29260278pfd.35.1548836218593; Wed, 30 Jan 2019 00:16:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548836218; cv=none; d=google.com; s=arc-20160816; b=SMzcjQFAbjiXk8OdX+BjMMtTEzUjY0/NR3tyOfaxVu+WhCGKNCpOay/cMeng2RcM0s /b5kryRuf3Xj3Lw6oYcflc1/ETqSE/j5NRcfdJPgI52R7gG/5KU5IuSElrMN4b6Lo30e W7V5JjH+mvlCeQOUaTUNSc2TQTg1cl6ZsWvZa6gIzRPZKAU19EyKfrIkjTwnyz4VdBgM fUzClSQSBfIKOe6QQ5emAkKQ40NVlXYw7CMNNBKCGE35P8ZW07m0tKMTuTsvcizHXceL HJ2faLBQZqsfSl8MUOzkxTA8jqgBo6+BslpwxQkg7f53kOWu/BKWTXdU5p9psOooN59n k2SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=6lyGIVRnQ1BZvQ2ddIjLm1Fs9ngmnkEvH1AhMLp+N2Y=; b=UuJ7OP7rV830A51H0ZcOS5DIj0nkKm0KdeyctyWnMAhJqkJYllNHg6byIHFFTDSKX9 rVsEkI4tQlSwNDhL+jBiIERF5QrmkQJ75chYys7HkO+AHIMqvl/f8PWySRHidRMQ7vrn u32yyGsp7zmwmi8wiGbJX18Wdey541wTHRTmPMI42zjmTyeJRXGvpEYSFLE2KGCUMW+I 12fCu4fvuSyyLe8OJEc810XuVIsNEMwrK+3Dc/ZMLIok+Tmd/WUTR+7bcqwt9wKbBCVJ fYUbTFTWkw9cipupnyc9uOoGt7Hq2a2fA+LQGgVRAoVOUUn1l16nlPF09BCCZFmehmft ISLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OftG1KsK; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 p20si899120pfk.125.2019.01.30.00.16.58; Wed, 30 Jan 2019 00:16:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=OftG1KsK; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1728024AbfA3IQ5 (ORCPT + 11 others); Wed, 30 Jan 2019 03:16:57 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:56044 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730151AbfA3IQ4 (ORCPT ); Wed, 30 Jan 2019 03:16:56 -0500 Received: by mail-wm1-f68.google.com with SMTP id y139so20435857wmc.5 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=hRGbDA/3dhZAG1sMMJeu5ZSQWIecArMhnbFrwdByFNxirAR/BMUlg1irGQr83VyRg+ f/u3ZZ/yqeJPToOshikFEub/ufUq7WLFFl/Ot5SQIJP2mNXyTiVIO0BAFEtza2KB04/t npXJsdBDooyHtZ0763VO/HwysOTY6ExHijbbbpEOVtlQZbySAwY2jPqiWFawtRWm/LCF gAW2Ec8I+WOTk1ZMoOD/KhXycDCPkkKxK0ncTqZJ+Ogsklf6tSCjOtgDqNePGn/eBF+w JNckbwls2u8X8CZdyNeVC1BqnzOSszndg1KpS8YKt1jZjSS/KA4M6gm+I7qAcA6AB79R fNHg== X-Gm-Message-State: AJcUukcu69yggmi0Qjlvx7qO2Gm9dNiSVkXTnBbUfKwZwEOBBHFyh3+Z icUMTskb/ynwRDB/48D/WtW1QKOqZv4PGQ== 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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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(-) -- 2.7.4 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)