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=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham 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 B7E95C4321D for ; Thu, 16 Aug 2018 13:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 762902147D for ; Thu, 16 Aug 2018 13:23:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 762902147D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391648AbeHPQVd (ORCPT ); Thu, 16 Aug 2018 12:21:33 -0400 Received: from foss.arm.com ([217.140.101.70]:36676 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727244AbeHPQVd (ORCPT ); Thu, 16 Aug 2018 12:21:33 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BF67D80D; Thu, 16 Aug 2018 06:22:57 -0700 (PDT) Received: from e110439-lin (e110439-lin.Emea.Arm.com [10.4.12.126]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2036F3F5BC; Thu, 16 Aug 2018 06:22:54 -0700 (PDT) Date: Thu, 16 Aug 2018 14:22:49 +0100 From: Patrick Bellasi To: Dietmar Eggemann Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Tejun Heo , "Rafael J . Wysocki" , Viresh Kumar , Vincent Guittot , Paul Turner , Morten Rasmussen , Juri Lelli , Todd Kjos , Joel Fernandes , Steve Muckle , Suren Baghdasaryan Subject: Re: [PATCH v3 04/14] sched/core: uclamp: update CPU's refcount on clamp changes Message-ID: <20180816132249.GA2960@e110439-lin> References: <20180806163946.28380-1-patrick.bellasi@arm.com> <20180806163946.28380-5-patrick.bellasi@arm.com> <4023267d-be06-c599-136e-1f70bf376d5d@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4023267d-be06-c599-136e-1f70bf376d5d@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15-Aug 17:02, Dietmar Eggemann wrote: > On 08/06/2018 06:39 PM, Patrick Bellasi wrote: > > [...] > > >+/** > >+ * uclamp_task_active: check if a task is currently clamping a CPU > >+ * @p: the task to check > >+ * > >+ * A task actively affects the utilization clamp of a CPU if: > >+ * - it's currently enqueued or running on that CPU > >+ * - it's refcounted in at least one clamp group of that CPU > >+ * > >+ * Return: true if p is currently clamping the utilization of its CPU. > >+ */ > >+static inline bool uclamp_task_active(struct task_struct *p) > >+{ > >+ struct rq *rq = task_rq(p); > >+ int clamp_id; > >+ > >+ lockdep_assert_held(&p->pi_lock); > >+ lockdep_assert_held(&rq->lock); > >+ > >+ if (!task_on_rq_queued(p) && !p->on_cpu) > >+ return false; > >+ > >+ for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) { > >+ if (uclamp_task_affects(p, clamp_id)) > >+ return true; > >+ } > >+ > >+ return false; > >+} > > Looks like that uclamp_task_active() is only used once (in > uclamp_task_update_active()). Can you not code the if condition and the for > loop directly in uclamp_task_update_active()? This would save code > (lockdep_assert_held() etc.) and comment lines. Yes, that's possible... and we will have: ---8<--- diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ae528a7b9bef..0c8bec892018 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1331,7 +1331,9 @@ uclamp_task_update_active(struct task_struct *p, int clamp_id, int group_id) * index, then that task is not yet RUNNABLE and it's going to be * enqueued with the proper clamp group value. */ - if (!uclamp_task_active(p)) + if (!task_on_rq_queued(p) && !p->on_cpu) + goto done; + if (!uclamp_task_affects(p, clamp_id)) goto done; /* Release p's currently referenced clamp group */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 11d139faed1f..65fdf4abc6ff 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2231,35 +2231,6 @@ static inline bool uclamp_task_affects(struct task_struct *p, int clamp_id) { return (p->uclamp[clamp_id].effective.group_id != UCLAMP_NOT_VALID); } - -/** - * uclamp_task_active: check if a task is currently clamping a CPU - * @p: the task to check - * - * A task actively affects the utilization clamp of a CPU if: - * - it's currently enqueued or running on that CPU - * - it's refcounted in at least one clamp group of that CPU - * - * Return: true if p is currently clamping the utilization of its CPU. - */ -static inline bool uclamp_task_active(struct task_struct *p) -{ - struct rq *rq = task_rq(p); - int clamp_id; - - lockdep_assert_held(&p->pi_lock); - lockdep_assert_held(&rq->lock); - - if (!task_on_rq_queued(p) && !p->on_cpu) - return false; - - for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) { - if (uclamp_task_affects(p, clamp_id)) - return true; - } - - return false; -} #endif /* CONFIG_UCLAMP_TASK */ #ifdef CONFIG_CPU_FREQ ---8<--- I'll add this to the next posting! Cheers Patrick -- #include Patrick Bellasi