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=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 CE99AC3566F for ; Fri, 21 Feb 2020 21:25:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B41524681 for ; Fri, 21 Feb 2020 21:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582320323; bh=hcmw3OGbvLUBpQAYBdpNI4dUDGemZjsl5dBpB8oThtg=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=Gjo+N7rSYsu0iZWIm8B6KHCeKMOvDPJPRwUi684gMmx0UwiNOaM2zV78sCVeXR8AE uERzLvwl+u+U1W0RZMb1ZwKQ/OSBNQm4no7DEFvezdQ5X+RJb1hpBOMvJRJjkAzp23 0RKeMlaYRKjoW4VXd1QP2YbqJKp+iETbl0SqWFb4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729051AbgBUVZW (ORCPT ); Fri, 21 Feb 2020 16:25:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:39098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728102AbgBUVZW (ORCPT ); Fri, 21 Feb 2020 16:25:22 -0500 Received: from localhost.localdomain (c-98-220-238-81.hsd1.il.comcast.net [98.220.238.81]) (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 3D68824673; Fri, 21 Feb 2020 21:25:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582320321; bh=hcmw3OGbvLUBpQAYBdpNI4dUDGemZjsl5dBpB8oThtg=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=XKrE1DCdQE5E6zBJ9zUDjp/S2DuQPx4hc7PvXp7JfMBN3HN5/aJZrEHm+bZAMWsGj HjT2Peaq2qzMnecnjaTML636YYB2xzcUFZGDtNIsfImx3K6heqEsj7cfO5NZwb3VSX XX11dkdpGj0/TIBHXQag9IqZYZsLs4b/eze6IQjU= From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Tom Zanussi Subject: [PATCH RT 07/25] sched: __set_cpus_allowed_ptr: Check cpus_mask, not cpus_ptr Date: Fri, 21 Feb 2020 15:24:35 -0600 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org From: Scott Wood v4.14.170-rt75-rc1 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit e5606fb7b042db634ed62b4dd733d62e050e468f ] 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: Tom Zanussi --- 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 fcff75934bdc..8d6badac9225 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1192,7 +1192,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.14.1