Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3027414rwb; Mon, 15 Aug 2022 16:25:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4zTxg3NTvB5TplYP1O1rkdIDkDq93Op6wKAONYBAOPSuPcuOrRqQYVMIE0R2vM5KAjqgEH X-Received: by 2002:a17:902:8ec8:b0:171:29d1:22cd with SMTP id x8-20020a1709028ec800b0017129d122cdmr19239705plo.167.1660605945744; Mon, 15 Aug 2022 16:25:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605945; cv=none; d=google.com; s=arc-20160816; b=bW08oz7FE0Xig5sDcb/rH1HMUhh513HpPhiaS7VfmMUuvfl6UEDW9HHswhUuWaJ4rN sM0b7wNu0KY3grDivjhC7EZBqDQV4VuU1BdNGnMeX7i8F4/6mjP3w3UFt6w9+QXFXXiu za76FovOJTRJ7yilWLlF+3LDBWa15Gu+/+n4sHJssrfKC9DdTHYA4Ru8MWGShixwuNyt WW6HOjsjxMu2ewWonq/h6M3bQSGdvB2aINosQQY4TOusnrwGGEvhRlORCjNg7OXxNOJO KhoYmqokCBzCRUCGwIz51OmCVGitMEwfQeMZ+6vVnFAeGoW5NCEoY+FsyvsI6IP+lHRe Kxyw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BEKohBNGmMGNim2+0zoV5M3n6BeP4CdlyUhSijVGYAk=; b=va6pGbuI3MahYNdORW9t6Tq2ZA9wvDt8NKpxQ+FIU/Tvd1TAewpci4+Xd2d8QED6SR 8gNuYlRH6UqlbjtGCaLDFsUPJITrGT5m92AMeL37Yb15+XXmOu2zh8c2JWxFF3KZzn/D YgvW3RD8TQHRGLyqe1tX8a3yLXjnZQctJkA00+0BllMVo1fPC6ObwmRIlLTk/ql2zC/F lmgDor9PfLi+ajAqqQKzHxuh8/xO8neN7nO5r9ii/aiyXwxFXbb9TfWfhFzreM68e4Gp r9rRsTjWk/FWua5XP+M1Tqzg+6H7JHiG7/YZ9FajyK+urKC2acI+FrYducNDQVLCcXTq MuAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FXVQiexn; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w22-20020a656956000000b004299cef0a3esi1122596pgq.375.2022.08.15.16.25.34; Mon, 15 Aug 2022 16:25:45 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FXVQiexn; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352728AbiHOXBB (ORCPT + 99 others); Mon, 15 Aug 2022 19:01:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346529AbiHOW7F (ORCPT ); Mon, 15 Aug 2022 18:59:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 412AF760ED; Mon, 15 Aug 2022 12:57:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3EB296113B; Mon, 15 Aug 2022 19:57:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 315C5C433D7; Mon, 15 Aug 2022 19:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593437; bh=wKih+8OluzBjXG4I/4G1XVSZt2R5DYaSGbSm9Hjd1ZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXVQiexnRg2dOsM0sijWwLZiHS8ZnuB5ZuVLUtoXXwn1Lmp0iTocclAQ+ggvVVWTC 34vqkCQ8/XmPcPZoYhvqpBl6hakVfHoqoZaeCcTay7gYxhchOFu3PP1RK79Zw1tsYo QaKBYni/XiKsj+WV7ko4JvfMttQO71SHOcPyCNWU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Waiman Long , Ingo Molnar , Juri Lelli , Sasha Levin Subject: [PATCH 5.18 0946/1095] sched, cpuset: Fix dl_cpu_busy() panic due to empty cs->cpus_allowed Date: Mon, 15 Aug 2022 20:05:45 +0200 Message-Id: <20220815180508.281939119@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Waiman Long [ Upstream commit b6e8d40d43ae4dec00c8fea2593eeea3114b8f44 ] With cgroup v2, the cpuset's cpus_allowed mask can be empty indicating that the cpuset will just use the effective CPUs of its parent. So cpuset_can_attach() can call task_can_attach() with an empty mask. This can lead to cpumask_any_and() returns nr_cpu_ids causing the call to dl_bw_of() to crash due to percpu value access of an out of bound CPU value. For example: [80468.182258] BUG: unable to handle page fault for address: ffffffff8b6648b0 : [80468.191019] RIP: 0010:dl_cpu_busy+0x30/0x2b0 : [80468.207946] Call Trace: [80468.208947] cpuset_can_attach+0xa0/0x140 [80468.209953] cgroup_migrate_execute+0x8c/0x490 [80468.210931] cgroup_update_dfl_csses+0x254/0x270 [80468.211898] cgroup_subtree_control_write+0x322/0x400 [80468.212854] kernfs_fop_write_iter+0x11c/0x1b0 [80468.213777] new_sync_write+0x11f/0x1b0 [80468.214689] vfs_write+0x1eb/0x280 [80468.215592] ksys_write+0x5f/0xe0 [80468.216463] do_syscall_64+0x5c/0x80 [80468.224287] entry_SYSCALL_64_after_hwframe+0x44/0xae Fix that by using effective_cpus instead. For cgroup v1, effective_cpus is the same as cpus_allowed. For v2, effective_cpus is the real cpumask to be used by tasks within the cpuset anyway. Also update task_can_attach()'s 2nd argument name to cs_effective_cpus to reflect the change. In addition, a check is added to task_can_attach() to guard against the possibility that cpumask_any_and() may return a value >= nr_cpu_ids. Fixes: 7f51412a415d ("sched/deadline: Fix bandwidth check/update when migrating tasks between exclusive cpusets") Signed-off-by: Waiman Long Signed-off-by: Ingo Molnar Acked-by: Juri Lelli Link: https://lore.kernel.org/r/20220803015451.2219567-1-longman@redhat.com Signed-off-by: Sasha Levin --- include/linux/sched.h | 2 +- kernel/cgroup/cpuset.c | 2 +- kernel/sched/core.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index a8911b1f35aa..d438e39fffe5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1812,7 +1812,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_cpus_allowed); +extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_effective_cpus); #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/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 71a418858a5e..58aadfda9b8b 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2239,7 +2239,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->cpus_allowed); + ret = task_can_attach(task, cs->effective_cpus); if (ret) goto out_unlock; ret = security_task_setscheduler(task); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 72b2f277b0dd..b0f3ded147cb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8899,7 +8899,7 @@ int cpuset_cpumask_can_shrink(const struct cpumask *cur, } int task_can_attach(struct task_struct *p, - const struct cpumask *cs_cpus_allowed) + const struct cpumask *cs_effective_cpus) { int ret = 0; @@ -8918,9 +8918,11 @@ int task_can_attach(struct task_struct *p, } if (dl_task(p) && !cpumask_intersects(task_rq(p)->rd->span, - cs_cpus_allowed)) { - int cpu = cpumask_any_and(cpu_active_mask, cs_cpus_allowed); + cs_effective_cpus)) { + int cpu = cpumask_any_and(cpu_active_mask, cs_effective_cpus); + if (unlikely(cpu >= nr_cpu_ids)) + return -EINVAL; ret = dl_cpu_busy(cpu, p); } -- 2.35.1