diff mbox series

[01/27] arch/x86: Remove "select SRCU"

Message ID 20230105003813.1770367-1-paulmck@kernel.org (mailing list archive)
State Accepted
Commit 7354a9c454c2aa7bcda4149fcb6d46bec59aab95
Headers show
Series Unconditionally enable SRCU | expand

Commit Message

Paul E. McKenney Jan. 5, 2023, 12:37 a.m. UTC
Now that the SRCU Kconfig option is unconditionally selected, there is
no longer any point in selecting it.  Therefore, remove the "select SRCU"
Kconfig statements.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: <x86@kernel.org>
Cc: <kvm@vger.kernel.org>
---
 arch/x86/Kconfig     | 2 --
 arch/x86/kvm/Kconfig | 1 -
 2 files changed, 3 deletions(-)

Comments

Sean Christopherson Jan. 9, 2023, 5:43 p.m. UTC | #1
On Wed, Jan 04, 2023, Paul E. McKenney wrote:
> Now that the SRCU Kconfig option is unconditionally selected, there is
> no longer any point in selecting it.  Therefore, remove the "select SRCU"
> Kconfig statements.
> 
> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Sean Christopherson <seanjc@google.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: <x86@kernel.org>
> Cc: <kvm@vger.kernel.org>
> ---

...

> diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
> index fbeaa9ddef598..9306d99585188 100644
> --- a/arch/x86/kvm/Kconfig
> +++ b/arch/x86/kvm/Kconfig
> @@ -46,7 +46,6 @@ config KVM
>  	select KVM_XFER_TO_GUEST_WORK
>  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
>  	select KVM_VFIO
> -	select SRCU

Would it be too much trouble to bundle all of the KVM changes into a single patch?
The SRCU requirement is a generic KVM requirement that's handled in the arch Kconfigs
purely because of KVM's somewhat roundabout Kconfig setup.

>  	select INTERVAL_TREE
>  	select HAVE_KVM_PM_NOTIFIER if PM
>  	help
> -- 
> 2.31.1.189.g2e36527f23
>
Paul E. McKenney Jan. 9, 2023, 7:22 p.m. UTC | #2
On Mon, Jan 09, 2023 at 05:43:23PM +0000, Sean Christopherson wrote:
> On Wed, Jan 04, 2023, Paul E. McKenney wrote:
> > Now that the SRCU Kconfig option is unconditionally selected, there is
> > no longer any point in selecting it.  Therefore, remove the "select SRCU"
> > Kconfig statements.
> > 
> > Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: Borislav Petkov <bp@alien8.de>
> > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Sean Christopherson <seanjc@google.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: <x86@kernel.org>
> > Cc: <kvm@vger.kernel.org>
> > ---
> 
> ...
> 
> > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
> > index fbeaa9ddef598..9306d99585188 100644
> > --- a/arch/x86/kvm/Kconfig
> > +++ b/arch/x86/kvm/Kconfig
> > @@ -46,7 +46,6 @@ config KVM
> >  	select KVM_XFER_TO_GUEST_WORK
> >  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
> >  	select KVM_VFIO
> > -	select SRCU
> 
> Would it be too much trouble to bundle all of the KVM changes into a single patch?
> The SRCU requirement is a generic KVM requirement that's handled in the arch Kconfigs
> purely because of KVM's somewhat roundabout Kconfig setup.

No problem, and will do on my next rebase.  I might end up with a long
list of Cc's, but so it goes.  I will of course send the result as a
reply to this message.

							Thanx, Paul

> >  	select INTERVAL_TREE
> >  	select HAVE_KVM_PM_NOTIFIER if PM
> >  	help
> > -- 
> > 2.31.1.189.g2e36527f23
> >
Paul E. McKenney Jan. 9, 2023, 8:05 p.m. UTC | #3
On Mon, Jan 09, 2023 at 11:22:28AM -0800, Paul E. McKenney wrote:
> On Mon, Jan 09, 2023 at 05:43:23PM +0000, Sean Christopherson wrote:
> > On Wed, Jan 04, 2023, Paul E. McKenney wrote:
> > > Now that the SRCU Kconfig option is unconditionally selected, there is
> > > no longer any point in selecting it.  Therefore, remove the "select SRCU"
> > > Kconfig statements.
> > > 
> > > Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > Cc: Ingo Molnar <mingo@redhat.com>
> > > Cc: Borislav Petkov <bp@alien8.de>
> > > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > > Cc: Sean Christopherson <seanjc@google.com>
> > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > Cc: <x86@kernel.org>
> > > Cc: <kvm@vger.kernel.org>
> > > ---
> > 
> > ...
> > 
> > > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
> > > index fbeaa9ddef598..9306d99585188 100644
> > > --- a/arch/x86/kvm/Kconfig
> > > +++ b/arch/x86/kvm/Kconfig
> > > @@ -46,7 +46,6 @@ config KVM
> > >  	select KVM_XFER_TO_GUEST_WORK
> > >  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
> > >  	select KVM_VFIO
> > > -	select SRCU
> > 
> > Would it be too much trouble to bundle all of the KVM changes into a single patch?
> > The SRCU requirement is a generic KVM requirement that's handled in the arch Kconfigs
> > purely because of KVM's somewhat roundabout Kconfig setup.
> 
> No problem, and will do on my next rebase.  I might end up with a long
> list of Cc's, but so it goes.  I will of course send the result as a
> reply to this message.

