From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E42DB372B26 for ; Mon, 8 Jun 2026 12:15:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780920953; cv=none; b=K8jjiOao5s2Jz6dbtafus10my3m0s6Z2EcV2OwPEXcLrZWwr0RhY9EJMLYnI3BY6ShKodmqViHfaYTKPxxUxZAWwUQAtqqxbqbjjVNsMLwJFwCWKJkBJQaMT2smBAMecvXCWUwkNign6/zHPEqlmRI7o/dcPfQVH9iUPPhJgVS4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780920953; c=relaxed/simple; bh=rgXOYVc0DI3aXh/5+n+s9LzuQgPbNm+N8WAVL2wfAT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qsWw20GMDhLXOpnusOGSI1wF1rvaKj9g6clbc1VOoORBbIleb/R7pGvJVVZ9xpGi7S2Wb81ATVKyZUNm38dZwnUtDyzqrpnmuVuje9YjYUzygvTz5C8XQfEI5VKASp6dJEZc5geM5zK+/SvQacCZs17rPaKkRu+BxrM8DaN93tM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MBmR/Zkb; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MBmR/Zkb" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-460166910e6so2137150f8f.2 for ; Mon, 08 Jun 2026 05:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780920950; x=1781525750; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bLJJ4ZrsmzvR8fpp1788yY7mK5hc0zSHwTxr8F7vRWU=; b=MBmR/ZkbyuiXYKlyyr5sP/v2WnJYNMKO+zHrd6lWQ3GHEbWSzFQuKM+AcHYObymleB JX+3j7JAJ5Dp9F1sebFJC2QClOfdT0WIOGi5f9gm/3UsFdtTX2eVkEtM9+6cbdR7kGYU IRhiYApV/IGhoZ77eyL13hocRbS9/v4CGFkHMY4X9RnA5bILAZa6idAgXQ5EroKak0ez X5kusjt75XHS8SAHZSiyN+IgqoDmI8DUoHdjgy1PL1+sNFeqK02YKQWMIo7g1zd7Qdbg eMzjfb647u9NHllKpff28w3NA5wGU6Uci9Xgq9qiRsESNGEpDBDztvAjCAlbo0iKnlAe cYIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780920950; x=1781525750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bLJJ4ZrsmzvR8fpp1788yY7mK5hc0zSHwTxr8F7vRWU=; b=XpPTxPuCuD9x5I67tf0Biq8UgLUMdKga1EDRrmKQab1LUnAleVyjyA2PNaVihB4FZU g8dSed83gcLajOVSRt9IbyZ+mhaLM3FMayCZuIMoHEDaEGF+A24PJfQmmXDLSiHp/SXy sV9TLJPMGlavYUeW2NiIfEIXbr/uBzpmFa4yZXuEC/BrCOimXOutsDi29mWPKcsAfMsJ GZcU5dacHMFVRoDKLioLbh5Nhwqglyadkjp/Qo/Kl3yRiEPLBpqfPh4UBWaGa++MB0MV FImryH600gODRTWO7tovo83h5+Bq/W0yyBd4oBq6ccvoLIR3PYcP6hGDtnb7ar13sECU 3vQQ== X-Forwarded-Encrypted: i=1; AFNElJ9eoqi4OTS/wuMejupuT9kZsYaT4BqXYR6pa5ZUwPIbGJmXbOUks4ktXdrE6HOPO0H8/C+4uFwN1CMOnUw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx38l14/WEWoE6sQRQs4/5yr4Q0hQaZ6j8w5FOfThP7jLxMAwpG GPjzIA8mUhj6EzZ9te5SiTiWTc4dIsrKp8bXtBhdoqivIRQMHRvM6lPC X-Gm-Gg: Acq92OEPU7sna3Gfwbi5Ebnxnv7nq2aub7GCE8OtE05c16Z1uqfIFgo2taLQ9H14CH1 oQXaC06hleSHLTqQzof7A96w9xxjafHs7xJqpCwZGhQo9u9zpQNGjfkTe5XqdeTJbB6F4otCB9R PgUHADY2wxU6tfVUrqumx9Yax3WSx1hJQEoAJS6szsTKecL+tqnUYYHQAezRUJHpsE21adg2W3c 3RARnXMAPQ/JXH7WtOFcqptFwQK2OYEbjyLQTGQ/lDgUT0q5s3foJ37ySaNWb4l9sXG6bXIXZG9 YPW4Mn8TNYxOy7ltlYcY94Sn2IqqFsypHBwDhWC5AlgJ+3tNZ3hp6guPf41p5kJghijAejte2Sc HwB8VyfIvV8DeeWPvT6H4uk5CsfXU0IH6tWRu6aI8D/k8Bj1FUaVVIPZCP74e979FgfDyLjLgtc 3Qp+5zhwOSb688FXuNEIIxU6L2gm/ieBk= X-Received: by 2002:adf:e848:0:b0:460:cfc:eb24 with SMTP id ffacd0b85a97d-460304fec2bmr19705651f8f.22.1780920950442; Mon, 08 Jun 2026 05:15:50 -0700 (PDT) Received: from victus-lab ([193.205.81.5]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2ec711sm50644906f8f.12.2026.06.08.05.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 05:15:50 -0700 (PDT) From: Yuri Andriaccio To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Abeni , Yuri Andriaccio Subject: [RFC PATCH v6 03/25] sched/deadline: Do not access dl_se->rq directly Date: Mon, 8 Jun 2026 14:15:22 +0200 Message-ID: <20260608121546.69910-4-yurand2000@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608121546.69910-1-yurand2000@gmail.com> References: <20260608121546.69910-1-yurand2000@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: luca abeni Make deadline.c code access the runqueue of a scheduling entity saved in the sched_dl_entity data structure. This allows future patches to save different runqueues in sched_dl_entity other than the global runqueues. Move dl_server_apply_params call in sched_init_dl_servers as the rq_of_dl_se function will return the correct deadline entity only if the dl_server flag is set. Add a WARN_ON on the return value of dl_server_apply_params in sched_init_dl_servers as this function may fail if the kernel is not configured correctly. Signed-off-by: luca abeni Signed-off-by: Yuri Andriaccio --- kernel/sched/deadline.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index ddfd6bc63ab1..63e88ecdd5ed 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -869,7 +869,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se) * and arm the defer timer. */ if (dl_se->dl_defer && !dl_se->dl_defer_running && - dl_time_before(rq_clock(dl_se->rq), dl_se->deadline - dl_se->runtime)) { + dl_time_before(rq_clock(rq), dl_se->deadline - dl_se->runtime)) { if (!is_dl_boosted(dl_se)) { /* @@ -1170,11 +1170,11 @@ static enum hrtimer_restart dl_server_timer(struct hrtimer *timer, struct sched_ * of time. The dl_server_min_res serves as a limit to avoid * forwarding the timer for a too small amount of time. */ - if (dl_time_before(rq_clock(dl_se->rq), + if (dl_time_before(rq_clock(rq), (dl_se->deadline - dl_se->runtime - dl_server_min_res))) { /* reset the defer timer */ - fw = dl_se->deadline - rq_clock(dl_se->rq) - dl_se->runtime; + fw = dl_se->deadline - rq_clock(rq) - dl_se->runtime; hrtimer_forward_now(timer, ns_to_ktime(fw)); return HRTIMER_RESTART; @@ -1185,7 +1185,7 @@ static enum hrtimer_restart dl_server_timer(struct hrtimer *timer, struct sched_ enqueue_dl_entity(dl_se, ENQUEUE_REPLENISH); - if (!dl_task(dl_se->rq->curr) || dl_entity_preempt(dl_se, &dl_se->rq->curr->dl)) + if (!dl_task(rq->curr) || dl_entity_preempt(dl_se, &rq->curr->dl)) resched_curr(rq); __push_dl_task(rq, rf); @@ -1481,7 +1481,7 @@ static void update_curr_dl_se(struct rq *rq, struct sched_dl_entity *dl_se, s64 hrtimer_try_to_cancel(&dl_se->dl_timer); - replenish_dl_new_period(dl_se, dl_se->rq); + replenish_dl_new_period(dl_se, rq); if (idle) dl_se->dl_defer_idle = 1; @@ -1578,14 +1578,14 @@ static void update_curr_dl_se(struct rq *rq, struct sched_dl_entity *dl_se, s64 void dl_server_update_idle(struct sched_dl_entity *dl_se, s64 delta_exec) { if (dl_se->dl_server_active && dl_se->dl_runtime && dl_se->dl_defer) - update_curr_dl_se(dl_se->rq, dl_se, delta_exec); + update_curr_dl_se(rq_of_dl_se(dl_se), dl_se, delta_exec); } void dl_server_update(struct sched_dl_entity *dl_se, s64 delta_exec) { /* 0 runtime = fair server disabled */ if (dl_se->dl_server_active && dl_se->dl_runtime) - update_curr_dl_se(dl_se->rq, dl_se, delta_exec); + update_curr_dl_se(rq_of_dl_se(dl_se), dl_se, delta_exec); } /* @@ -1794,7 +1794,7 @@ void dl_server_update(struct sched_dl_entity *dl_se, s64 delta_exec) */ void dl_server_start(struct sched_dl_entity *dl_se) { - struct rq *rq = dl_se->rq; + struct rq *rq; dl_se->dl_defer_idle = 0; if (!dl_server(dl_se) || dl_se->dl_server_active || !dl_se->dl_runtime) @@ -1803,16 +1803,16 @@ void dl_server_start(struct sched_dl_entity *dl_se) /* * Update the current task to 'now'. */ + rq = rq_of_dl_se(dl_se); rq->donor->sched_class->update_curr(rq); - if (WARN_ON_ONCE(!cpu_online(cpu_of(rq)))) return; trace_sched_dl_server_start_tp(dl_se, cpu_of(rq), dl_get_type(dl_se, rq)); dl_se->dl_server_active = 1; enqueue_dl_entity(dl_se, ENQUEUE_WAKEUP); - if (!dl_task(dl_se->rq->curr) || dl_entity_preempt(dl_se, &rq->curr->dl)) - resched_curr(dl_se->rq); + if (!dl_task(rq->curr) || dl_entity_preempt(dl_se, &rq->curr->dl)) + resched_curr(rq); } void dl_server_stop(struct sched_dl_entity *dl_se) @@ -1856,9 +1856,9 @@ void sched_init_dl_servers(void) WARN_ON(dl_server(dl_se)); - dl_server_apply_params(dl_se, runtime, period, 1); - dl_se->dl_server = 1; + WARN_ON(dl_server_apply_params(dl_se, runtime, period, 1)); + dl_se->dl_defer = 1; setup_new_dl_entity(dl_se); @@ -1867,9 +1867,9 @@ void sched_init_dl_servers(void) WARN_ON(dl_server(dl_se)); - dl_server_apply_params(dl_se, runtime, period, 1); - dl_se->dl_server = 1; + WARN_ON(dl_server_apply_params(dl_se, runtime, period, 1)); + dl_se->dl_defer = 1; setup_new_dl_entity(dl_se); #endif @@ -1895,7 +1895,7 @@ int dl_server_apply_params(struct sched_dl_entity *dl_se, u64 runtime, u64 perio { u64 old_bw = init ? 0 : to_ratio(dl_se->dl_period, dl_se->dl_runtime); u64 new_bw = to_ratio(period, runtime); - struct rq *rq = dl_se->rq; + struct rq *rq = rq_of_dl_se(dl_se); int cpu = cpu_of(rq); struct dl_bw *dl_b; unsigned long cap; @@ -1971,7 +1971,7 @@ static enum hrtimer_restart inactive_task_timer(struct hrtimer *timer) p = dl_task_of(dl_se); rq = task_rq_lock(p, &rf); } else { - rq = dl_se->rq; + rq = rq_of_dl_se(dl_se); rq_lock(rq, &rf); } -- 2.54.0