From patchwork Tue May 25 15:14:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12279237 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=ham 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 DAA65C2B9F8 for ; Tue, 25 May 2021 15:22:19 +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 9E15961159 for ; Tue, 25 May 2021 15:22:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E15961159 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=7KSFAx6xtjs2y7SS9y5uEFNoBM+eukocIUjaMkw/yr8=; b=fv7nWmQrTklCDu idmtvX6OVMeODjT1Js06aWZ+yntTnprxl/TV/IWdvVfsnT6IwXt4sdXLoujCAinTK5JhLX6PzG6FB zYe63JeIOcnGTvK5iKw7z7yvUycPdcx6e85YrUQF72QljWQkcQ2Bo5/6Lg5I5Et/YPPsy0fxl8ksP b3Ed9/pSycsTX0yBT323ej8B7iPtESLYa1e3nw+PQX7rFRRqFlyi+lsQ0V/cjhkwhZMLBfvqIk8bV 9CUjVZXyhQUPAB3tc6KnO35C3t4p8/FY5Ia7xNYNP5GKQXi6p26XimcAbkYJBnMx2nrOQA9JISKEP WyskmgTFEHvGHkhIzHhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llYrG-005wLJ-Bt; Tue, 25 May 2021 15:20:38 +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 1llYmf-005tkc-UZ for linux-arm-kernel@lists.infradead.org; Tue, 25 May 2021 15:15:55 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5C0B061429; Tue, 25 May 2021 15:15:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621955753; bh=qGkVsA0G9EvUFdmfSvnTeaGukNiKFBrINcN26bFiPSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFTaybQbHLvBuCd7/j1WYqxd2rrK144oMKPNln6WRnzTnHq+wuE/OmmjuHj44bPD5 3zWaSegMAwu1m/cjoKUM6OBh1+35h/9nYLjhfk1nullfSmPmx0MY3sIQPdIDj0kr40 Nxcw7Bsy9dwhJ+Bbxx1nKVpRy3x/cQupXFOIkMaEoria4GfLqmzwO/PcHNg3Ua0HeG edGZX1BPw9/ED/bYANqOBHaBn2SDSzJzjD/Qq8gyF3i0G7fBe39OAIRrkyK6uEkhmo Um1OHw7OEvhBeKfEW0/QvRHateZPaBjV+ncrqVgHezbfPr2Jdse6tMysSyWSoRCe01 2tfEY3TU+9OBA== 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 10/22] sched: Reject CPU affinity changes based on task_cpu_possible_mask() Date: Tue, 25 May 2021 16:14:20 +0100 Message-Id: <20210525151432.16875-11-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_081554_048547_468D6455 X-CRM114-Status: GOOD ( 12.83 ) 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 Reject explicit requests to change the affinity mask of a task via set_cpus_allowed_ptr() if the requested mask is not a subset of the mask returned by task_cpu_possible_mask(). This ensures that the 'cpus_mask' for a given task cannot contain CPUs which are incapable of executing it, except in cases where the affinity is forced. Reviewed-by: Quentin Perret Signed-off-by: Will Deacon --- kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 00ed51528c70..8ca7854747f1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2346,6 +2346,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, u32 flags) { const struct cpumask *cpu_valid_mask = cpu_active_mask; + const struct cpumask *cpu_allowed_mask = task_cpu_possible_mask(p); unsigned int dest_cpu; struct rq_flags rf; struct rq *rq; @@ -2366,6 +2367,9 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, * set_cpus_allowed_common() and actually reset p->cpus_ptr. */ cpu_valid_mask = cpu_online_mask; + } else if (!cpumask_subset(new_mask, cpu_allowed_mask)) { + ret = -EINVAL; + goto out; } /*