From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1F513C433E0 for ; Thu, 2 Jul 2020 01:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E225120899 for ; Thu, 2 Jul 2020 01:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593653207; bh=PT7N+aXSQVZUHIxrTFtorbKOFXsjtn1Zk/F84yefJVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HuK1u/QsuB8PR5201aheSdif0qspDwaaeTQy4gvcYT4VQCJ1fNJugamgpSx5YX9q8 in+tKziQAdgv/RwfPXjXO0E/ENnUpjX+9/Qa35/TpY50TU5gulgOHapdL1RLXokRvH 87Swda1VduXa1SphAgk639eMNw9iyJZze5O9n5UQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729268AbgGBB0p (ORCPT ); Wed, 1 Jul 2020 21:26:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:57474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729118AbgGBB0O (ORCPT ); Wed, 1 Jul 2020 21:26:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 6BD3D20C56; Thu, 2 Jul 2020 01:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593653174; bh=PT7N+aXSQVZUHIxrTFtorbKOFXsjtn1Zk/F84yefJVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EQHRVIBhzN6zj+G82sw3wVCEpfM/lc2/toUhRu8j5UKPH+FNuzeRCIxI7/4TVP61Z aul8UTytwTN/2w5rz/eVR09Odf6m3u43nMu5WvjS9EaqciSeZHwj62F5KZ+e6Z13HH j8RHO7+4VGb+p988NaUIiAEEuiNrTj+AIJaJCI04= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Scott Wood , Sebastian Andrzej Siewior , Peter Zijlstra , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 5.4 40/40] sched/core: Check cpus_mask, not cpus_ptr in __set_cpus_allowed_ptr(), to fix mask corruption Date: Wed, 1 Jul 2020 21:24:01 -0400 Message-Id: <20200702012402.2701121-40-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200702012402.2701121-1-sashal@kernel.org> References: <20200702012402.2701121-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Scott Wood [ Upstream commit fd844ba9ae59b51e34e77105d79f8eca780b3bd6 ] This function is concerned with the long-term CPU mask, not the transitory mask the task might have while migrate disabled. Before this patch, if a task was migrate-disabled at the time __set_cpus_allowed_ptr() was called, and the new mask happened to be equal to the CPU that the task was running on, then the mask update would be lost. Signed-off-by: Scott Wood Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Link: https://lkml.kernel.org/r/20200617121742.cpxppyi7twxmpin7@linutronix.de Signed-off-by: Sasha Levin --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 361cbc2dc9667..f5537f87c1928 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1649,7 +1649,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, goto out; } - if (cpumask_equal(p->cpus_ptr, new_mask)) + if (cpumask_equal(&p->cpus_mask, new_mask)) goto out; dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask); -- 2.25.1