From patchwork Tue May 25 15:14:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12279283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4522BC2B9F8 for ; Tue, 25 May 2021 15:28:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BC2661260 for ; Tue, 25 May 2021 15:28:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BC2661260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2o+KRi2mqM3Aw3Z1ysDDB46RpdCSj1xvg4kXStb5w6U=; b=mCwfl2Tlpc+WEZ Nq/pVNnVzAAofZg1FrIsEE3oPjqoUy4ZNTPeQYSLFRTUY7qob02uTgWpwGXZZ+0fcDG1gk8DAQYfP wlajxiONYkykymTHzFMmHxNm/tb4qFnGmGHTU1xcKG5PQ8u9B+q42mA3c9Bniqcs57hJd47TVE6Xv F2HoOnrscT0+1C+MZZP4JD9TdOP2aD0iD3s5GDdCQ7mXVX74oVFdADqdxxFd4Ksfye5kpbsGRoooq 5o6ucnvRa9fykFILHB9f0uQboVyApVobf7HZRZjWn06BoeYnDiQDgqc0o3DIkjLgIztwoXGdEYlOi G6uL+MwPdO+Fll5RnJnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llYwB-005yek-7W; Tue, 25 May 2021 15:25:45 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llYmu-005tsY-N8 for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 15:16:10 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2519C6143A; Tue, 25 May 2021 15:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621955768; bh=YbjV1Pm1usgwdcOO9+IaxC2SS5ZVjGCuAEGiFNBbt6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oS9TScc6s92VkbZ5RKwyB1tFAVi1DmDHC5wFUe/lfaSXE96vGZHRnPjwzcEv+F+WR 0zdcJZJdfvRPuh+TcrTjwkfrhxfboAnnind4HqE59g8R7dww1B2YJ4fxTxY4V8u0qR zTTUUzF17oYJbFBTelpIPWa95Ngi+G1T/EheMo+k6e52kCrzwyOx9xstA12zKeQxTk g1GTMJ/qlUg7+wM2mPGPKghy28cddMpAfcYSVFY6+gMoyOTNnOFNNpUfOHITtcGMWE BvoctnRh7yDUlyq0hWNBf9Sle3BtGTGh3REnOZQoS4KKqdQ7CTO6cymMXGdv20/knh PrTfBsD8Xcl7A== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Catalin Marinas , Marc Zyngier , Greg Kroah-Hartman , Peter Zijlstra , Morten Rasmussen , Qais Yousef , Suren Baghdasaryan , Quentin Perret , Tejun Heo , Johannes Weiner , Ingo Molnar , Juri Lelli , Vincent Guittot , "Rafael J. Wysocki" , Dietmar Eggemann , Daniel Bristot de Oliveira , kernel-team@android.com Subject: [PATCH v7 14/22] sched: Introduce task_cpus_dl_admissible() to check proposed affinity Date: Tue, 25 May 2021 16:14:24 +0100 Message-Id: <20210525151432.16875-15-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525151432.16875-1-will@kernel.org> References: <20210525151432.16875-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210525_081608_847624_B760D7F7 X-CRM114-Status: GOOD ( 15.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for restricting the affinity of a task during execve() on arm64, introduce a new task_cpus_dl_admissible() helper function to give an indication as to whether the restricted mask is admissible for a deadline task. Signed-off-by: Will Deacon --- include/linux/sched.h | 6 ++++++ kernel/sched/core.c | 44 +++++++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 91a6cfeae242..9b17d8cfa6ef 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1691,6 +1691,7 @@ extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask); extern int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, int node); extern void release_user_cpus_ptr(struct task_struct *p); +extern bool task_cpus_dl_admissible(struct task_struct *p, const struct cpumask *mask); extern void force_compatible_cpus_allowed_ptr(struct task_struct *p); extern void relax_compatible_cpus_allowed_ptr(struct task_struct *p); #else @@ -1713,6 +1714,11 @@ static inline void release_user_cpus_ptr(struct task_struct *p) { WARN_ON(p->user_cpus_ptr); } + +static inline bool task_cpus_dl_admissible(struct task_struct *p, const struct cpumask *mask) +{ + return true; +} #endif extern int yield_to(struct task_struct *p, bool preempt); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 998ed1dbfd4f..42e2aecf087c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6925,6 +6925,31 @@ SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr, return retval; } +#ifdef CONFIG_SMP +bool task_cpus_dl_admissible(struct task_struct *p, const struct cpumask *mask) +{ + bool ret; + + /* + * If the task isn't a deadline task or admission control is + * disabled then we don't care about affinity changes. + */ + if (!task_has_dl_policy(p) || !dl_bandwidth_enabled()) + return true; + + /* + * Since bandwidth control happens on root_domain basis, + * if admission test is enabled, we only admit -deadline + * tasks allowed to run on all the CPUs in the task's + * root_domain. + */ + rcu_read_lock(); + ret = cpumask_subset(task_rq(p)->rd->span, mask); + rcu_read_unlock(); + return ret; +} +#endif + static int __sched_setaffinity(struct task_struct *p, const struct cpumask *mask) { @@ -6942,23 +6967,10 @@ __sched_setaffinity(struct task_struct *p, const struct cpumask *mask) cpuset_cpus_allowed(p, cpus_allowed); cpumask_and(new_mask, mask, cpus_allowed); - /* - * Since bandwidth control happens on root_domain basis, - * if admission test is enabled, we only admit -deadline - * tasks allowed to run on all the CPUs in the task's - * root_domain. - */ -#ifdef CONFIG_SMP - if (task_has_dl_policy(p) && dl_bandwidth_enabled()) { - rcu_read_lock(); - if (!cpumask_subset(task_rq(p)->rd->span, new_mask)) { - retval = -EBUSY; - rcu_read_unlock(); - goto out_free_new_mask; - } - rcu_read_unlock(); + if (!task_cpus_dl_admissible(p, new_mask)) { + retval = -EBUSY; + goto out_free_new_mask; } -#endif again: retval = __set_cpus_allowed_ptr(p, new_mask, SCA_CHECK | SCA_USER); if (retval)