From patchwork Thu Apr 2 10:51:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 46719 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75C56216D1 for ; Thu, 2 Apr 2015 10:51:57 +0000 (UTC) Received: by lbdc10 with SMTP id c10sf16626448lbd.0 for ; Thu, 02 Apr 2015 03:51:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=agB3QhKt2te+ja17fncPYUGWuDMQ0C1Vii+5UfH7xCg=; b=jypoTlNyDiChLT5CifTOJjs8AHpBBMAKm9A0cqFHmOALkl8tWW9CSbkwiipDC3h3Bi qmRT8NqbWv2wBK6V7eV75nsTD68tuqjtq8XEGuDC+bmIurGfzn2QpRSeObUHyYgVsAJp Fd7YkAwYMsIDvutgKnkQvZ3H67Q9F7zeVGnz2KtAhnNYhEkWAD3f8oLFEDyFwBqmx+vw owXBY6m3AL9+/VyRXjNK5kJyXdA23VQ/lqMKdmaqX8vriSoRSW4CPSF7Zxj5O4mM4YEs pFD8tDshuN5XiPRXAeGlEtN7+/JCedEf5/ILW+Hv4eD6InwRAhOMbu/34PvngHNSMhe1 BQaQ== X-Gm-Message-State: ALoCoQmCK+Wk7ECrcvWuYRzcWQTJrbSz1RQQK3SEUWm9EmfgSghwpu491VlRGTUgtCVxglmdoAn3 X-Received: by 10.112.213.100 with SMTP id nr4mr10499148lbc.10.1427971916038; Thu, 02 Apr 2015 03:51:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.163.36 with SMTP id yf4ls194745lab.43.gmail; Thu, 02 Apr 2015 03:51:55 -0700 (PDT) X-Received: by 10.112.225.43 with SMTP id rh11mr2783172lbc.90.1427971915854; Thu, 02 Apr 2015 03:51:55 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id b8si3949128lae.45.2015.04.02.03.51.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 03:51:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labe2 with SMTP id e2so57200016lab.3 for ; Thu, 02 Apr 2015 03:51:55 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr40246081lab.106.1427971915750; Thu, 02 Apr 2015 03:51:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp1250807lbq; Thu, 2 Apr 2015 03:51:54 -0700 (PDT) X-Received: by 10.70.64.138 with SMTP id o10mr38615942pds.104.1427971913980; Thu, 02 Apr 2015 03:51:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id om9si6934283pbb.111.2015.04.02.03.51.52; Thu, 02 Apr 2015 03:51:53 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752906AbbDBKvq (ORCPT + 27 others); Thu, 2 Apr 2015 06:51:46 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:34391 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbbDBKvm (ORCPT ); Thu, 2 Apr 2015 06:51:42 -0400 Received: by pdbni2 with SMTP id ni2so86006919pdb.1 for ; Thu, 02 Apr 2015 03:51:42 -0700 (PDT) X-Received: by 10.66.185.230 with SMTP id ff6mr86977337pac.102.1427971902263; Thu, 02 Apr 2015 03:51:42 -0700 (PDT) Received: from localhost ([122.167.118.120]) by mx.google.com with ESMTPSA id nw14sm1277260pab.39.2015.04.02.03.51.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 02 Apr 2015 03:51:41 -0700 (PDT) From: Viresh Kumar To: Thomas Gleixner , Ingo Molnar , Peter Zijlstra Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar Subject: [PATCH 2/2] hrtimer: create for_each_active_base() to iterate over active clock-bases Date: Thu, 2 Apr 2015 16:21:22 +0530 Message-Id: <909ec44dbfcc4898ecaf86f72e311f78756b21a8.1427959032.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.3.0.rc0.44.ga94655d In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , At several instances we iterate over all possible clock-bases for a particular cpu-base. Whereas, we only need to iterate over active bases. We already have per cpu-base 'active_bases' field, which is updated on addition/removal of hrtimers. This patch creates for_each_active_base(), which uses 'active_bases' to iterate only over active bases. This also updates code which iterates over clock-bases. Reviewed-by: Preeti U Murthy Signed-off-by: Viresh Kumar --- kernel/time/hrtimer.c | 53 ++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 3152f327c988..dad8274623a0 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -111,6 +111,19 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id) /* + * for_each_active_base: iterate over all active clock bases + * @_index: 'int' variable for internal purpose + * @_base: holds pointer to a active clock base + * @_cpu_base: cpu base to iterate on + * @_active_bases: 'unsigned int' variable for internal purpose + */ +#define for_each_active_base(_index, _base, _cpu_base, _active_bases) \ + for ((_active_bases) = (_cpu_base)->active_bases; \ + (_index) = ffs(_active_bases), \ + (_base) = (_cpu_base)->clock_base + (_index) - 1, (_index); \ + (_active_bases) &= ~(1 << ((_index) - 1))) + +/* * Get the coarse grained time at the softirq based on xtime and * wall_to_monotonic. */ @@ -443,19 +456,15 @@ static inline void debug_deactivate(struct hrtimer *timer) #if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS) static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base) { - struct hrtimer_clock_base *base = cpu_base->clock_base; + struct hrtimer_clock_base *base; ktime_t expires, expires_next = { .tv64 = KTIME_MAX }; + struct hrtimer *timer; + unsigned int active_bases; int i; - for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++, base++) { - struct timerqueue_node *next; - struct hrtimer *timer; - - next = timerqueue_getnext(&base->active); - if (!next) - continue; - - timer = container_of(next, struct hrtimer, node); + for_each_active_base(i, base, cpu_base, active_bases) { + timer = container_of(timerqueue_getnext(&base->active), + struct hrtimer, node); expires = ktime_sub(hrtimer_get_expires(timer), base->offset); if (expires.tv64 < expires_next.tv64) expires_next = expires; @@ -1245,6 +1254,8 @@ void hrtimer_interrupt(struct clock_event_device *dev) { struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); ktime_t expires_next, now, entry_time, delta; + struct hrtimer_clock_base *base; + unsigned int active_bases; int i, retries = 0; BUG_ON(!cpu_base->hres_active); @@ -1264,15 +1275,10 @@ void hrtimer_interrupt(struct clock_event_device *dev) */ cpu_base->expires_next.tv64 = KTIME_MAX; - for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) { - struct hrtimer_clock_base *base; + for_each_active_base(i, base, cpu_base, active_bases) { struct timerqueue_node *node; ktime_t basenow; - if (!(cpu_base->active_bases & (1 << i))) - continue; - - base = cpu_base->clock_base + i; basenow = ktime_add(now, base->offset); while ((node = timerqueue_getnext(&base->active))) { @@ -1435,16 +1441,13 @@ void hrtimer_run_queues(void) struct timerqueue_node *node; struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); struct hrtimer_clock_base *base; + unsigned int active_bases; int index, gettime = 1; if (hrtimer_hres_active()) return; - for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) { - base = &cpu_base->clock_base[index]; - if (!timerqueue_getnext(&base->active)) - continue; - + for_each_active_base(index, base, cpu_base, active_bases) { if (gettime) { hrtimer_get_softirq_time(cpu_base); gettime = 0; @@ -1665,6 +1668,8 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base, static void migrate_hrtimers(int scpu) { struct hrtimer_cpu_base *old_base, *new_base; + struct hrtimer_clock_base *clock_base; + unsigned int active_bases; int i; BUG_ON(cpu_online(scpu)); @@ -1680,9 +1685,9 @@ static void migrate_hrtimers(int scpu) raw_spin_lock(&new_base->lock); raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING); - for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) { - migrate_hrtimer_list(&old_base->clock_base[i], - &new_base->clock_base[i]); + for_each_active_base(i, clock_base, old_base, active_bases) { + migrate_hrtimer_list(clock_base, + &new_base->clock_base[clock_base->index]); } raw_spin_unlock(&old_base->lock);