From patchwork Tue Nov 24 15:50:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11929279 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.0 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 1D76EC63777 for ; Tue, 24 Nov 2020 15:53:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 9F0F9206FA for ; Tue, 24 Nov 2020 15:53:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xLEwYfzW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="jZAqDxPf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F0F9206FA 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cyZPI2XinzxDLljb8GOPMiKGC75tPDBxQNBn917qbLE=; b=xLEwYfzWrAZck+GY1p9rK20g3 hVHo66uSiBawaaCa39uY2+cwKFImppYJ6dJoQyeuBh8GucyEUQAMC8fQTd3KkWMrD4hHAe3E9PwIC bI8J6it0k7V6ov1Ds4wlibf+uwuE9QXUvd/sOU0d8MgjCgBh6eibRq53XFBKGLSd3KsyoAGCPeJMm miahobManerWluaM3xp1HzkuI7C1EWVhp3VFEPbsDjAwvRKoGc+kNE/buQnLGu065kvh8l0XpQco0 Sp1uvtuSAAgBKxHklXoq9DrFL4qzv1GmXqnTJa63QvMcn0dr0VcUgA5UlNXPD0DTwcnGXuln7YPhf 1+MOWlsrQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khacg-0005hu-6p; Tue, 24 Nov 2020 15:52:54 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khabP-00055D-Aa for linux-arm-kernel@lists.infradead.org; Tue, 24 Nov 2020 15:51:36 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 646D02086A; Tue, 24 Nov 2020 15:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606233094; bh=deEZsI4JMfZft5nsFKUFREErfrnI08kQMrUiB+oeZmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZAqDxPfY0CHfGP9qkIm9uA+pzT5bEH+/W5nd8/KT6OUaSR/R9lxlP6cDozzyYre9 Tgdoyau5VM1CQ6qiFuQQ5EId1gG4CPP1/nXJfROp/VPvMed5bpu13OyvzkBRsaSW9y Vs8F/2gRZiBZPvxKvvoOhQnp6uL4xKpywLit4EXc= From: Will Deacon To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 11/14] sched: Reject CPU affinity changes based on arch_task_cpu_possible_mask() Date: Tue, 24 Nov 2020 15:50:36 +0000 Message-Id: <20201124155039.13804-12-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124155039.13804-1-will@kernel.org> References: <20201124155039.13804-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201124_105135_435540_E0E07EB1 X-CRM114-Status: GOOD ( 16.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Marc Zyngier , kernel-team@android.com, Vincent Guittot , Juri Lelli , Quentin Perret , Peter Zijlstra , Catalin Marinas , Johannes Weiner , linux-kernel@vger.kernel.org, Qais Yousef , Suren Baghdasaryan , Ingo Molnar , Li Zefan , Greg Kroah-Hartman , Tejun Heo , Will Deacon , Morten Rasmussen 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 arch_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. Signed-off-by: Will Deacon Reviewed-by: Quentin Perret --- kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 99992d0beb65..095deda50643 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1877,6 +1877,7 @@ static int __set_cpus_allowed_ptr_locked(struct task_struct *p, struct rq_flags *rf) { const struct cpumask *cpu_valid_mask = cpu_active_mask; + const struct cpumask *cpu_allowed_mask = arch_task_cpu_possible_mask(p); unsigned int dest_cpu; int ret = 0; @@ -1887,6 +1888,9 @@ static int __set_cpus_allowed_ptr_locked(struct task_struct *p, * Kernel threads are allowed on online && !active CPUs */ cpu_valid_mask = cpu_online_mask; + } else if (!cpumask_subset(new_mask, cpu_allowed_mask)) { + ret = -EINVAL; + goto out; } /*