| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230613132550.GD536267@lorien.usersys.redhat.com>
Date: Tue, 13 Jun 2023 09:25:50 -0400
From: Phil Auld <pauld@...hat.com>
To: Daniel Bristot de Oliveira <bristot@...nel.org>
Cc: Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Juri Lelli <juri.lelli@...hat.com>,
Vincent Guittot <vincent.guittot@...aro.org>,
Dietmar Eggemann <dietmar.eggemann@....com>,
Steven Rostedt <rostedt@...dmis.org>,
Ben Segall <bsegall@...gle.com>, Mel Gorman <mgorman@...e.de>,
Daniel Bristot de Oliveira <bristot@...hat.com>,
Valentin Schneider <vschneid@...hat.com>,
linux-kernel@...r.kernel.org,
Luca Abeni <luca.abeni@...tannapisa.it>,
Tommaso Cucinotta <tommaso.cucinotta@...tannapisa.it>,
Thomas Gleixner <tglx@...utronix.de>,
Joel Fernandes <joel@...lfernandes.org>,
Vineeth Pillai <vineeth@...byteword.org>,
Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: [RFC PATCH V3 2/6] sched/deadline: Collect sched_dl_entity
initialization
On Thu, Jun 08, 2023 at 05:58:14PM +0200 Daniel Bristot de Oliveira wrote:
> From: Peter Zijlstra <peterz@...radead.org>
>
> Create a single function that initializes a sched_dl_entity.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
> Signed-off-by: Daniel Bristot de Oliveira <bristot@...nel.org>
Reviewed-by: Phil Auld <pauld@...hat.com>
> ---
> kernel/sched/core.c | 5 +----
> kernel/sched/deadline.c | 22 +++++++++++++++-------
> kernel/sched/sched.h | 5 +----
> 3 files changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index ac38225e6d09..e34b02cbe41f 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -4511,10 +4511,7 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
> memset(&p->stats, 0, sizeof(p->stats));
> #endif
>
> - RB_CLEAR_NODE(&p->dl.rb_node);
> - init_dl_task_timer(&p->dl);
> - init_dl_inactive_task_timer(&p->dl);
> - __dl_clear_params(p);
> + init_dl_entity(&p->dl);
>
> INIT_LIST_HEAD(&p->rt.run_list);
> p->rt.timeout = 0;
> diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
> index 030e7c11607f..22e5e64812c9 100644
> --- a/kernel/sched/deadline.c
> +++ b/kernel/sched/deadline.c
> @@ -333,6 +333,8 @@ static void dl_change_utilization(struct task_struct *p, u64 new_bw)
> __add_rq_bw(new_bw, &rq->dl);
> }
>
> +static void __dl_clear_params(struct sched_dl_entity *dl_se);
> +
> /*
> * The utilization of a task cannot be immediately removed from
> * the rq active utilization (running_bw) when the task blocks.
> @@ -432,7 +434,7 @@ static void task_non_contending(struct task_struct *p)
> raw_spin_lock(&dl_b->lock);
> __dl_sub(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p)));
> raw_spin_unlock(&dl_b->lock);
> - __dl_clear_params(p);
> + __dl_clear_params(dl_se);
> }
>
> return;
> @@ -1205,7 +1207,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer)
> return HRTIMER_NORESTART;
> }
>
> -void init_dl_task_timer(struct sched_dl_entity *dl_se)
> +static void init_dl_task_timer(struct sched_dl_entity *dl_se)
> {
> struct hrtimer *timer = &dl_se->dl_timer;
>
> @@ -1415,7 +1417,7 @@ static enum hrtimer_restart inactive_task_timer(struct hrtimer *timer)
> raw_spin_lock(&dl_b->lock);
> __dl_sub(dl_b, p->dl.dl_bw, dl_bw_cpus(task_cpu(p)));
> raw_spin_unlock(&dl_b->lock);
> - __dl_clear_params(p);
> + __dl_clear_params(dl_se);
>
> goto unlock;
> }
> @@ -1431,7 +1433,7 @@ static enum hrtimer_restart inactive_task_timer(struct hrtimer *timer)
> return HRTIMER_NORESTART;
> }
>
> -void init_dl_inactive_task_timer(struct sched_dl_entity *dl_se)
> +static void init_dl_inactive_task_timer(struct sched_dl_entity *dl_se)
> {
> struct hrtimer *timer = &dl_se->inactive_timer;
>
> @@ -2974,10 +2976,8 @@ bool __checkparam_dl(const struct sched_attr *attr)
> /*
> * This function clears the sched_dl_entity static params.
> */
> -void __dl_clear_params(struct task_struct *p)
> +static void __dl_clear_params(struct sched_dl_entity *dl_se)
> {
> - struct sched_dl_entity *dl_se = &p->dl;
> -
> dl_se->dl_runtime = 0;
> dl_se->dl_deadline = 0;
> dl_se->dl_period = 0;
> @@ -2995,6 +2995,14 @@ void __dl_clear_params(struct task_struct *p)
> #endif
> }
>
> +void init_dl_entity(struct sched_dl_entity *dl_se)
> +{
> + RB_CLEAR_NODE(&dl_se->rb_node);
> + init_dl_task_timer(dl_se);
> + init_dl_inactive_task_timer(dl_se);
> + __dl_clear_params(dl_se);
> +}
> +
> bool dl_param_changed(struct task_struct *p, const struct sched_attr *attr)
> {
> struct sched_dl_entity *dl_se = &p->dl;
> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
> index da0cec2fc63a..fa6512070fa7 100644
> --- a/kernel/sched/sched.h
> +++ b/kernel/sched/sched.h
> @@ -284,8 +284,6 @@ struct rt_bandwidth {
> unsigned int rt_period_active;
> };
>
> -void __dl_clear_params(struct task_struct *p);
> -
> static inline int dl_bandwidth_enabled(void)
> {
> return sysctl_sched_rt_runtime >= 0;
> @@ -2390,8 +2388,7 @@ extern struct rt_bandwidth def_rt_bandwidth;
> extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
> extern bool sched_rt_bandwidth_account(struct rt_rq *rt_rq);
>
> -extern void init_dl_task_timer(struct sched_dl_entity *dl_se);
> -extern void init_dl_inactive_task_timer(struct sched_dl_entity *dl_se);
> +extern void init_dl_entity(struct sched_dl_entity *dl_se);
>
> #define BW_SHIFT 20
> #define BW_UNIT (1 << BW_SHIFT)
> --
> 2.40.1
>
--
Powered by blists - more mailing lists