Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp1193113ybf; Thu, 27 Feb 2020 06:36:22 -0800 (PST) X-Google-Smtp-Source: APXvYqzlCBvzC0iVD4zg+MqBVS9BIKEk96Xbl34s+e6zyVMmbUFMnmSXci47uGg4NHOHEAR9hvs4 X-Received: by 2002:a9d:51c1:: with SMTP id d1mr3557563oth.136.1582814182724; Thu, 27 Feb 2020 06:36:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582814182; cv=none; d=google.com; s=arc-20160816; b=kDzm5r2kw6H0vdNTkyzRgoYKzZKPxKpOybsfe0FD4AZEJAIHmMgCnR51lP5qVAySCw eP2jhwZAX8ozjYcqBOAC359GnL2jBm+QhLq9/Mxeu8E+ZGqp2b3hncX3V99x2M0N3xtF BOxjcTXwDOdTtwPL8BuNJCiS9eaYXawDJsYDfF+tcbhRVmEznPUMsn8WMLt5JI4WUrZQ +Ip7oSvCX/nVGT5swk73TqaYmr9W2HB3cG42Mst/5HwhXh9mz6r9otJdX7pZDanmr41k qpT2bCx4o1X6+00PQw4PHWMzDXnQJViK1hHuTt4Vam4ZQ5bAG4tM1vH13L7CPCcugNOW GQxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=1w106iyQIbVD7uEo1+hiaJpvVWEhxpCJvNm6ESilKHc=; b=B6Vzw2r6wVIqXCo3UMcR4OyeUJu81DvqV0M7n434FDHfNcR9YmA81eO5wYHTyDgb/O sNgnqivRgd/0hPkYroe+fyX03p0rCJMNrdu7YJxK3fvN5Jk6nb3V8QpGKPnP18C6o+C1 4pRTdi5KVMaRK3QNerlXompSs8pgGeYKTnc4v/8neGLRgEc5hnlrNclf9KEvwWNtCI/q L/A2xtvZ3QOXeFnjNLdQNnX3N/hjWSmJiS2iswKAB0u+R3TFQw7n/sXao5Pw5hJHSOiN 5d1t4kdg02UvspNLqVtogS15V/NlZIoXCydiGLlhpGQ1KuL97bEC2niarqWlYynyp0id STxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yXu3ovRp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v25si1298083oiv.144.2020.02.27.06.36.10; Thu, 27 Feb 2020 06:36:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yXu3ovRp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388560AbgB0OeW (ORCPT + 99 others); Thu, 27 Feb 2020 09:34:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:45286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387712AbgB0OeT (ORCPT ); Thu, 27 Feb 2020 09:34:19 -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 7ABA9246BD; Thu, 27 Feb 2020 14:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582814059; bh=e5MYqZtODO7WjLL1XEqEIwDpwLcnPUwJiLmjVxiQX4M=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=yXu3ovRpe+iaynrcEZWSGrTnCs3lZolybS6rp3WxgLwPJWgYgVZvSvBQelxNpUrrN X3oxH6WUVyFJ0WXNX4U3YIYrNT2e7XiM0/yY9s/Nk8CI5HuhxcB9nJhusHaw1n7t+W +3sU5GWvNkyIT2bCywaAiUlKhMQ4VMWBKUJDircY= 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 20/23] lib/smp_processor_id: Adjust check_preemption_disabled() Date: Thu, 27 Feb 2020 08:33:31 -0600 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Wagner v4.14.170-rt75-rc2 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit af3c1c5fdf177870fb5e6e16b24e374696ab28f5 ] The current->migrate_disable counter is not always defined leading to build failures with DEBUG_PREEMPT && !PREEMPT_RT_BASE. Restrict the access to ->migrate_disable to same set where ->migrate_disable is modified. Signed-off-by: Daniel Wagner [bigeasy: adjust condition + description] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Tom Zanussi --- lib/smp_processor_id.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index 7a0c19c282cc..3ceb2cc1516b 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -23,8 +23,10 @@ notrace static unsigned int check_preemption_disabled(const char *what1, * Kernel threads bound to a single CPU can safely use * smp_processor_id(): */ +#if defined(CONFIG_PREEMPT_RT_BASE) && (defined(CONFIG_SMP) || defined(CONFIG_SCHED_DEBUG)) if (current->migrate_disable) goto out; +#endif if (current->nr_cpus_allowed == 1) goto out; -- 2.14.1