From patchwork Sun Apr 8 08:20:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 10328229 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 355396020F for ; Sun, 8 Apr 2018 08:20:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1119C28B51 for ; Sun, 8 Apr 2018 08:20:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04D8528FD7; Sun, 8 Apr 2018 08:20:28 +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.7 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,RCVD_NUMERIC_HELO autolearn=ham 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 41B2728B51 for ; Sun, 8 Apr 2018 08:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbeDHIUY (ORCPT ); Sun, 8 Apr 2018 04:20:24 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:43428 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbeDHIUY (ORCPT ); Sun, 8 Apr 2018 04:20:24 -0400 Received: from 85.219.170.202 (85.219.170.202) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83) id 9d1ccbdfc10baa64; Sun, 8 Apr 2018 10:20:21 +0200 From: "Rafael J. Wysocki" To: Frederic Weisbecker Cc: Linux PM , Peter Zijlstra , Frederic Weisbecker , Thomas Gleixner , Paul McKenney , Thomas Ilsche , Doug Smythies , Rik van Riel , Aubrey Li , Mike Galbraith , LKML , Len Brown Subject: Re: [PATCH v9 07/10] time: hrtimer: Introduce hrtimer_next_event_without() Date: Sun, 08 Apr 2018 10:20:30 +0200 Message-ID: <3441609.rVjWXosy3s@aspire.rjw.lan> In-Reply-To: <20180407144637.GC16600@lerouge> References: <1736751.LdhZHb50jq@aspire.rjw.lan> <101528364.6nGUqP0EsC@aspire.rjw.lan> <20180407144637.GC16600@lerouge> MIME-Version: 1.0 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 On Saturday, April 7, 2018 4:46:38 PM CEST Frederic Weisbecker wrote: > On Wed, Apr 04, 2018 at 10:45:39AM +0200, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki > > > > The next set of changes will need to compute the time to the next > > hrtimer event over all hrtimers except for the scheduler tick one. > > > > To that end introduce a new helper function, > > hrtimer_next_event_without(), for computing the time until the next > > hrtimer event over all timers except for one and modify the underlying > > code in __hrtimer_next_event_base() to prepare it for being called by > > that new function. > > > > No intentional changes in functionality. > > > > Signed-off-by: Rafael J. Wysocki > > --- > > > > v8 -> v9: > > * Make fewer changes to the existing code. > > * Add a new helper function for the handling of the use case at hand. > > > > --- > > include/linux/hrtimer.h | 1 > > kernel/time/hrtimer.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- > > 2 files changed, 54 insertions(+), 2 deletions(-) > > > > Index: linux-pm/include/linux/hrtimer.h > > =================================================================== > > --- linux-pm.orig/include/linux/hrtimer.h > > +++ linux-pm/include/linux/hrtimer.h > > @@ -426,6 +426,7 @@ static inline ktime_t hrtimer_get_remain > > } > > > > extern u64 hrtimer_get_next_event(void); > > +extern u64 hrtimer_next_event_without(const struct hrtimer *exclude); > > > > extern bool hrtimer_active(const struct hrtimer *timer); > > > > Index: linux-pm/kernel/time/hrtimer.c > > =================================================================== > > --- linux-pm.orig/kernel/time/hrtimer.c > > +++ linux-pm/kernel/time/hrtimer.c > > @@ -490,6 +490,7 @@ __next_base(struct hrtimer_cpu_base *cpu > > while ((base = __next_base((cpu_base), &(active)))) > > > > static ktime_t __hrtimer_next_event_base(struct hrtimer_cpu_base *cpu_base, > > + const struct hrtimer *exclude, > > unsigned int active, > > ktime_t expires_next) > > { > > @@ -502,9 +503,24 @@ static ktime_t __hrtimer_next_event_base > > > > next = timerqueue_getnext(&base->active); > > timer = container_of(next, struct hrtimer, node); > > + if (timer == exclude) { > > + /* Get to the next timer in the queue. */ > > + struct rb_node *rbn = rb_next(&next->node); > > + > > + next = rb_entry_safe(rbn, struct timerqueue_node, node); > > + if (!next) > > + continue; > > Minor cosmectic detail again, timerqueue_iterate_next() would do the job and > avoid browsing timerqueue details. And below is a patch to make this change on top of the original. --- From: Rafael J. Wysocki Subject: [PATCH] time: hrtimer: Use timerqueue_iterate_next() to get to the next timer Use timerqueue_iterate_next() to get to the next timer in __hrtimer_next_event_base() without browsing the timerqueue details diredctly. No intentional changes in functionality. Suggested-by: Frederic Weisbecker Signed-off-by: Rafael J. Wysocki --- kernel/time/hrtimer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Index: linux-pm/kernel/time/hrtimer.c =================================================================== --- linux-pm.orig/kernel/time/hrtimer.c +++ linux-pm/kernel/time/hrtimer.c @@ -505,9 +505,7 @@ static ktime_t __hrtimer_next_event_base timer = container_of(next, struct hrtimer, node); if (timer == exclude) { /* Get to the next timer in the queue. */ - struct rb_node *rbn = rb_next(&next->node); - - next = rb_entry_safe(rbn, struct timerqueue_node, node); + next = timerqueue_iterate_next(next); if (!next) continue;