Like this?  (Given the acks, the Cc list wasn't as long as I feared that
it would be.)

							Thanx, Paul

------------------------------------------------------------------------

commit 8bde7256e3bdcf4519ee783b0bd919685b960402
Author: Paul E. McKenney <paulmck@kernel.org>
Date:   Tue Nov 22 15:45:39 2022 -0800

    kvm: Remove "select SRCU"
    
    Now that the SRCU Kconfig option is unconditionally selected, there is
    no longer any point in selecting it.  Therefore, remove the "select SRCU"
    Kconfig statements from the various KVM Kconfig files.
    
    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
    Cc: Huacai Chen <chenhuacai@kernel.org>
    Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
    Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
    Cc: Sean Christopherson <seanjc@google.com>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: <kvm@vger.kernel.org>
    Acked-by: Marc Zyngier <maz@kernel.org>
    Acked-by: Anup Patel <anup@brainfault.org>
    Acked-by: Heiko Carstens <hca@linux.ibm.com>
    Reviewed-by: John Ogness <john.ogness@linutronix.de>

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 05da3c8f7e88f..312f0e9869111 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -28,7 +28,6 @@ menuconfig KVM
 	select KVM_MMIO
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select KVM_XFER_TO_GUEST_WORK
-	select SRCU
 	select KVM_VFIO
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_IRQFD
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig
index 91d197bee9c0a..591f46a5d7be1 100644
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@@ -26,7 +26,6 @@ config KVM
 	select HAVE_KVM_VCPU_ASYNC_IOCTL
 	select KVM_MMIO
 	select MMU_NOTIFIER
-	select SRCU
 	select INTERVAL_TREE
 	help
 	  Support for hosting Guest kernels.
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index a9f57dad6d916..902611954200d 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -22,7 +22,6 @@ config KVM
 	select PREEMPT_NOTIFIERS
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_VCPU_ASYNC_IOCTL
-	select SRCU
 	select KVM_VFIO
 	select IRQ_BYPASS_MANAGER
 	select HAVE_KVM_IRQ_BYPASS
diff --git a/arch/riscv/kvm/Kconfig b/arch/riscv/kvm/Kconfig
index f36a737d5f96d..6bc9b290c1283 100644
--- a/arch/riscv/kvm/Kconfig
+++ b/arch/riscv/kvm/Kconfig
@@ -27,7 +27,6 @@ config KVM
 	select KVM_XFER_TO_GUEST_WORK
 	select HAVE_KVM_VCPU_ASYNC_IOCTL
 	select HAVE_KVM_EVENTFD
-	select SRCU
 	help
 	  Support hosting virtualized guest machines.
 
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 33f4ff909476c..45fdf2a9b2e32 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -31,7 +31,6 @@ config KVM
 	select HAVE_KVM_IRQ_ROUTING
 	select HAVE_KVM_INVALID_WAKEUPS
 	select HAVE_KVM_NO_POLL
-	select SRCU
 	select KVM_VFIO
 	select INTERVAL_TREE
 	select MMU_NOTIFIER
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index fbeaa9ddef598..9306d99585188 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -46,7 +46,6 @@ config KVM
 	select KVM_XFER_TO_GUEST_WORK
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select KVM_VFIO
-	select SRCU
 	select INTERVAL_TREE
 	select HAVE_KVM_PM_NOTIFIER if PM
 	help
