From patchwork Thu Sep 28 21:26:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 146353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3672637vqu; Thu, 28 Sep 2023 16:46:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuvUF7ZYxaw7NqOq+5PAn6JaDq8JvrsIbBukSQe+9DFrjM6zD4lsK2le+f6RaP5lzGuydL X-Received: by 2002:a05:6358:52c2:b0:139:c279:1ee7 with SMTP id z2-20020a05635852c200b00139c2791ee7mr3298445rwz.18.1695944777567; Thu, 28 Sep 2023 16:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695944777; cv=none; d=google.com; s=arc-20160816; b=m8XdL8uypvcIhKC+cQAKLNt2vVMZM+hSR/atNm2qoQJaCgbGA1axJpqttyODW0HF4w E62gjodi0G9e+uG+i/Dc4fkuDsxzjOsFDmY6HqH9Ts8lVBbfgIFu8dNZZaSx80PTJmb4 cUZZC+p77OsFIneNth6hXHKiwqUnv9evoBOoyrD7KoYvdgVuCH9XiJJCdLo9lH66Ted2 9Os3tCl8tX69oQf7xXYcW9a08Jm/x4vBeeF1SHKu185N/mQ3sPoWfZBXXdGUcWNjSGQp iaZuZ1pOyjBEk5QFqkx2uMdusbAHRYLCpcHpqQxuDsEdx9Khzqz7Or+xTsePWzb9yckB zCCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Pu3D0kzrFyntbKUxcl0t5NG+JrCjDzw/c8WWzi3eR0A=; fh=tQXUNeiPiNp31285akpCqZQM40uKJ22dDu6VU6UTd5Q=; b=HRySI4HOoFnEk4i8+kIiTQBxXydWBF37FDL4Hn5KKcrhK/h9iKrVAI62gtyhVv0moF UBonIkpOgUEMOpaQX6HZkDYRBKdbXwXNMnX9u2NecNvmR/Wdzimp+qwuhrHCI5MgqOeJ mTLfqBlPZoDLFouvPKpB/s+NVySE+ZfKB8PtboZBsfp+nU3f3nqXSswLyBKAqETcuuyH PyMQ46hLyh1Fccyd4dMfHuSL0JpM1wkaLmF/qAMteEF/R7HeBL7ciLnRyjWof7kLXtAU KfXYTf3QpizI7YKz5Oru2Isif0vSaMZBH3bcrLDjt4v+pNoWn73r6cgkGFoiDXbXmXM/ pGcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=m9il3xhQ; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id f20-20020a63f114000000b00584e65212d4si8049461pgi.609.2023.09.28.16.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 16:46:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=m9il3xhQ; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id C0D06826EE07; Thu, 28 Sep 2023 14:27:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232457AbjI1V0t (ORCPT + 22 others); Thu, 28 Sep 2023 17:26:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbjI1V0s (ORCPT ); Thu, 28 Sep 2023 17:26:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B161DF3; Thu, 28 Sep 2023 14:26:45 -0700 (PDT) Date: Thu, 28 Sep 2023 21:26:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695936403; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu3D0kzrFyntbKUxcl0t5NG+JrCjDzw/c8WWzi3eR0A=; b=m9il3xhQR0mGYPLCz2uTaCCYC1vjojnCOKBBYG1SRd6v9vyZJlM1yGbKGpNmmN+VuaEkWU MwQql6Yw7py59d9blZMbx3CPMgqHOGx/NDsLBqA8AYkKBGivQGdIZvE8GDsudoFII8rzFJ dUrwHBWuD2cjD9xdvOp7BeP67GvBjh07k26kTiXKGjqVMjgMH3A3RaX5TQrPXdHbiqQwnF bB1uWo4bY5TK+0UdA+iqzC66ZKimoViSVOOfhTM/YkcZWAGV83VGSdhCJ8bLOcJPRSY5eb 5Fjxvk8q0Pg4ctvqMhvTZB4Ic3qroKdFTJrcjwViouiw2ZaZRFZC8RQGBJjwqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695936403; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu3D0kzrFyntbKUxcl0t5NG+JrCjDzw/c8WWzi3eR0A=; b=y+EDKXEwc2BNwHI3hJG0fCFi3tncf/rjL4Tz455U0e++A94790qzmqea9GPynYR1D8qWhG A8FwyT80akni1zBw== From: "tip-bot2 for Valentin Schneider" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/deadline: Make dl_rq->pushable_dl_tasks update drive dl_rq->overloaded Cc: Valentin Schneider , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230928150251.463109-1-vschneid@redhat.com> References: <20230928150251.463109-1-vschneid@redhat.com> MIME-Version: 1.0 Message-ID: <169593640298.27769.17789126122109991495.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 28 Sep 2023 14:27:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778326991017755146 X-GMAIL-MSGID: 1778326991017755146 The following commit has been merged into the sched/core branch of tip: Commit-ID: 177f608a4c82c29fa907de5b9da0df72523c4f55 Gitweb: https://git.kernel.org/tip/177f608a4c82c29fa907de5b9da0df72523c4f55 Author: Valentin Schneider AuthorDate: Thu, 28 Sep 2023 17:02:51 +02:00 Committer: Ingo Molnar CommitterDate: Thu, 28 Sep 2023 23:20:56 +02:00 sched/deadline: Make dl_rq->pushable_dl_tasks update drive dl_rq->overloaded dl_rq->dl_nr_migratory is increased whenever a DL entity is enqueued and it has nr_cpus_allowed > 1. Unlike the pushable_dl_tasks tree, dl_rq->dl_nr_migratory includes a dl_rq's current task. This means a dl_rq can have a migratable current, N non-migratable queued tasks, and be flagged as overloaded and have its CPU set in the dlo_mask, despite having an empty pushable_tasks tree. Make an dl_rq's overload logic be driven by {enqueue,dequeue}_pushable_dl_task(), in other words make DL RQs only be flagged as overloaded if they have at least one runnable-but-not-current migratable task. o push_dl_task() is unaffected, as it is a no-op if there are no pushable tasks. o pull_dl_task() now no longer scans runqueues whose sole migratable task is their current one, which it can't do anything about anyway. It may also now pull tasks to a DL RQ with dl_nr_running > 1 if only its current task is migratable. Since dl_rq->dl_nr_migratory becomes unused, remove it. RT had the exact same mechanism (rt_rq->rt_nr_migratory) which was dropped in favour of relying on rt_rq->pushable_tasks, see: 612f769edd06 ("sched/rt: Make rt_rq->pushable_tasks updates drive rto_mask") Signed-off-by: Valentin Schneider Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/all/20230811112044.3302588-1-vschneid@redhat.com/ Link: https://lore.kernel.org/r/20230928150251.463109-1-vschneid@redhat.com --- kernel/sched/deadline.c | 57 +++++++++------------------------------- kernel/sched/debug.c | 1 +- kernel/sched/sched.h | 1 +- 3 files changed, 14 insertions(+), 45 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index fb1996a..d98408a 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -509,7 +509,6 @@ void init_dl_rq(struct dl_rq *dl_rq) /* zero means no -deadline tasks */ dl_rq->earliest_dl.curr = dl_rq->earliest_dl.next = 0; - dl_rq->dl_nr_migratory = 0; dl_rq->overloaded = 0; dl_rq->pushable_dl_tasks_root = RB_ROOT_CACHED; #else @@ -553,39 +552,6 @@ static inline void dl_clear_overload(struct rq *rq) cpumask_clear_cpu(rq->cpu, rq->rd->dlo_mask); } -static void update_dl_migration(struct dl_rq *dl_rq) -{ - if (dl_rq->dl_nr_migratory && dl_rq->dl_nr_running > 1) { - if (!dl_rq->overloaded) { - dl_set_overload(rq_of_dl_rq(dl_rq)); - dl_rq->overloaded = 1; - } - } else if (dl_rq->overloaded) { - dl_clear_overload(rq_of_dl_rq(dl_rq)); - dl_rq->overloaded = 0; - } -} - -static void inc_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) -{ - struct task_struct *p = dl_task_of(dl_se); - - if (p->nr_cpus_allowed > 1) - dl_rq->dl_nr_migratory++; - - update_dl_migration(dl_rq); -} - -static void dec_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) -{ - struct task_struct *p = dl_task_of(dl_se); - - if (p->nr_cpus_allowed > 1) - dl_rq->dl_nr_migratory--; - - update_dl_migration(dl_rq); -} - #define __node_2_pdl(node) \ rb_entry((node), struct task_struct, pushable_dl_tasks) @@ -594,6 +560,11 @@ static inline bool __pushable_less(struct rb_node *a, const struct rb_node *b) return dl_entity_preempt(&__node_2_pdl(a)->dl, &__node_2_pdl(b)->dl); } +static inline int has_pushable_dl_tasks(struct rq *rq) +{ + return !RB_EMPTY_ROOT(&rq->dl.pushable_dl_tasks_root.rb_root); +} + /* * The list of pushable -deadline task is not a plist, like in * sched_rt.c, it is an rb-tree with tasks ordered by deadline. @@ -609,6 +580,11 @@ static void enqueue_pushable_dl_task(struct rq *rq, struct task_struct *p) __pushable_less); if (leftmost) rq->dl.earliest_dl.next = p->dl.deadline; + + if (!rq->dl.overloaded) { + dl_set_overload(rq); + rq->dl.overloaded = 1; + } } static void dequeue_pushable_dl_task(struct rq *rq, struct task_struct *p) @@ -625,11 +601,11 @@ static void dequeue_pushable_dl_task(struct rq *rq, struct task_struct *p) dl_rq->earliest_dl.next = __node_2_pdl(leftmost)->dl.deadline; RB_CLEAR_NODE(&p->pushable_dl_tasks); -} -static inline int has_pushable_dl_tasks(struct rq *rq) -{ - return !RB_EMPTY_ROOT(&rq->dl.pushable_dl_tasks_root.rb_root); + if (!has_pushable_dl_tasks(rq) && rq->dl.overloaded) { + dl_clear_overload(rq); + rq->dl.overloaded = 0; + } } static int push_dl_task(struct rq *rq); @@ -1504,7 +1480,6 @@ void inc_dl_tasks(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) add_nr_running(rq_of_dl_rq(dl_rq), 1); inc_dl_deadline(dl_rq, deadline); - inc_dl_migration(dl_se, dl_rq); } static inline @@ -1518,7 +1493,6 @@ void dec_dl_tasks(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) sub_nr_running(rq_of_dl_rq(dl_rq), 1); dec_dl_deadline(dl_rq, dl_se->deadline); - dec_dl_migration(dl_se, dl_rq); } static inline bool __dl_less(struct rb_node *a, const struct rb_node *b) @@ -2291,9 +2265,6 @@ static int push_dl_task(struct rq *rq) struct rq *later_rq; int ret = 0; - if (!rq->dl.overloaded) - return 0; - next_task = pick_next_pushable_dl_task(rq); if (!next_task) return 0; diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index c4253bd..4580a45 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -745,7 +745,6 @@ void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq) PU(dl_nr_running); #ifdef CONFIG_SMP - PU(dl_nr_migratory); dl_bw = &cpu_rq(cpu)->rd->dl_bw; #else dl_bw = &dl_rq->dl_bw; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 41d760d..649eb9e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -707,7 +707,6 @@ struct dl_rq { u64 next; } earliest_dl; - unsigned int dl_nr_migratory; int overloaded; /*