From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACAD03F23DE; Thu, 5 Mar 2026 19:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772740778; cv=none; b=O3J/dlQsGk8AfVn0yTjef7ODktrZu3gevy6GxZLdkhQxJfoxQUXsy6JoRZASnIf3GI39VTEDEqUGms4TnS68LYLB6md6CSFADGRirXM/tymzCgRpkjhqpaqQ7CYyWrcBP7P4yRXUTsUR4EHVukfDvidbhqY9ZujfDyZAAZn+6bA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772740778; c=relaxed/simple; bh=apxDtxtbGKXJboJ099SV+kUUZzk6R6+38w5pQ8RKeuc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Z+ePZVjNtKJuw40pv2zLNYPThKniLI5dEkYdC+IGbiwerH8FJsGJraRhfX17GbJDmBdaGd7DfxbIm6EbbmZBgX/48rZbCcB/TR70gtWDyTKpvXwL2faV/CUDXN56xj5s4dtieMLR078H0jFIA/JC3X1RNdu6sU/WoNAtPWzhi6I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ClqIl1Sa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ClqIl1Sa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7C72C116C6; Thu, 5 Mar 2026 19:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772740778; bh=apxDtxtbGKXJboJ099SV+kUUZzk6R6+38w5pQ8RKeuc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ClqIl1SaTNgyQer34abBY2Fd+KG8dAqvziZMeYMHeNttdmDje0LMacoEoHeIAWJ3+ ZslUCZ8pVlaJE1mmeHoWGo2rHXYMaZNUUvEMy9Rd43aO73lrdvJJMeiNOCWHJAXwW+ bUVp/DuBst2jZapJgb69LygMPW1AmbIaxFY2FKxyXAMfd22LPYHUB+ctgJEPE4M6Zf jsCG2jEstZohOJu1duZsK0E2C02zWVViz5wbrULNS3hD3ujwjgmW7gygsPe4BB8F+D NkEd8ATcSyDKPNR05yRUJpvsM0c19JYe9ph8jXjcQlzPlLGrb7YXOkdskUSof72i4L S7z4VTDcTAYMQ== Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfauth.phl.internal (Postfix) with ESMTP id D19ABF40068; Thu, 5 Mar 2026 14:59:36 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Thu, 05 Mar 2026 14:59:36 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvieejvdelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepuehoqhhunhcu hfgvnhhguceosghoqhhunheskhgvrhhnvghlrdhorhhgqeenucggtffrrghtthgvrhhnpe ekgffhhfeuheelhfekteeuffejveetjeefffettedtteegfefftdduteduudfgleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsohhquhhnod hmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdduieejtdelkeegjeduqddujeej keehheehvddqsghoqhhunheppehkvghrnhgvlhdrohhrghesfhhigihmvgdrnhgrmhgvpd hnsggprhgtphhtthhopeeipdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehprghu lhhmtghksehkvghrnhgvlhdrohhrghdprhgtphhtthhopehrtghusehvghgvrhdrkhgvrh hnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgv rhhnvghlrdhorhhgpdhrtghpthhtohepkhgvrhhnvghlqdhtvggrmhesmhgvthgrrdgtoh hmpdhrtghpthhtoheprhhoshhtvgguthesghhoohgumhhishdrohhrghdprhgtphhtthho pegsohhquhhnsehfihigmhgvrdhnrghmvg X-ME-Proxy: Feedback-ID: i8dbe485b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Mar 2026 14:59:36 -0500 (EST) Date: Thu, 5 Mar 2026 11:59:35 -0800 From: Boqun Feng To: "Paul E. McKenney" Cc: rcu@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org Subject: Re: [PATCH v3 1/4] rcutorture: Update due to x86 not supporting none/voluntary preemption Message-ID: References: <2011d452-3c72-432a-af77-810238e80e6a@paulmck-laptop> <20260303235903.1967409-1-paulmck@kernel.org> <58f83c55-51cf-4a77-a5d1-3a5adfe9e4c2@paulmck-laptop> Precedence: bulk X-Mailing-List: rcu@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <58f83c55-51cf-4a77-a5d1-3a5adfe9e4c2@paulmck-laptop> On Thu, Mar 05, 2026 at 11:06:25AM -0800, Paul E. McKenney wrote: > On Thu, Mar 05, 2026 at 10:22:35AM -0800, Boqun Feng wrote: [...] > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TINY01 b/tools/testing/selftests/rcutorture/configs/rcu/TINY01 > > > index bd5ed7b0da5f0..2be53bf60d65b 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TINY01 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY01 > > > @@ -1,9 +1,9 @@ > > > CONFIG_SMP=n > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_PREEMPT_DYNAMIC=n > > > -CONFIG_PREEMPT_LAZY=n > > > > This is the line that was introduced by the said commit, hence this > > patch is still separate from that commit I think? > > I *think* I have them folded/squashed correctly. > > I pushed this out to my -rcu "dev" branch. The relevant commits are, > in order of increasing time of commit: > > c70ac5693540 ("rcutorture: Adjust scenarios for default lazy preemption") It's the commit c69ac5693540 in your "dev" branch, right? > 86126bc6d7ad ("rcutorture: Update due to x86 not supporting none/voluntary preemption") > 5631c1565493 ("Revert "rcutorture: Adjust scenarios for default lazy preemption"") > 6fd95cee7427 ("Revert "rcutorture: Update due to x86 not supporting none/voluntary preemption"") The thing is the combination of the above 4 didn't introduce a clean base in rcu/{TINY01, TREE04, TREE05, TREE06}, as shown by: git diff 'c69ac5693540^..6fd95cee7427' -- tools/testing/selftests/rcutorture/configs/rcu/{TINY01,TREE04,TREE05,TREE06} I took a look, it's because commit 86126bc6d7ad ("rcutorture: Update due to x86 not supporting none/voluntary preemption") was based on commit c69ac5693540, and it moved a few CONFIG_PREEMPT_LAZY configs, and when it got reverted in commit 6fd95cee7427, these configs were moved back so commit 5631c1565493's revert was partially reverted. > 17c52d7b31a1 ("rcutorture: Update due to x86 not supporting none/voluntary preemption") > A simple way to verify would be try `cherry-pick` this commit onto 7.0-rc1. Regards, Boqun > The first was applied by Joel to the shared RCU tree, the second is in my > -rcu tree, and the last three are consecutive commits in my -rcu tree. > The following command gives no output, which I was interpreting as my > having done it correctly. But please double-check. > > git diff 5631c1565493^..17c52d7b31a1 > > Thanx, Paul > > > Regards, > > Boqun > > > > > #CHECK#CONFIG_TINY_RCU=y > > > CONFIG_HZ_PERIODIC=n > > > CONFIG_NO_HZ_IDLE=y > > > @@ -12,4 +12,3 @@ CONFIG_RCU_TRACE=n > > > #CHECK#CONFIG_RCU_STALL_COMMON=n > > > CONFIG_DEBUG_LOCK_ALLOC=n > > > CONFIG_DEBUG_OBJECTS_RCU_HEAD=n > > > -CONFIG_PREEMPT_COUNT=n > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TINY02 b/tools/testing/selftests/rcutorture/configs/rcu/TINY02 > > > index 30439f6fc20e6..be8860342ef71 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TINY02 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY02 > > > @@ -1,5 +1,6 @@ > > > CONFIG_SMP=n > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_PREEMPT_DYNAMIC=n > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TRACE01 b/tools/testing/selftests/rcutorture/configs/rcu/TRACE01 > > > index 18efab346381a..8fb124c28f283 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TRACE01 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TRACE01 > > > @@ -1,7 +1,8 @@ > > > CONFIG_SMP=y > > > CONFIG_NR_CPUS=5 > > > CONFIG_HOTPLUG_CPU=y > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_PREEMPT_DYNAMIC=n > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE04 b/tools/testing/selftests/rcutorture/configs/rcu/TREE04 > > > index 34aee1acb8662..ac857d5bcb222 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE04 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE04 > > > @@ -1,11 +1,12 @@ > > > CONFIG_SMP=y > > > CONFIG_NR_CPUS=8 > > > +CONFIG_PREEMPT_LAZY=y > > > CONFIG_PREEMPT_NONE=n > > > -CONFIG_PREEMPT_VOLUNTARY=y > > > +CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_PREEMPT_DYNAMIC=n > > > -CONFIG_PREEMPT_LAZY=n > > > #CHECK#CONFIG_TREE_RCU=y > > > +#CHECK#CONFIG_PREEMPT_RCU=n > > > CONFIG_HZ_PERIODIC=n > > > CONFIG_NO_HZ_IDLE=n > > > CONFIG_NO_HZ_FULL=y > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE05 b/tools/testing/selftests/rcutorture/configs/rcu/TREE05 > > > index 0513aa33c32c4..61d15b1b54d16 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE05 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE05 > > > @@ -1,9 +1,10 @@ > > > CONFIG_SMP=y > > > CONFIG_NR_CPUS=8 > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_DYNAMIC=n > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > -CONFIG_PREEMPT_LAZY=n > > > #CHECK#CONFIG_TREE_RCU=y > > > CONFIG_HZ_PERIODIC=n > > > CONFIG_NO_HZ_IDLE=y > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE06 b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 > > > index cc3ea23c76557..0e090bb68a0f6 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE06 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 > > > @@ -1,10 +1,12 @@ > > > CONFIG_SMP=y > > > CONFIG_NR_CPUS=8 > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_DYNAMIC=n > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > -CONFIG_PREEMPT_LAZY=n > > > #CHECK#CONFIG_TREE_RCU=y > > > +#CHECK#CONFIG_PREEMPT_RCU=n > > > CONFIG_HZ_PERIODIC=n > > > CONFIG_NO_HZ_IDLE=y > > > CONFIG_NO_HZ_FULL=n > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE10 b/tools/testing/selftests/rcutorture/configs/rcu/TREE10 > > > index 420632b030dc4..b2ce37861e71a 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE10 > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE10 > > > @@ -6,6 +6,7 @@ CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_PREEMPT_DYNAMIC=n > > > #CHECK#CONFIG_TREE_RCU=y > > > +CONFIG_PREEMPT_RCU=n > > > CONFIG_HZ_PERIODIC=n > > > CONFIG_NO_HZ_IDLE=y > > > CONFIG_NO_HZ_FULL=n > > > diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL b/tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL > > > index 5d546efa68e83..696fba9968c60 100644 > > > --- a/tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL > > > +++ b/tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL > > > @@ -1,6 +1,8 @@ > > > CONFIG_SMP=y > > > CONFIG_NR_CPUS=8 > > > -CONFIG_PREEMPT_NONE=y > > > +CONFIG_PREEMPT_DYNAMIC=n > > > +CONFIG_PREEMPT_LAZY=y > > > +CONFIG_PREEMPT_NONE=n > > > CONFIG_PREEMPT_VOLUNTARY=n > > > CONFIG_PREEMPT=n > > > CONFIG_HZ_PERIODIC=n > > > >