Sean Christopherson Jan. 10, 2023, 7:55 p.m. UTC | #4
On Mon, Jan 09, 2023, Paul E. McKenney wrote:
> On Mon, Jan 09, 2023 at 11:22:28AM -0800, Paul E. McKenney wrote:
> > On Mon, Jan 09, 2023 at 05:43:23PM +0000, Sean Christopherson wrote:
> > > On Wed, Jan 04, 2023, Paul E. McKenney wrote:
> > > > Now that the SRCU Kconfig option is unconditionally selected, there is
> > > > no longer any point in selecting it.  Therefore, remove the "select SRCU"
> > > > Kconfig statements.
> > > > 
> > > > Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> > > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > > Cc: Ingo Molnar <mingo@redhat.com>
> > > > Cc: Borislav Petkov <bp@alien8.de>
> > > > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > > > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > > > Cc: Sean Christopherson <seanjc@google.com>
> > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > Cc: <x86@kernel.org>
> > > > Cc: <kvm@vger.kernel.org>
> > > > ---
> > > 
> > > ...
> > > 
> > > > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
> > > > index fbeaa9ddef598..9306d99585188 100644
> > > > --- a/arch/x86/kvm/Kconfig
> > > > +++ b/arch/x86/kvm/Kconfig
> > > > @@ -46,7 +46,6 @@ config KVM
> > > >  	select KVM_XFER_TO_GUEST_WORK
> > > >  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
> > > >  	select KVM_VFIO
> > > > -	select SRCU
> > > 
> > > Would it be too much trouble to bundle all of the KVM changes into a single patch?
> > > The SRCU requirement is a generic KVM requirement that's handled in the arch Kconfigs
> > > purely because of KVM's somewhat roundabout Kconfig setup.
> > 
> > No problem, and will do on my next rebase.  I might end up with a long
> > list of Cc's, but so it goes.  I will of course send the result as a
> > reply to this message.
> 
> Like this?

Ya, looks good!
Paul E. McKenney Jan. 12, 2023, 12:05 a.m. UTC | #5
On Tue, Jan 10, 2023 at 07:55:13PM +0000, Sean Christopherson wrote:
> On Mon, Jan 09, 2023, Paul E. McKenney wrote:
> > On Mon, Jan 09, 2023 at 11:22:28AM -0800, Paul E. McKenney wrote:
> > > On Mon, Jan 09, 2023 at 05:43:23PM +0000, Sean Christopherson wrote:
> > > > On Wed, Jan 04, 2023, Paul E. McKenney wrote:
> > > > > Now that the SRCU Kconfig option is unconditionally selected, there is
> > > > > no longer any point in selecting it.  Therefore, remove the "select SRCU"
> > > > > Kconfig statements.
> > > > > 
> > > > > Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> > > > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > > > Cc: Ingo Molnar <mingo@redhat.com>
> > > > > Cc: Borislav Petkov <bp@alien8.de>
> > > > > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > > > > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > > > > Cc: Sean Christopherson <seanjc@google.com>
> > > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > > Cc: <x86@kernel.org>
> > > > > Cc: <kvm@vger.kernel.org>
> > > > > ---
> > > > 
> > > > ...
> > > > 
> > > > > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
> > > > > index fbeaa9ddef598..9306d99585188 100644
> > > > > --- a/arch/x86/kvm/Kconfig
> > > > > +++ b/arch/x86/kvm/Kconfig
> > > > > @@ -46,7 +46,6 @@ config KVM
> > > > >  	select KVM_XFER_TO_GUEST_WORK
> > > > >  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
> > > > >  	select KVM_VFIO
> > > > > -	select SRCU
> > > > 
> > > > Would it be too much trouble to bundle all of the KVM changes into a single patch?
> > > > The SRCU requirement is a generic KVM requirement that's handled in the arch Kconfigs
> > > > purely because of KVM's somewhat roundabout Kconfig setup.
> > > 
> > > No problem, and will do on my next rebase.  I might end up with a long
> > > list of Cc's, but so it goes.  I will of course send the result as a
> > > reply to this message.
> > 
> > Like this?
> 
> Ya, looks good!

Glad you like it!  May I have your ack?  Or would you take this one?

							Thanx, Paul
diff mbox series

Patch

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3604074a878b8..4a9175fe7dd18 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -283,7 +283,6 @@  config X86
 	select RTC_LIB
 	select RTC_MC146818_LIB
 	select SPARSE_IRQ
-	select SRCU
 	select SYSCTL_EXCEPTION_TRACE
 	select THREAD_INFO_IN_TASK
 	select TRACE_IRQFLAGS_SUPPORT
@@ -1938,7 +1937,6 @@  config X86_SGX
 	depends on X86_64 && CPU_SUP_INTEL && X86_X2APIC
 	depends on CRYPTO=y
 	depends on CRYPTO_SHA256=y
-	select SRCU
 	select MMU_NOTIFIER
 	select NUMA_KEEP_MEMINFO if NUMA
 	select XARRAY_MULTI
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index fbeaa9ddef598..9306d99585188 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -46,7 +46,6 @@  config KVM
 	select KVM_XFER_TO_GUEST_WORK
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select KVM_VFIO
-	select SRCU
 	select INTERVAL_TREE
 	select HAVE_KVM_PM_NOTIFIER if PM
 	help