From patchwork Wed Mar 22 13:59:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 73441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2359971wrt; Wed, 22 Mar 2023 07:06:13 -0700 (PDT) X-Google-Smtp-Source: AKy350aMzuOFXCuCRFfZHdPd5AIqM8ilg/0e1/aC8ejoCHNjHAIOLWI0f7YoxjMF1De17FVHrACv X-Received: by 2002:a17:902:e881:b0:19a:96d2:2407 with SMTP id w1-20020a170902e88100b0019a96d22407mr2387735plg.8.1679493973550; Wed, 22 Mar 2023 07:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679493973; cv=none; d=google.com; s=arc-20160816; b=JgwY+k+iJH64AFfdmibLAN6aykeRf2O/VfyxJDjU4n2HwOFgH+1Ekhh4wOqSvDZzuh QcedRFFydniSHPeUFwzJP1vU80nF1EF3z7bYeMOWqp/7ATXpCSBvcShMWCQ+pptYV5c9 xPjSdZCl38GOXYBIw1e+jyvlSs7v1h2hmV6r8icyD8UhSFctTYRmJOYeux26jrHnHUyE 05J2NbcCV513/S/Ds/Iwco4XQpCtETv8SBF6dka1el79w9pXDnw0V1pums9LmiCXdeHN T5A5rp51kzCjJAaXZEd0sznKdZctarmNXOsE4+J/08IycvUuAku79z15eNxN8063gik8 jWPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HVJv51WUa3GvCBRIlkAsOSNXBcKIhRH9GAA7Nzz36Cs=; b=z5qI+KcB5X7ilNJvK3QpAZmL6Th3nhFSyqUVQFcavEF75iniyX7WG3S3WULF+OxKtx olNINKD5Qj/x7dLA68Nx7Hj3+8TZKkV51RUbXTEyqMD96TDmFKrT+Y2uEPdPPfcPqa6R h0cQBR+XLlsUoGWS7++A29qjjye1Na/wXilJaKwz058+FzqusjK/S+ZpodrnpXWIaLGp ed0Q9+2WAKia6tYRh9G/g17cctP8WTi/QdSkB34ehyc15nhWhATWauqAhm1gL37uMk0P w1UEKgw8I/20JQzkW4WcPBza+frJLpGbzSHmk0LjzyboluivywGqf5PnHOKYtA/f4fh/ 9qxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k23-20020a170902ba9700b0019f27fe9d45si15036198pls.463.2023.03.22.07.06.00; Wed, 22 Mar 2023 07:06:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbjCVOAQ (ORCPT + 99 others); Wed, 22 Mar 2023 10:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230272AbjCVOAN (ORCPT ); Wed, 22 Mar 2023 10:00:13 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E82934691; Wed, 22 Mar 2023 07:00:11 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AC51FAD7; Wed, 22 Mar 2023 07:00:55 -0700 (PDT) Received: from e125579.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 24D323F71E; Wed, 22 Mar 2023 07:00:09 -0700 (PDT) From: Dietmar Eggemann To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Waiman Long , Tejun Heo , Zefan Li , Johannes Weiner , Hao Luo Cc: Steven Rostedt , Vincent Guittot , Daniel Bristot de Oliveira , Luca Abeni , Tommaso Cucinotta , Qais Yousef , Wei Wang , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [RFC PATCH 1/2] sched/deadline: Create DL BW alloc, free & check overflow interface Date: Wed, 22 Mar 2023 14:59:58 +0100 Message-Id: <20230322135959.1998790-2-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322135959.1998790-1-dietmar.eggemann@arm.com> References: <20230322135959.1998790-1-dietmar.eggemann@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761077073263677295?= X-GMAIL-MSGID: =?utf-8?q?1761077073263677295?= Rework the existing dl_cpu_busy() interface which offered DL BW overflow checking and per-task DL BW allocation. Add dl_bw_free() as an interface to be able to free DL BW. It will be used to allow freeing of the DL BW request done during cpuset_can_attach() in case multiple controllers are attached to the cgroup next to cpuset and one of the non-cpuset can_attach() fails. Signed-off-by: Dietmar Eggemann --- include/linux/sched.h | 2 ++ kernel/sched/core.c | 4 ++-- kernel/sched/deadline.c | 53 +++++++++++++++++++++++++++++++---------- kernel/sched/sched.h | 2 +- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 4df2b3e76b30..658e997ba057 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1847,6 +1847,8 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) extern int cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial); extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_effective_cpus); +extern int dl_bw_alloc(int cpu, u64 dl_bw); +extern void dl_bw_free(int cpu, u64 dl_bw); #ifdef CONFIG_SMP extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask); extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d586a8440348..2f07aecb7434 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9226,7 +9226,7 @@ int task_can_attach(struct task_struct *p, if (unlikely(cpu >= nr_cpu_ids)) return -EINVAL; - ret = dl_cpu_busy(cpu, p); + ret = dl_bw_alloc(cpu, p->dl.dl_bw); } out: @@ -9511,7 +9511,7 @@ static void cpuset_cpu_active(void) static int cpuset_cpu_inactive(unsigned int cpu) { if (!cpuhp_tasks_frozen) { - int ret = dl_cpu_busy(cpu, NULL); + int ret = dl_bw_check_overflow(cpu); if (ret) return ret; diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 71b24371a6f7..41ed6c6d2628 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -3033,26 +3033,38 @@ int dl_cpuset_cpumask_can_shrink(const struct cpumask *cur, return ret; } -int dl_cpu_busy(int cpu, struct task_struct *p) +enum dl_bw_request { + dl_bw_req_check_overflow = 0, + dl_bw_req_alloc, + dl_bw_req_free +}; + +static int dl_bw_manage(enum dl_bw_request req, int cpu, u64 dl_bw) { - unsigned long flags, cap; + unsigned long flags; struct dl_bw *dl_b; - bool overflow; + bool overflow = 0; rcu_read_lock_sched(); dl_b = dl_bw_of(cpu); raw_spin_lock_irqsave(&dl_b->lock, flags); - cap = dl_bw_capacity(cpu); - overflow = __dl_overflow(dl_b, cap, 0, p ? p->dl.dl_bw : 0); - if (!overflow && p) { - /* - * We reserve space for this task in the destination - * root_domain, as we can't fail after this point. - * We will free resources in the source root_domain - * later on (see set_cpus_allowed_dl()). - */ - __dl_add(dl_b, p->dl.dl_bw, dl_bw_cpus(cpu)); + if (req == dl_bw_req_free) { + __dl_sub(dl_b, dl_bw, dl_bw_cpus(cpu)); + } else { + unsigned long cap = dl_bw_capacity(cpu); + + overflow = __dl_overflow(dl_b, cap, 0, dl_bw); + + if (req == dl_bw_req_alloc && !overflow) { + /* + * We reserve space in the destination + * root_domain, as we can't fail after this point. + * We will free resources in the source root_domain + * later on (see set_cpus_allowed_dl()). + */ + __dl_add(dl_b, dl_bw, dl_bw_cpus(cpu)); + } } raw_spin_unlock_irqrestore(&dl_b->lock, flags); @@ -3060,6 +3072,21 @@ int dl_cpu_busy(int cpu, struct task_struct *p) return overflow ? -EBUSY : 0; } + +int dl_bw_check_overflow(int cpu) +{ + return dl_bw_manage(dl_bw_req_check_overflow, cpu, 0); +} + +int dl_bw_alloc(int cpu, u64 dl_bw) +{ + return dl_bw_manage(dl_bw_req_alloc, cpu, dl_bw); +} + +void dl_bw_free(int cpu, u64 dl_bw) +{ + dl_bw_manage(dl_bw_req_free, cpu, dl_bw); +} #endif #ifdef CONFIG_SCHED_DEBUG diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3e8df6d31c1e..6cb4cf878fe2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -330,7 +330,7 @@ extern void __getparam_dl(struct task_struct *p, struct sched_attr *attr); extern bool __checkparam_dl(const struct sched_attr *attr); extern bool dl_param_changed(struct task_struct *p, const struct sched_attr *attr); extern int dl_cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial); -extern int dl_cpu_busy(int cpu, struct task_struct *p); +extern int dl_bw_check_overflow(int cpu); #ifdef CONFIG_CGROUP_SCHED From patchwork Wed Mar 22 13:59:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 73442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2360082wrt; Wed, 22 Mar 2023 07:06:25 -0700 (PDT) X-Google-Smtp-Source: AKy350aYCbl+b1RKnINSU1L9Qfj7083OXTEjhx1jI7WGdQsX+0kA/ekB0K/q4IC3+7uLEf01vrws X-Received: by 2002:a17:90a:510d:b0:237:a500:eca6 with SMTP id t13-20020a17090a510d00b00237a500eca6mr2144646pjh.22.1679493984986; Wed, 22 Mar 2023 07:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679493984; cv=none; d=google.com; s=arc-20160816; b=j4u3OuejzuVvd4nk9egeRKoAD0yY68WR9twUTideIfcAAwoacIukK7fy0Ruyfs8nJ5 LuxgLFmpTnv8xScrR7l2ppnGjqF8Cv1lDsx+0sgMchtoRh0udhFP7prw2vBGC8JjsbeA nkTI7rELHQsiHwQZc6+vGfP17Kyk6I+xt09us2qA0ReLeqntxELbeD0W4Dof75Xz2iJj 20PYPdn33tAXlIR/YIKGDBoRkZYtiafVXxVLyh1PBzkFQ/wkOUVKAjp/kUSush8lnW93 KP9E55nVEZtPTCKWQIa9Od80UrS/U+ZHjauTFNgdMXBwCInwELbmrnZIWcx7mLSSO3xm 8AVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=5czF+Y6MjeO1w1OHUS1cxTN7Gvj4fIP5XmOUWo5K8dQ=; b=SCm+OUFcxi7vzb9+isK6jUqy6qgYXG+syPlxZf34VICckA9MTaHb1n3SNJg/7ssGgn 6b2yzi9Th3vPinujTRoi/Y/fzSDQ5SlLjV0N7YkG/neBB1H412AFknvflpHXQbxd1aKq CvFUlqtwF4B9hBTxQ7kpYc34rStVkO6z9WYGzpyImeLNDCcB2lqXy09lTUkUCX1C2wEP fKt9gdhZLk3nK2MWMe6e4iGtEsNbTfNBI2TKx8kVO2vn7yhJA4gGobzrFm2jHauXiusb qGaUbn1Z3lJyXb5LuasRYFgZIk9htolkEFzoycpiTiXQOcX67zXQHg6gOfwncij2rRD5 zqdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v6-20020a17090abb8600b00233b583bf5fsi21522827pjr.74.2023.03.22.07.06.11; Wed, 22 Mar 2023 07:06:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230272AbjCVOAT (ORCPT + 99 others); Wed, 22 Mar 2023 10:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231137AbjCVOAQ (ORCPT ); Wed, 22 Mar 2023 10:00:16 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BAF885FE6; Wed, 22 Mar 2023 07:00:14 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8590315A1; Wed, 22 Mar 2023 07:00:58 -0700 (PDT) Received: from e125579.fritz.box (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EF77B3F71E; Wed, 22 Mar 2023 07:00:11 -0700 (PDT) From: Dietmar Eggemann To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Waiman Long , Tejun Heo , Zefan Li , Johannes Weiner , Hao Luo Cc: Steven Rostedt , Vincent Guittot , Daniel Bristot de Oliveira , Luca Abeni , Tommaso Cucinotta , Qais Yousef , Wei Wang , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [RFC PATCH 2/2] cgroup/cpuset: Free DL BW in case can_attach() fails Date: Wed, 22 Mar 2023 14:59:59 +0100 Message-Id: <20230322135959.1998790-3-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322135959.1998790-1-dietmar.eggemann@arm.com> References: <20230322135959.1998790-1-dietmar.eggemann@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761077085036021789?= X-GMAIL-MSGID: =?utf-8?q?1761077085036021789?= cpuset_can_attach() can fail. Postpone DL BW allocation until all task have been checked. DL BW is not allocated per-task but as a sum over all DL tasks migrating. If multiple controllers are attached to the cgroup next to cuset a non-cpuset can_attach() can fail. In this case free DL BW in cpuset_cancel_attach(). Finally, update cpuset DL task count (nr_deadline_tasks) only in cpuset_attach(). Suggested-by: Waiman Long Signed-off-by: Dietmar Eggemann --- include/linux/sched.h | 2 +- kernel/cgroup/cpuset.c | 55 ++++++++++++++++++++++++++++++++++++++---- kernel/sched/core.c | 17 ++----------- 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 658e997ba057..675ec74469d7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1846,7 +1846,7 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) } extern int cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial); -extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_effective_cpus); +extern int task_can_attach(struct task_struct *p); extern int dl_bw_alloc(int cpu, u64 dl_bw); extern void dl_bw_free(int cpu, u64 dl_bw); #ifdef CONFIG_SMP diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index f46192d2e97e..fdc476eefbed 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -198,6 +198,8 @@ struct cpuset { * know when to rebuild associated root domain bandwidth information. */ int nr_deadline_tasks; + int nr_migrate_dl_tasks; + u64 sum_migrate_dl_bw; /* Invalid partition error code, not lock protected */ enum prs_errcode prs_err; @@ -2462,16 +2464,23 @@ static int fmeter_getrate(struct fmeter *fmp) static struct cpuset *cpuset_attach_old_cs; +static void reset_migrate_dl_data(struct cpuset *cs) +{ + cs->nr_migrate_dl_tasks = 0; + cs->sum_migrate_dl_bw = 0; +} + /* Called by cgroups to determine if a cpuset is usable; cpuset_mutex held */ static int cpuset_can_attach(struct cgroup_taskset *tset) { struct cgroup_subsys_state *css; - struct cpuset *cs; + struct cpuset *cs, *oldcs; struct task_struct *task; int ret; /* used later by cpuset_attach() */ cpuset_attach_old_cs = task_cs(cgroup_taskset_first(tset, &css)); + oldcs = cpuset_attach_old_cs; cs = css_cs(css); mutex_lock(&cpuset_mutex); @@ -2489,7 +2498,7 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) goto out_unlock; cgroup_taskset_for_each(task, css, tset) { - ret = task_can_attach(task, cs->effective_cpus); + ret = task_can_attach(task); if (ret) goto out_unlock; ret = security_task_setscheduler(task); @@ -2497,11 +2506,31 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) goto out_unlock; if (dl_task(task)) { - cs->nr_deadline_tasks++; - cpuset_attach_old_cs->nr_deadline_tasks--; + cs->nr_migrate_dl_tasks++; + cs->sum_migrate_dl_bw += task->dl.dl_bw; + } + } + + if (!cs->nr_migrate_dl_tasks) + goto out_succes; + + if (!cpumask_intersects(oldcs->effective_cpus, cs->effective_cpus)) { + int cpu = cpumask_any_and(cpu_active_mask, cs->effective_cpus); + + if (unlikely(cpu >= nr_cpu_ids)) { + reset_migrate_dl_data(cs); + ret = -EINVAL; + goto out_unlock; + } + + ret = dl_bw_alloc(cpu, cs->sum_migrate_dl_bw); + if (ret) { + reset_migrate_dl_data(cs); + goto out_unlock; } } +out_succes: /* * Mark attach is in progress. This makes validate_change() fail * changes which zero cpus/mems_allowed. @@ -2516,11 +2545,21 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) static void cpuset_cancel_attach(struct cgroup_taskset *tset) { struct cgroup_subsys_state *css; + struct cpuset *cs; cgroup_taskset_first(tset, &css); + cs = css_cs(css); mutex_lock(&cpuset_mutex); - css_cs(css)->attach_in_progress--; + cs->attach_in_progress--; + + if (cs->nr_migrate_dl_tasks) { + int cpu = cpumask_any(cs->effective_cpus); + + dl_bw_free(cpu, cs->sum_migrate_dl_bw); + reset_migrate_dl_data(cs); + } + mutex_unlock(&cpuset_mutex); } @@ -2615,6 +2654,12 @@ static void cpuset_attach(struct cgroup_taskset *tset) out: cs->old_mems_allowed = cpuset_attach_nodemask_to; + if (cs->nr_migrate_dl_tasks) { + cs->nr_deadline_tasks += cs->nr_migrate_dl_tasks; + oldcs->nr_deadline_tasks -= cs->nr_migrate_dl_tasks; + reset_migrate_dl_data(cs); + } + cs->attach_in_progress--; if (!cs->attach_in_progress) wake_up(&cpuset_attach_wq); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2f07aecb7434..4fb058b72886 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9201,8 +9201,7 @@ int cpuset_cpumask_can_shrink(const struct cpumask *cur, return ret; } -int task_can_attach(struct task_struct *p, - const struct cpumask *cs_effective_cpus) +int task_can_attach(struct task_struct *p) { int ret = 0; @@ -9215,21 +9214,9 @@ int task_can_attach(struct task_struct *p, * success of set_cpus_allowed_ptr() on all attached tasks * before cpus_mask may be changed. */ - if (p->flags & PF_NO_SETAFFINITY) { + if (p->flags & PF_NO_SETAFFINITY) ret = -EINVAL; - goto out; - } - - if (dl_task(p) && !cpumask_intersects(task_rq(p)->rd->span, - cs_effective_cpus)) { - int cpu = cpumask_any_and(cpu_active_mask, cs_effective_cpus); - if (unlikely(cpu >= nr_cpu_ids)) - return -EINVAL; - ret = dl_bw_alloc(cpu, p->dl.dl_bw); - } - -out: return ret; }