From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 0AB163B2FD5 for ; Thu, 30 Apr 2026 21:38:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585125; cv=none; b=paI6ljSAs6rs93gDJCwPDroRXmBegr3KVvi55SIo5JaI832+BO8fa73S3/D+6PvN6k9nP2EB8YPM6UdvFcOaj2m6QrjBliEudyzvhSwtJMKnehVY8rP/Lnfc6XqLix1W0hrxcFUV6KwA0mx1g9KO1+fU5stD6HO3zQ9ryxGF0kY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585125; c=relaxed/simple; bh=m1vjN2qEDyevLPnyiQMQNrHrguQ+xPUjLyG53fS5P38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AvJaywHBXwva0vhFnDlIQBPpnG/LnEApFSLYe0dCjXkf4BadhfH1iZmYMPC5B7590cDN04ihglFc/GFWew5a/PAg+jWMKpuTdyTpT/KqIOvgRATSdTv9jtv/1tryr2PRZNGQcxeempxexwNQstDaOTkxSsgO5nDrcm4hXIedCnE= 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=OZQTuizo; arc=none smtp.client-ip=209.85.221.49 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="OZQTuizo" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-448528f4e69so889786f8f.3 for ; Thu, 30 Apr 2026 14:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777585122; x=1778189922; 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=QEX2eX6C4MXshGyJ5tN+kLdkzbyV1iymWxKHYCHTVP4=; b=OZQTuizoOAzt+UisSk6ZIMQx5Ou2KhF49Ut3OWzA3gAZR0L9P/OQBd2n9vOCMAQnd4 aqfBjxvj89l/Ysi+n93rY9ZdHCKgZOkwg20v9LSaieIhyRwjO0ehDT7q7HTWFlMmXJ3U Y9k9vDSrTV2UVEztQEQ34h3hQoO2hnq6kHpnfhev2ZTkbOluL7Er2/w8+L8CxBpogPqp GWIIMC0IpLkLE7ZpxVS7g+UdKspxrU8S2UAVO8K7t+54DTr8yG48hgiILZLb6/4d/TP8 Ev9xGZI9ulagPw2mMsnabCWDFtmFLS6Z21GojhgEYYPGjJePNZYHLZqPpaSY1fUCIsVN 2LxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777585122; x=1778189922; 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=QEX2eX6C4MXshGyJ5tN+kLdkzbyV1iymWxKHYCHTVP4=; b=SKfm26fBHCq8xb7MAR62AwKcZj0V6oeaBgE4Fx5JM76dBCDZSF2LZ1w3ifnIkhdbD0 l4LFeLhRPvozLK8FnVPKLueRWCD8nM/SarI/YKMMi8uqcu4xk5THPCWbwtB8yDGiMU9b 0pTQ5DsAVZWJIHIu76K5Nm/Oax96CD2l09dhd92NPU1y93bEkrYnSICg1Ms83pNP9sbg H3h2ZYKUKQ+9kakUYaJgPw7TxcuFbHNfdDbrXqiQ0z9EtmhX4g4FmJptJDnMJOfZ27JG qrHTHIqKrUpbL+F8AiGyAI3hxAsAkI+hQy9yJyJDDdRMW9vCN5dKdT4fF7WOPVSkH3Xx BjLg== X-Gm-Message-State: AOJu0Yx3kEITWsDTWRtcbgySx8lpOcwhf/EN4fXu2kMjZpb6QNOAGxoc vjqclQeqhlEZRAE96CSbb3rSfB63l3KYFikaOahRijgVAUWHIJIh6ylL X-Gm-Gg: AeBDieun2xJkOIXfSVi/iLizL5xUI+2hrMqdnqrZRsKAVeyn3jLXhcPH+LoaKHndaHt vxgtGCgxh34yNsQibBG01bL7OR2OZggVxDUDDd7nBtuWeFU/RLckQV6KaR93r3diwUeooPmP4Bk e2fkD6Up2OqKC6s8mRaIMe7d2/Xvh9TfLKa4ds/RirRKipi/fNBlXl5xbfCjJ6DEy2bKi2RP9JK 8bz3RXL/a3VdM6Kg/GfJ0i78BAd1/mbAAqNlmQvxXs4ZvkbWuyT0Cc6WSY59Bj70lq19b2nfVLW +uHSBT2hBLn74PWNnUa0iQsvUPQPwFDm9DfZu9GlV4Lz3wGNMQXSzMaZKLrnukj3w9LBHXKgmZz ARzH/5wKp/8SRNQhkZAYy4927qlhVDWcUdwoqF11nJrK+K8bMzH6u8c9T3Bl/w1oezYG3qm2lLB npz/oawLdDbRIytI5fJPasW6tuayU2TiEXYlWXYwRQ X-Received: by 2002:a05:6000:184e:b0:43d:7a97:78b5 with SMTP id ffacd0b85a97d-4493e9836c1mr7877657f8f.33.1777585122477; Thu, 30 Apr 2026 14:38:42 -0700 (PDT) Received: from yuri-framework13 ([78.211.51.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a9879ef89sm418510f8f.30.2026.04.30.14.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 14:38:42 -0700 (PDT) From: Yuri Andriaccio To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider Cc: linux-kernel@vger.kernel.org, Luca Abeni , Yuri Andriaccio Subject: [RFC PATCH v5 02/29] sched/deadline: Do not access dl_se->rq directly Date: Thu, 30 Apr 2026 23:38:06 +0200 Message-ID: <20260430213835.62217-3-yurand2000@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430213835.62217-1-yurand2000@gmail.com> References: <20260430213835.62217-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 fb7b62e8190e..ce80d9c08e31 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -863,7 +863,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)) { /* @@ -1180,11 +1180,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; @@ -1195,7 +1195,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); @@ -1490,7 +1490,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; @@ -1584,14 +1584,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); } /* @@ -1800,7 +1800,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) @@ -1809,15 +1809,15 @@ 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; 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) @@ -1859,9 +1859,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); @@ -1870,9 +1870,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 @@ -1898,7 +1898,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; @@ -1974,7 +1974,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.53.0