From patchwork Tue May 18 09:47:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12264435 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,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 1D831C433B4 for ; Tue, 18 May 2021 10:00:01 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 DACB16024A for ; Tue, 18 May 2021 10:00:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DACB16024A 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=desiato.20200630; 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=6l7eUTDlnE4K0ER5KNZETO+MxrVfBpiZV0Y3EVSwNWw=; b=M4UX9LDKNYoDoete8ZNiBE4la 8qo6VW+g2rgWdYON5Rh6rhu2SMHLQhSoIN0pAv21b3oBaDJ4HB5fgXDMyPfTkAtB8x1wSyU51keBM fw3lJ4uAzxDWbLLk0JEjyHz4s1bKF7Q/e3CGWHCbV4QLs32Iud0OBZNF2SjkiKJwlrtjDykEVbjRW +rFJW3Lf4Wy0jdASmNRP09aosQj06P2AIvapzLak+1/dPuM5kruLqBMFeYwVjs40lEmfZQ70jaXzd X3/zQEmEmGE1L0q9N1W6RDWTzuGDEn+DD+X0+tKNaNoio65Ulw/I8wIh4vuDwHpM0GkzYsPZvl6Dl OW+qa6Lrw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liwUH-000Fs2-1p; Tue, 18 May 2021 09:58:05 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwKi-000DuW-MM for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:48:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=S0EkUCKK02CAMFl032LIMUDv1WWyfhhYTZA5ouSwM3o=; b=JGlbhsri/L7lcGKyQQwGiMMEE6 HozWhYEI1Vu7Lr5mEr0Sk8vomZvQlw0CWUe+vumDG+2WjPtDFMtwdp2YJbK4MgIkIOLmx93NbwxYN hC9P1K29JWBX8sHa9o+FV7elV6kkhlJ2E8wEFShzGj1dLBuGyMAhMjKwvPSmM4XRoyOfTOVcT6wjq ND0G9EHtiGykcM0cjWw1TIvOkZhcBXo/Lue7+g9MinDzQnqxZY3t5fWgiWHTiU0HHKD0hxCPtOUSw fNg8iz2AUAn4XxlbVQJqXQMgTyOPiQ0VK2XWDr1G0YHeaOZULvGgd9SBtnDAirZ6VjGVlFxEFG8xu 9shlCJwg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwKg-00EWgu-6y for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:48:11 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id BD153613CB; Tue, 18 May 2021 09:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621331289; bh=nWVmEPeR0hM9A1fN5XIKmBdskSrJ1G92PsqLDEhYaSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bJZqDMYB1gHPG9YMTA0G3FEGVzf5TtzSg0BgVnZHPLaioxVDGWkxXh8gwz/OvrV6a d9QkWGIU208DCKa/xvr3mO7xf8vPcLQ2XYb3DyrfBR/iom3FBG3Bh4TFhJb7gMXYbQ nny2uINhbOB96DwiMBfoVcXVt+l1BQ9+RR2EQxK65Ltxuh4hAQU5XREskaMI56htpu 7oRAlRX4ZpVgEAUlSkoz7G/o6qi6RIp7p37jAJ9tBXOK7HbX2TYOPr3BPeo8Ck8A2P 7NQ/uHCz1LgDyo8aUGO95xjD2rMEqBqzCOTyLYbV3v25w5ag6+TYDrqIc3VPeuOO9y 1NELW1ysbLwmQ== 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 , Li Zefan , Johannes Weiner , Ingo Molnar , Juri Lelli , Vincent Guittot , "Rafael J. Wysocki" , kernel-team@android.com Subject: [PATCH v6 09/21] sched: Reject CPU affinity changes based on task_cpu_possible_mask() Date: Tue, 18 May 2021 10:47:13 +0100 Message-Id: <20210518094725.7701-10-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210518094725.7701-1-will@kernel.org> References: <20210518094725.7701-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_024810_290706_DC0A95A3 X-CRM114-Status: GOOD ( 12.68 ) 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 482f7fdca0e8..21da3d7f9e47 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2350,6 +2350,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; @@ -2370,6 +2371,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; } /*