Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752932AbdGXItp (ORCPT ); Mon, 24 Jul 2017 04:49:45 -0400 Received: from mail.santannapisa.it ([193.205.80.98]:57744 "EHLO mail.santannapisa.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517AbdGXIti (ORCPT ); Mon, 24 Jul 2017 04:49:38 -0400 Date: Mon, 24 Jul 2017 09:49:29 +0200 From: Luca Abeni To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Juri Lelli , Claudio Scordino , Steven Rostedt , Tommaso Cucinotta , Daniel Bristot de Oliveira , Mathieu Poirier Subject: Re: [PATCH] sched/deadline: fix switching to -deadline Message-ID: <20170724094929.216193e1@luca> In-Reply-To: <1492716656-5362-1-git-send-email-luca.abeni@santannapisa.it> References: <1492716656-5362-1-git-send-email-luca.abeni@santannapisa.it> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2387 Lines: 68 Hi all, I have this patch in a local tree, together with other fixes / cleanups I plan to submit in the next weeks... Since I see that the patch has not been applied, I wonder if some changes are needed before submitting it another time. If anyone has requests for changes in the patch, let me know. Thanks, Luca On Thu, 20 Apr 2017 21:30:56 +0200 luca abeni wrote: > From: Luca Abeni > > When switching to -deadline, if the scheduling deadline of a task is > in the past then switched_to_dl() calls setup_new_entity() to properly > initialize the scheduling deadline and runtime. > > The problem is that the task is enqueued _before_ having its parameters > initialized by setup_new_entity(), and this can cause problems. > For example, a task with its out-of-date deadline in the past will > potentially be enqueued as the highest priority one; however, its > adjusted deadline may not be the earliest one. > > This patch fixes the problem by initializing the task's parameters before > enqueuing it. > > Signed-off-by: Luca Abeni > Reviewed-by: Daniel Bristot de Oliveira > --- > kernel/sched/deadline.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c > index a2ce590..ec53d24 100644 > --- a/kernel/sched/deadline.c > +++ b/kernel/sched/deadline.c > @@ -950,6 +950,10 @@ enqueue_dl_entity(struct sched_dl_entity *dl_se, > update_dl_entity(dl_se, pi_se); > else if (flags & ENQUEUE_REPLENISH) > replenish_dl_entity(dl_se, pi_se); > + else if ((flags & ENQUEUE_RESTORE) && > + dl_time_before(dl_se->deadline, > + rq_clock(rq_of_dl_rq(dl_rq_of_se(dl_se))))) > + setup_new_dl_entity(dl_se); > > __enqueue_dl_entity(dl_se); > } > @@ -1767,14 +1771,6 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) > if (!task_on_rq_queued(p)) > return; > > - /* > - * If p is boosted we already updated its params in > - * rt_mutex_setprio()->enqueue_task(..., ENQUEUE_REPLENISH), > - * p's deadline being now already after rq_clock(rq). > - */ > - if (dl_time_before(p->dl.deadline, rq_clock(rq))) > - setup_new_dl_entity(&p->dl); > - > if (rq->curr != p) { > #ifdef CONFIG_SMP > if (p->nr_cpus_allowed > 1 && rq->dl.overloaded)