Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755801AbdIHI0J (ORCPT ); Fri, 8 Sep 2017 04:26:09 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:36731 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754443AbdIHI0H (ORCPT ); Fri, 8 Sep 2017 04:26:07 -0400 X-Google-Smtp-Source: ADKCNb6KPy6YjRZNuv6J5+2m52FXjyq5ypyaZfSBCZOkdVQK94jQG85RAAiq12TCysTDCHYrEKJ4lw== Subject: Re: [PATCH 3/4] sched/deadline: rename __dl_clear() to __dl_sub() To: luca abeni , linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Juri Lelli , Steven Rostedt , Mathieu Poirier References: <1504778971-13573-1-git-send-email-luca.abeni@santannapisa.it> <1504778971-13573-4-git-send-email-luca.abeni@santannapisa.it> From: Daniel Bristot de Oliveira Message-ID: <32a6287b-bedb-eae5-9686-481c1716f754@redhat.com> Date: Fri, 8 Sep 2017 10:26:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <1504778971-13573-4-git-send-email-luca.abeni@santannapisa.it> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3012 Lines: 81 On 09/07/2017 12:09 PM, luca abeni wrote: > From: Peter Zijlstra > > __dl_sub() is more meaningful as a name, and is more consistent > with the naming of the dual function (__dl_add()). > > Signed-off-by: Peter Zijlstra (Intel) > Signed-off-by: luca abeni Reviewed-by: Daniel Bristot de Oliveira -- Daniel > --- > kernel/sched/deadline.c | 10 +++++----- > kernel/sched/sched.h | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c > index d7f9e86..bab11dd 100644 > --- a/kernel/sched/deadline.c > +++ b/kernel/sched/deadline.c > @@ -242,7 +242,7 @@ static void task_non_contending(struct task_struct *p) > if (p->state == TASK_DEAD) > sub_rq_bw(p->dl.dl_bw, &rq->dl); > raw_spin_lock(&dl_b->lock); > - __dl_clear(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > + __dl_sub(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > __dl_clear_params(p); > raw_spin_unlock(&dl_b->lock); > } > @@ -1211,7 +1211,7 @@ static enum hrtimer_restart inactive_task_timer(struct hrtimer *timer) > } > > raw_spin_lock(&dl_b->lock); > - __dl_clear(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > + __dl_sub(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > raw_spin_unlock(&dl_b->lock); > __dl_clear_params(p); > > @@ -2182,7 +2182,7 @@ static void set_cpus_allowed_dl(struct task_struct *p, > * until we complete the update. > */ > raw_spin_lock(&src_dl_b->lock); > - __dl_clear(src_dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > + __dl_sub(src_dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p))); > raw_spin_unlock(&src_dl_b->lock); > } > > @@ -2460,7 +2460,7 @@ int sched_dl_overflow(struct task_struct *p, int policy, > if (dl_policy(policy) && !task_has_dl_policy(p) && > !__dl_overflow(dl_b, cpus, 0, new_bw)) { > if (hrtimer_active(&p->dl.inactive_timer)) > - __dl_clear(dl_b, p->dl.dl_bw, cpus); > + __dl_sub(dl_b, p->dl.dl_bw, cpus); > __dl_add(dl_b, new_bw, cpus); > err = 0; > } else if (dl_policy(policy) && task_has_dl_policy(p) && > @@ -2472,7 +2472,7 @@ int sched_dl_overflow(struct task_struct *p, int policy, > * But this would require to set the task's "inactive > * timer" when the task is not inactive. > */ > - __dl_clear(dl_b, p->dl.dl_bw, cpus); > + __dl_sub(dl_b, p->dl.dl_bw, cpus); > __dl_add(dl_b, new_bw, cpus); > dl_change_utilization(p, new_bw); > err = 0; > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index 0b93e4b..061ec3b 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -226,7 +226,7 @@ struct dl_bw { > static inline void __dl_update(struct dl_bw *dl_b, s64 bw); > > static inline > -void __dl_clear(struct dl_bw *dl_b, u64 tsk_bw, int cpus) > +void __dl_sub(struct dl_bw *dl_b, u64 tsk_bw, int cpus) > { > dl_b->total_bw -= tsk_bw; > __dl_update(dl_b, (s32)tsk_bw / cpus); >