From patchwork Thu Sep 28 20:39:57 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: 146386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3710307vqu; Thu, 28 Sep 2023 18:19:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCPC7BSIWVmQ06eWwfXDkpdlsweJLJmG01IlP1q3OzSEj3jf9zKVdPLQmlJRSlXrx5w81K X-Received: by 2002:a17:90a:f2c5:b0:274:77b7:660 with SMTP id gt5-20020a17090af2c500b0027477b70660mr4099612pjb.24.1695950355545; Thu, 28 Sep 2023 18:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695950355; cv=none; d=google.com; s=arc-20160816; b=JK4C9HIlrVc5KO0Eh0GKDgCiIFjewyo7D9467VN+DnKRdbRCqtGFQNLYkA7GlXA4o/ ygyxd+YT01lzeQxRO7ym9Sk7MoPZOiERo2IEXM6KM2TMMagJDiDNVTAdFI3IIbWX8KvS xEPYYQ+GcYN2EzNZc9wlvrZYqUdnhXkHXlb+WqnzK16JU6ToiaA/8N3kJ/Wc3WnMJJnR pm0bOf7dgD/sj0AEkp7PTc57wycU8vza0B/YTGnrOynM+Rs75eBFaXcmnmOqatwZFgUY osVsp8b1pPqh1tFwU782IdAxed8GVehkkYP1lIEtzwLK50Mpe9VD/fNK3C4lQ3/rJN1a aPUw== 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=zpP+TFrM1CU+gfkkDz6IpK7X1R+jG14Dp8CBEYKpte0=; fh=tQXUNeiPiNp31285akpCqZQM40uKJ22dDu6VU6UTd5Q=; b=F/wsFF/G+NdDVhLiy0XopN92VccON5780NiToAKKesNtpVcnFINeiGEfou/7n6/GFk 4vV6WIRp86zJCoHE1BVi0Jnqeys9XZohNL5LPDXLSJvGzWBeHmUg/Sse5IQaXEUgwQ/s FSVpWhWSzexE4LvjSy/WlxIucyiHyLy5rTLqpbGYR8e/odv/JGLl79HgNpGosCSHVFao 0IK7Lr1BUUdLOWlPwSXfhCuNYgJoaq+wZ++IOUNYfOu0GucD1fqEAmQqTM+IcYRL6TbS qxmPO+yh5B6IUBZI27nvRrYTWSN3x/rN+e2W8MwfL/0XlaywXi2esVdmR2newpBT9W8T x0aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FFTtob22; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id mq16-20020a17090b381000b0027408bd8420si508655pjb.13.2023.09.28.18.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 18:19:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FFTtob22; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id C8CF28373197; Thu, 28 Sep 2023 13:40:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232190AbjI1UkD (ORCPT + 22 others); Thu, 28 Sep 2023 16:40:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjI1UkB (ORCPT ); Thu, 28 Sep 2023 16:40:01 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 669C019C; Thu, 28 Sep 2023 13:39:59 -0700 (PDT) Date: Thu, 28 Sep 2023 20:39:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695933598; 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=zpP+TFrM1CU+gfkkDz6IpK7X1R+jG14Dp8CBEYKpte0=; b=FFTtob22nDlPTTMAk+s0Qx4U8qMCeYCOMS8xfVcu3ylwhHXfK1pqzPMg4kIACqRh8z7l6T QONEELyB5iqNxXE0bnbnUxpIHUYR9dRKy2qCSxndRox5RjJWDF7W579o2JpQhfoPzg2S0U 8tCjZdMHnrvOOO++5f1cyp2uc22r3283vfN8qVzQoxFfINCm070RivfhZieAkVnWpw7X4x w1dVTOnWn2VnKXdutBDf7GKimBafU6Q6DrnAoM0x+0unKanf/9FxxPxStWuXdw8/TOpmgs w52PUNSn5uQRPthpu1yYzo6AxvCIyYddQxy2nsG/jHFZkOCyswiWNzC3LEEFKg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695933598; 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=zpP+TFrM1CU+gfkkDz6IpK7X1R+jG14Dp8CBEYKpte0=; b=IPs/Ojts/qj8CuSy6Bw6mcnh4sTG6rcIAa6k8iIZVeMh/UlTzTXZNRUxpJXs+qB42y+61O HoPNMtPUN8ZMmDBw== 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 updates 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: <169593359726.27769.10472042172625753114.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Thu, 28 Sep 2023 13:40:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778305165256205992 X-GMAIL-MSGID: 1778332840425003494 The following commit has been merged into the sched/core branch of tip: Commit-ID: ad5d1902b7b04ac5f06b2fb1862b36b3d69de270 Gitweb: https://git.kernel.org/tip/ad5d1902b7b04ac5f06b2fb1862b36b3d69de270 Author: Valentin Schneider AuthorDate: Thu, 28 Sep 2023 17:02:51 +02:00 Committer: Ingo Molnar CommitterDate: Thu, 28 Sep 2023 22:03:44 +02:00 sched/deadline: Make dl_rq->pushable_dl_tasks updates 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; /*