Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp444480pxb; Thu, 9 Sep 2021 04:44:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNv4Tg9ymOc8ULVuSY6vLVQfO2bfpuYPRs3knQgNkGoC26KxhovjIhR9mnSINAf2vmze/F X-Received: by 2002:a05:6e02:1c2b:: with SMTP id m11mr1932206ilh.242.1631187898580; Thu, 09 Sep 2021 04:44:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187898; cv=none; d=google.com; s=arc-20160816; b=XBZ9yFjhhmw4P0sCJ4bAOKomNCJZI7vurHOF7BWTn8PUChzNPDbgIVScsT5ERT3yfB rbvPtVUPnabRzwENBke6MqqFd/zEX9Xn1AwgoY5O1tYnRo5Hbo4MoOUaVVLh+tRURkr/ PzfUzk1M/l6s8eY0tDh785UEnWjKkHrR3DXuBfOWF4mHe3zpuqZ+A9GJv1Q8ixZkOc/T /Oi5FEZM1JQdK+s+7fhvES8M9ygAnjmGyavLA+z2c42ByckgBL4LcUFNWTYoEyrp7B86 higYdSjAE2rpTYqgAPnrXDb4lHZVBTc3TawzT9jDYuU4EvMUlJuUvHkZ6dLWytOI8Wen bLRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cxAqG5G7zRnmnM35r72J5yj0v4n9vvXEy9b6LGwYBwM=; b=Niqz5gHnHcKMLU5dNmYnMhzzLZa9gARNXM/sNqDQQmy9b1sY7dhg89eOrl/0jbsJug wDqUT3PExGyPFvbJ5qFL3+mq0iXRxq9DhWIiHk9U7JNyflzpM0JQKTrWgwIqX/Ngc9AZ W9V9PPkSsV/zDPR1wSSYn2oN5BD8FM245pMI2RZto10pvKaB3H/P6/WLwIO09k8mvnK1 TTbceVib3+M+P71DQgrTb4F9GyxjuK9ZNEpcY6J+mN+0efIkmaFZGeIhM9+b02QPww7K e2inKdeI02506pD+uzRhWTMggX8oSWiHEaMDkrU0XcNRC94wrFUgzEAkN0EU87ERKXPa SISQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rPN35eYf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id g2si1645160ilb.132.2021.09.09.04.44.45; Thu, 09 Sep 2021 04:44:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rPN35eYf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S238112AbhIILpC (ORCPT + 99 others); Thu, 9 Sep 2021 07:45:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:46894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236954AbhIILnD (ORCPT ); Thu, 9 Sep 2021 07:43:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CA2CB611CE; Thu, 9 Sep 2021 11:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187714; bh=2x7/CSbTysEkoXuTJRs3YjYmDB0FmJSXP4i7ZfdVy3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPN35eYf8HKSsBGVjY82PWGIdb0w3ncp+gnQEPDwW4FTEA497MOCPi8NUJ2EBOPx8 0J1AL+lqDHLRZl++yAnoNNvPvFRngbPq1ycs96sJlKMowS+AIFJOZ4QmzLWKlNFyhr fSiOiA8umxaHT5PSqVmd+QJnLSCX1/rS+Bm4tuRI3jNhVyQkUvc6dzFx26dys+F2+6 ocwSzyhpKCY29gDXoZ0HwDdA6oapN0l4Waqj7ea73dKQZuaH63XmS7QmrMEIhJED8R oM9TwkYgtB+s4nRCor+B1SSO8pavgBMlXP7Zx50AqcRKTFAGsdijkKspgvaozkIdFI aiWllXl2fQnyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhouyi Zhou , "Paul E . McKenney" , Sasha Levin , rcu@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 037/252] rcu: Fix macro name CONFIG_TASKS_RCU_TRACE Date: Thu, 9 Sep 2021 07:37:31 -0400 Message-Id: <20210909114106.141462-37-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhouyi Zhou [ Upstream commit fed31a4dd3adb5455df7c704de2abb639a1dc1c0 ] This commit fixes several typos where CONFIG_TASKS_RCU_TRACE should instead be CONFIG_TASKS_TRACE_RCU. Among other things, these typos could cause CONFIG_TASKS_TRACE_RCU_READ_MB=y kernels to suffer from memory-ordering bugs that could result in false-positive quiescent states and too-short grace periods. Signed-off-by: Zhouyi Zhou Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- include/linux/rcupdate.h | 2 +- kernel/rcu/tree_plugin.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index d9680b798b21..955c82b4737c 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -167,7 +167,7 @@ void synchronize_rcu_tasks(void); # define synchronize_rcu_tasks synchronize_rcu # endif -# ifdef CONFIG_TASKS_RCU_TRACE +# ifdef CONFIG_TASKS_TRACE_RCU # define rcu_tasks_trace_qs(t) \ do { \ if (!likely(READ_ONCE((t)->trc_reader_checked)) && \ diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index de1dc3bb7f70..6ce104242b23 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -2982,17 +2982,17 @@ static void noinstr rcu_dynticks_task_exit(void) /* Turn on heavyweight RCU tasks trace readers on idle/user entry. */ static void rcu_dynticks_task_trace_enter(void) { -#ifdef CONFIG_TASKS_RCU_TRACE +#ifdef CONFIG_TASKS_TRACE_RCU if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB)) current->trc_reader_special.b.need_mb = true; -#endif /* #ifdef CONFIG_TASKS_RCU_TRACE */ +#endif /* #ifdef CONFIG_TASKS_TRACE_RCU */ } /* Turn off heavyweight RCU tasks trace readers on idle/user exit. */ static void rcu_dynticks_task_trace_exit(void) { -#ifdef CONFIG_TASKS_RCU_TRACE +#ifdef CONFIG_TASKS_TRACE_RCU if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB)) current->trc_reader_special.b.need_mb = false; -#endif /* #ifdef CONFIG_TASKS_RCU_TRACE */ +#endif /* #ifdef CONFIG_TASKS_TRACE_RCU */ } -- 2.30.2