Received-SPF: pass (google.com: domain of linux-kernel+bounces-62987-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Ankur Arora <ankur.a.arora@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org,
        paulmck@kernel.org, akpm@linux-foundation.org, luto@kernel.org,
        bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com,
        mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org,
        willy@infradead.org, mgorman@suse.de, jpoimboe@kernel.org,
        mark.rutland@arm.com, jgross@suse.com, andrew.cooper3@citrix.com,
        bristot@kernel.org, mathieu.desnoyers@efficios.com,
        geert@linux-m68k.org, glaubitz@physik.fu-berlin.de,
        anton.ivanov@cambridgegreys.com, mattst88@gmail.com,
        krypton@ulrich-teichert.org, rostedt@goodmis.org,
        David.Laight@ACULAB.COM, richard@nod.at, mjguzik@gmail.com,
        jon.grimm@amd.com, bharata@amd.com, raghavendra.kt@amd.com,
        boris.ostrovsky@oracle.com, konrad.wilk@oracle.com,
        Ankur Arora <ankur.a.arora@oracle.com>
Subject: [PATCH 30/30] osnoise: handle quiescent states for PREEMPT_RCU=n, PREEMPTION=y
Date: Mon, 12 Feb 2024 21:55:54 -0800
Message-Id: <20240213055554.1802415-31-ankur.a.arora@oracle.com>
In-Reply-To: <20240213055554.1802415-1-ankur.a.arora@oracle.com>
References: <20240213055554.1802415-1-ankur.a.arora@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?ER5dELVe2W0RwnrUBRDi3fCx2MsL99JHRxHQASaibRPU3ufNJhnD6nYCMvhv?=
 =?us-ascii?Q?Su0UeNtmflov82EyFOB164VGppiv5Vw4rfknPj6neDaxAnQaleX4kqTt/IlG?=
 =?us-ascii?Q?E9DwvpP9Wp9r/kj3QRfAjDHNPSK1Pl4DBHqRRNzz6amT/rwE8ziRO19VZ+vE?=
 =?us-ascii?Q?vXvdexP73bknNc7S4sFTfwkUUP4NK2WBYIUKLg2cViELYNIjddhrG1CQH0mG?=
 =?us-ascii?Q?TNp4maUB+w+Ip6IZXzxxnMNUcbEoAZz0Y9MKfg2cX8dccq9Yrj0FCq2lOE04?=
 =?us-ascii?Q?UJXH6Ahu2BGoOTvk5J9cZNmbh4ffvhMC/Q+IkB5cUtolKykHqzv+YYDaRJt0?=
 =?us-ascii?Q?aicx+bEDNef42PTPbomklvGOMxcBYbj8bg/fQgcSlUzdHKE56zXZfx8TzS6u?=
 =?us-ascii?Q?B0I7+UazOvv7emd6H5dW87MClRhOvdDGkOBW7HLGgJtU40v1dylBCYAkpxBY?=
 =?us-ascii?Q?6qOHvT0YcRKZF/h4H/lPTNNss/xWRqSADVEUPREsGjU7j1xs0NZ44mOuEpgU?=
 =?us-ascii?Q?jNYYzCZ7rt9pmJPX9MDql1h1aQmSNBFi0xcdj9WIn/mzEfwkEl8t09aJTu/A?=
 =?us-ascii?Q?FgW4L0UozrvtvlKJBVgVeOBGZmKKyMVUQlWZszQigPDcPfLGUVsJL1KyZZm3?=
 =?us-ascii?Q?0Hk/lWuOWpsfjm85GRIg3vD1zQjBvRjtpNlCmwD5T5cPsQcXj/KRRH7qqKJp?=
 =?us-ascii?Q?KLXUZq02s+/wIYahpGAcQJ+5o5ee7L/nccyRcMzp/beqj+uUDFecc5wlqrp5?=
 =?us-ascii?Q?Ij+AQvidPOB5Vg+c7tmxwTE91pLIu6Vd/SI3ar4wvXTHYJyOhWPkMLRrhFNL?=
 =?us-ascii?Q?+K7WG7fjZQnQ6/+v2LNwUSRtjsTJ/zSPeH/pxqjpuy5QcK+qu9BQ+vgeI2uq?=
 =?us-ascii?Q?lU4Z2ZqcGt2iTBx1HBgZVbSBe9PAV++vJahMbYXQHC1qhv1G6obXHN90UDfm?=
 =?us-ascii?Q?iogm4AL3DdFRLyyuF33bsQHYvWathxZpmaeqUFxfS3BkD8FxeCHI87nxD9wa?=
 =?us-ascii?Q?hIuzuQBXy06RjwiPeGqC8mFLfp/kAQZYc52USKJ6tAJKkFV6GXzxqdulWATF?=
 =?us-ascii?Q?7RX2jIm0lrqohbxa5d6HNBUCl7HVCDevYW4DMR4XiQ1PlxXLJbQJBm7Dcwqn?=
 =?us-ascii?Q?fqhuS2rI1i94iE5KQP22CLubIeJpBEMHSattlMXLA5xJ619lCngAsnT+0Wn8?=
 =?us-ascii?Q?yn4ATqYJLfi7vxFJvmUtx/oLKwc/dVW3dBris6BMZrb2AaL3HNcLOrLEwyUy?=
 =?us-ascii?Q?JFOx0oOjTDiFTGFY4nPsp0frqKFixhEiCGVJFwtrjU3mGf9a3Swm+MHISz3e?=
 =?us-ascii?Q?ybRDveUpjBlqxr1TRcyOTgW/7kj8rFeZODaB8tKZjtamtW57MXm3HvVstZAq?=
 =?us-ascii?Q?yqrDyrapW0xCX1L5fMi1/zxIeHUmykLKhjOKrDEtJPihW6sHUbIOn3U4GgMe?=
 =?us-ascii?Q?HbpTYk6JZOe9a/HqTJ6WdCvKrQTxb2DspaBGpD0czTsmybFW6QMcVPxYzoAb?=
 =?us-ascii?Q?SGiN52PiwLmKcDwHObWwepYNv3REcx1T2C3L8xSROMQAT0muplYHKk0YAHIe?=
 =?us-ascii?Q?DWSepNxPGzPIfkXe5Mmi3l+U3KYa7ZTtQ6hGvnvTmdZfh9SWVOFVJIB4w60w?=
 =?us-ascii?Q?Fg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	0xg/Tbx+3QMbu2i/eGVnvJJE+Hm/4eFqRwLtF8mlt5bqa+EK+gWcX2ay7ivgr5gijcpgrcY7ErZGhP8qSgcItJpt8AJX5+8n8OgliB1TgwT67iQzKCQmJxKeFnHj0aKeaL5l5UPYZwB7+VY/v13zleLf1menhnV9di3J4KAvXeFoFmkSh/HW0RPVWOc+YZ5BSQDI78DaSlsHSW8hBEcgjVqZUbZ3azvWsCSqyQd5goloxWpdwLJU2pJSxxTQaecZSr8Owo4uh5Gkip3YQFUlI78CQMpnk+jz8x8L/nHqTtUpMS0gRw1SKu0z+V64/5QbWQyyrt2smptxNumEAl+YtHlO7GcEP5PyDzsZEVEiL9N8stU/IL8si4oPtKcZEMiSsbWh/QdxFL/OR30sMtupqHlz2wq8N/6LgJ68thUIdHIsEx7AMNTmVQCIDOAmfX6zjNFuZFDRHfCvnHFFQFXdIXbpf9jjxfAewJLUW8M+9hbJbseB/f6psVfs/U2DwTHWFsgMbBzzSWGJ7cxbFz15gbP4jgGlVM9Aasqk2pIW9zUjiDGBUfyiHYcJOB35BAlOPcbjOzAxkwwFmPiUYF+bZz8pVKqMuj4772rAkNLipCU=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 73debee4-726d-4864-19d4-08dc2c58a976
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 05:57:29.3080
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dqWpVJsp4fU5DcecyGSK0w/gw5zhTw4qq+JMQwYHZmH6VugxRBBpwBJkUBMpn7+KiKZJw23+lhoI5B+vbbePELDcrl6E0cc0KnhsIdo1+zI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6533
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-13_02,2024-02-12_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=942 adultscore=0
 suspectscore=0 mlxscore=0 phishscore=0 bulkscore=0 malwarescore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402130043
X-Proofpoint-GUID: NfzWETDx5tKhze4yfwCRpx3cjxSWr0Sr
X-Proofpoint-ORIG-GUID: NfzWETDx5tKhze4yfwCRpx3cjxSWr0Sr

To reduce RCU noise for nohz_full configurations, osnoise depends
on cond_resched() providing quiescent states for PREEMPT_RCU=n
configurations. And, for PREEMPT_RCU=y configurations does this
by directly calling rcu_momentary_dyntick_idle().

With PREEMPT_AUTO=y, however, we can have configurations with
(PREEMPTION=y, PREEMPT_RCU=n), which means neither of the above can
help.

Handle that by fallback to the explicit quiescent states via
rcu_momentary_dyntick_idle().

Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Suggested-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
---
 kernel/trace/trace_osnoise.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index bd0d01d00fb9..8f9f654594ed 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1532,18 +1532,20 @@ static int run_osnoise(void)
 		/*
 		 * In some cases, notably when running on a nohz_full CPU with
 		 * a stopped tick PREEMPT_RCU has no way to account for QSs.
-		 * This will eventually cause unwarranted noise as PREEMPT_RCU
-		 * will force preemption as the means of ending the current
-		 * grace period. We avoid this problem by calling
-		 * rcu_momentary_dyntick_idle(), which performs a zero duration
-		 * EQS allowing PREEMPT_RCU to end the current grace period.
-		 * This call shouldn't be wrapped inside an RCU critical
-		 * section.
+		 * This will eventually cause unwarranted noise as RCU forces
+		 * preemption as the means of ending the current grace period.
+		 * We avoid this by calling rcu_momentary_dyntick_idle(),
+		 * which performs a zero duration EQS allowing RCU to end the
+		 * current grace period. This call shouldn't be wrapped inside
+		 * an RCU critical section.
 		 *
-		 * Note that in non PREEMPT_RCU kernels QSs are handled through
-		 * cond_resched()
+		 * For non-PREEMPT_RCU kernels with cond_resched() (non-
+		 * PREEMPT_AUTO configurations), QSs are handled through
+		 * cond_resched(). For PREEMPT_AUTO kernels, we fallback to the
+		 * zero duration QS via rcu_momentary_dyntick_idle().
 		 */
-		if (IS_ENABLED(CONFIG_PREEMPT_RCU)) {
+		if (IS_ENABLED(CONFIG_PREEMPT_RCU) ||
+		    (!IS_ENABLED(CONFIG_PREEMPT_RCU) && IS_ENABLED(CONFIG_PREEMPTION))) {
 			if (!disable_irq)
 				local_irq_disable();
 
-- 
2.31.1