From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9981C282D8 for ; Fri, 1 Feb 2019 15:59:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 767B7218AC for ; Fri, 1 Feb 2019 15:59:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Nv/FbnQU"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="wR8KPdsh"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="FiI6uIUL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 767B7218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jbNawVXPO2e4NgcGro0ZJ7WS6TN00ogFvfm+yIvMTyI=; b=Nv/FbnQUjwTVJK D0tokfYAyUVhGXWH9GQXJFV8PQq9NnggS9V5C0w8R4rswSfMi0OoAhEL2MwEY9/WFzI+PEBV9OJ+i 8IP6fO/LQhBItK0YIMV7vuhY8oK5v9pAroFRqS2X8w87yc0PQnZVH1aQ2uwxzkyTJU6VH06IgLh6B vJmGCbtcDxhpfgto45i87O6LxjblGfU0XP06sO4194Nx6Tm2pU/0KUyYhV640etZ2cQqoWQWjDjjY 04zIt5X0ztvuG4UqcWVqwBvrXWZ+hbMxY4kDlm+DurNPtmuEhG0nzaDMRdGQr3qz8aF6KNXZ5cA8l QGBwdbDjCXdyhq9FIzeg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpbDg-0007Vr-EE; Fri, 01 Feb 2019 15:59:08 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpbDV-0007C3-C7 for linux-arm-kernel@bombadil.infradead.org; Fri, 01 Feb 2019 15:58:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:Subject:Message-ID: Date:From:In-Reply-To:References:MIME-Version:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4rCyBtEKCCb1eZWTDjgbspn9weqSBCPy3DAAWxTxy2g=; b=wR8KPdshojxIl97che+SiKMKo rnbqfo0dOjlootTlOLVnZnCKiFftJ24McJf2d6CoEkJ8DyU6tPkmtfvcd+Jb2+gfkKhQnKJ4+hupr OcpaK1NT07GenFxENBznu/m2YIhnyBdGZD6C2Xrl9luhc7N/f4Z3ZXfD3atNtILWIsgu2/4/YPz43 ETC56AoJV8PfJFow+isiZ0h7mjZ+wM8DEKrOAQGnKzp+S+WEx4PS4f1JZc6P/btialgzhGMZpZ8k9 D2n7botuSg1GeE+z/MeZsZ+6+2Nk4uIR8qDfgntWI4Twp6eEIughuyfZJPV9sYzzi4VHMq/Lw/mEu s9NbaRQ/g==; Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpb3O-0005vO-N7 for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2019 15:48:33 +0000 Received: by mail-it1-x143.google.com with SMTP id h193so10357254ita.5 for ; Fri, 01 Feb 2019 07:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4rCyBtEKCCb1eZWTDjgbspn9weqSBCPy3DAAWxTxy2g=; b=FiI6uIULRsNcp0eYNZYhfzDKwYukr6QM0eMUE4YOqYnqOkkQx47LsxM37Gza7bq/8a 9hYnkEl51IPjAyZCXiXNdcVsm/6LyPOMv9E1htvpUpJww1buNWBcg/g7xiDCmMpmSB/N pER/hPha25QF/vPiDTEvqD7yifj7HDj4ynEe8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4rCyBtEKCCb1eZWTDjgbspn9weqSBCPy3DAAWxTxy2g=; b=i9WKFsyG1RcA5wAz5Sd5Ipv6rm2KthSyV3fycd3GejkNiHDYLS9kLO2Wi73Lbvx9IZ k4gFhKY4uWTlKdebcC41xv4tU2ioUhe/3yM1sx+hPBt/tc4UoW1616AyNWR6f6hkeaed JRDJhWsjXpxSgShYol0yd7qqAA9T2SW3khLmblqII5Hhvdj8W1s2EsZdGZDtHAkQt3N3 E8j8sktTDoMsxIIgVvehzgRiPpZv3mLi/gzZFpDeho8KORGDg9E9S622Yj86khVfAeU0 D8HPOgN/JyF17ET54FbYp11BMvHwrZP6NzSc4JH8x9wzf6k/+OwAH+Q0BXaBVeS5Sg8i HxvQ== X-Gm-Message-State: AJcUukfp0HlkxIBCOd53UUsfAAaYOtICUFlTmop5wZvHQrttflkKmCbl RAHF6A+fZ/uHSY8RuYeYKL2oNnPMsdufatcW+OQgaw== X-Google-Smtp-Source: ALg8bN74vFX/djwmkAtex0lYtObB5+K0/sYKTFG0AK6rJEZ5yq6eh+9N820nn6eNGCIB6/3zMP2qO+Aif+/cVO/kHSc= X-Received: by 2002:a02:7f08:: with SMTP id r8mr22572099jac.20.1549036108472; Fri, 01 Feb 2019 07:48:28 -0800 (PST) MIME-Version: 1.0 References: <1548869162-6223-1-git-send-email-vincent.guittot@linaro.org> In-Reply-To: From: Vincent Guittot Date: Fri, 1 Feb 2019 16:48:17 +0100 Message-ID: Subject: Re: [PATCH v3] PM-runtime: fix deadlock with ktime To: Biju Das X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190201_154830_768978_6F0FA579 X-CRM114-Status: GOOD ( 43.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , Linux PM , "Rafael J. Wysocki" , "Rafael J. Wysocki" , Linux Kernel Mailing List , Linux-Renesas , Geert Uytterhoeven , Linux OMAP Mailing List , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 1 Feb 2019 at 16:44, Biju Das wrote: > > Hi Vincent, > > Thanks for the feedback. Instead of reverting. I just modified the patch like this and it fixed the issue. > > diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c > index 4eaf166..145a182 100644 > --- a/drivers/base/power/runtime.c > +++ b/drivers/base/power/runtime.c > @@ -66,7 +66,7 @@ static int rpm_suspend(struct device *dev, int rpmflags); > */ > void update_pm_runtime_accounting(struct device *dev) > { > - u64 now = ktime_to_ns(ktime_get()); > + u64 now = ktime_get_mono_fast_ns(); > u64 delta; yes. This probably also need to be changed in another place (pm_runtime_enable) to be safe Our email have crossed. I just sent something similar > > regards, > Biju > > > -----Original Message----- > > From: linux-renesas-soc-owner@vger.kernel.org > owner@vger.kernel.org> On Behalf Of Vincent Guittot > > Sent: 01 February 2019 15:29 > > To: Biju Das > > Cc: Rafael J. Wysocki ; Linux PM > pm@vger.kernel.org>; Linux Kernel Mailing List > kernel@vger.kernel.org>; Linux ARM > kernel@lists.infradead.org>; Linux OMAP Mailing List > omap@vger.kernel.org>; Rafael J. Wysocki ; Ulf > > Hansson ; Geert Uytterhoeven > m68k.org>; Linux-Renesas > > Subject: Re: [PATCH v3] PM-runtime: fix deadlock with ktime > > > > On Fri, 1 Feb 2019 at 16:02, Biju Das wrote: > > > > > > Hi Vincent, > > > > > > I have rebased my kernel to "next-20190201". Still I am seeing dead lock. > > > > > > Am I missing any patch? > > > > No you don't miss anything. > > I think that it's the opposite. > > > > Modification in time accounting in PM runtime has been queued but it has > > not moved (yet) to ktime_get_mono_fast_ns() > > > > Can you try to revert c669560be6c8 ("PM-runtime: Replace jiffies-based > > accounting with ktime-based accounting") ? > > > > > > > > root@ek874:/# echo e61e0000.timer > > > > /sys/devices/system/clocksource/clocksource0/current_clocksource > > > [ 193.869423] > > > [ 193.870963] ============================================ > > > [ 193.876292] WARNING: possible recursive locking detected [ > > > 193.881625] 5.0.0-rc4-next-20190201-00007-g731346f #3 Not tainted [ > > > 193.887737] -------------------------------------------- > > > [ 193.893066] migration/0/11 is trying to acquire lock: > > > [ 193.898136] (____ptrval____) (tk_core.seq){----}, at: > > > update_pm_runtime_accounting+0x14/0x68 > > > [ 193.906632] > > > [ 193.906632] but task is already holding lock: > > > [ 193.912483] (____ptrval____) (tk_core.seq){----}, at: > > > multi_cpu_stop+0x8c/0x140 [ 193.919828] [ 193.919828] other info > > > that might help us debug this: > > > [ 193.926377] Possible unsafe locking scenario: > > > [ 193.926377] > > > [ 193.932314] CPU0 > > > [ 193.934765] ---- > > > [ 193.937216] lock(tk_core.seq); > > > [ 193.940453] lock(tk_core.seq); > > > [ 193.943691] > > > [ 193.943691] *** DEADLOCK *** > > > [ 193.943691] > > > [ 193.949634] May be due to missing lock nesting notation [ > > > 193.949634] [ 193.956446] 3 locks held by migration/0/11: > > > [ 193.960642] #0: (____ptrval____) (timekeeper_lock){-.-.}, at: > > > change_clocksource+0x2c/0x118 [ 193.969125] #1: (____ptrval____) > > > (tk_core.seq){----}, at: multi_cpu_stop+0x8c/0x140 [ 193.976903] #2: > > > (____ptrval____) (&(&dev->power.lock)->rlock){....}, at: > > > __pm_runtime_resume+0x40/0x98 [ 193.986339] [ 193.986339] stack > > backtrace: > > > [ 193.990715] CPU: 0 PID: 11 Comm: migration/0 Not tainted > > > 5.0.0-rc4-next-20190201-00007-g731346f #3 [ 193.999707] Hardware > > > name: Silicon Linux RZ/G2E evaluation kit EK874 (CAT874 + CAT875) (DT) [ > > 194.008089] Call trace: > > > [ 194.010553] dump_backtrace+0x0/0x178 [ 194.014227] > > > show_stack+0x14/0x20 [ 194.017562] dump_stack+0xb0/0xec [ > > > 194.020895] __lock_acquire+0xfb4/0x1c08 [ 194.024832] > > > lock_acquire+0xd0/0x268 [ 194.028420] ktime_get+0x5c/0x108 [ > > > 194.031747] update_pm_runtime_accounting+0x14/0x68 > > > [ 194.036643] rpm_resume+0x4ec/0x698 [ 194.040144] > > > __pm_runtime_resume+0x50/0x98 [ 194.044264] > > > sh_tmu_enable.part.1+0x24/0x50 [ 194.048462] > > > sh_tmu_clocksource_enable+0x48/0x70 > > > [ 194.053097] change_clocksource+0x84/0x118 [ 194.057208] > > > multi_cpu_stop+0x8c/0x140 [ 194.060970] > > > cpu_stopper_thread+0xac/0x120 [ 194.065087] > > > smpboot_thread_fn+0x1ac/0x2c8 [ 194.069198] kthread+0x128/0x130 [ > > > 194.072439] ret_from_fork+0x10/0x18 > > > > > > > > > Regards, > > > Biju > > > > > > > -----Original Message----- > > > > From: Rafael J. Wysocki > > > > Sent: 30 January 2019 21:53 > > > > To: Vincent Guittot > > > > Cc: Linux PM ; Linux Kernel Mailing List > > > > ; Linux ARM > > > kernel@lists.infradead.org>; Linux OMAP Mailing List > > > omap@vger.kernel.org>; Rafael J. Wysocki ; Ulf > > > > Hansson ; Biju Das > > > > ; Geert Uytterhoeven > > > > ; Linux-Renesas > > > renesas-soc@vger.kernel.org> > > > > Subject: Re: [PATCH v3] PM-runtime: fix deadlock with ktime > > > > > > > > On Wed, Jan 30, 2019 at 6:26 PM Vincent Guittot > > > > wrote: > > > > > > > > > > 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 > > > > > > > > > > With ktime_get_mono_fast_ns, the timestamp is not guaranteed to be > > > > > monotonic across an update and as a result can goes backward. > > > > > According to > > > > > update_fast_timekeeper() description: "In the worst case, this can > > > > > result is a slightly wrong timestamp (a few nanoseconds)". For PM > > > > > runtime autosuspend, this means only that the suspend decision can > > > > > be slightly sub optimal. > > > > > > > > > > Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using > > > > > hrtimers") > > > > > Reported-by: Biju Das > > > > > Signed-off-by: Vincent Guittot > > > > > --- > > > > > > > > > > Hi Rafael, > > > > > > > > > > Sorry, I sent the version with the typo mistake that generated the > > > > > compilation error reported by kbuild-test-robot > > > > > > > > > > This version doesn't have the typo. > > > > > > > > OK, I've applied this one, thanks! > > > > > > > > > > > > Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne > > End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under > > Registered No. 04586709. > > > > Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel