From patchwork Fri Mar 24 20:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 13187374 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1F99C6FD20 for ; Fri, 24 Mar 2023 20:53:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232223AbjCXUxA (ORCPT ); Fri, 24 Mar 2023 16:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232222AbjCXUw5 (ORCPT ); Fri, 24 Mar 2023 16:52:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 466A71F5FD; Fri, 24 Mar 2023 13:52:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E1394B825E6; Fri, 24 Mar 2023 20:52:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96A9EC4339B; Fri, 24 Mar 2023 20:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679691170; bh=tOxw83oZFLY5cLM0Umf91sclKQV9Ud5SQytulJUtscU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TH7o1ZuA9ZZ70h+ls2Pj+OberIHACnPGoD9DibZQ0YSx/fWOnmnXdNaXI9iJjJc0V hc4rpe9zAYnGKrN4H4iSbprs7tgVnzy4YCXlIvpxvubJdVwZ8wZJn9dOeI83pjAbix CzfN1gC6O18QBCKsMS5mYcw/bmd7XU9Et7cOL9KXTx0C6hit/SSfdDr8Vmm5BkSpbB cuy50ftXkLyQHC+C3s/WJoNuQziZZwzatBxsyQefT+S+6mgtzhx7y6tLcYGQ6KtwfL NphMxLnzIv0my4Q/X8cL3MyXN8wtcuHp2ZFuNE+dIwcMTrynoSvobpakAYjWQfVOXA 7/zTe/0+1REdw== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 4C1B21540432; Fri, 24 Mar 2023 13:52:50 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , x86@kernel.org, John Ogness Subject: [PATCH rcu v3 1/4] arch/x86: Remove "select SRCU" Date: Fri, 24 Mar 2023 13:52:46 -0700 Message-Id: <20230324205249.3700408-1-paulmck@kernel.org> X-Mailer: git-send-email 2.40.0.rc2 In-Reply-To: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> References: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org 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 Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Reviewed-by: John Ogness --- arch/x86/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a825bf031f49..947e24714c28 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 From patchwork Fri Mar 24 20:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 13187375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B03ABC76195 for ; Fri, 24 Mar 2023 20:53:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230418AbjCXUxB (ORCPT ); Fri, 24 Mar 2023 16:53:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbjCXUw6 (ORCPT ); Fri, 24 Mar 2023 16:52:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2BFC1F930; Fri, 24 Mar 2023 13:52:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 14474B82609; Fri, 24 Mar 2023 20:52:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B183FC433D2; Fri, 24 Mar 2023 20:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679691170; bh=d2jjroz/2vjPnTyu4HHq2WBisCZrPVF0VtjGVREnDbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sNPbrsN3eT2z8ZsAfZmmI/du4vEX7d2nktCIhUXSmez7GgvgALMwpIDOa79nEWIM5 rvjV1kGVUh1YiFf/JCSCF0X/oNbxtEoIhiVUed6IwexvDXX4w6Vhpbc5WUni1YKjWI ktEyb7uihHpXHFzAjfrhPeDgwiSX2pOeJKbjeXj+ltv+Qj+xGZMwKjb5TciXku3Kq0 Yusa+sj8O6EXpFZ/sIOj/He7Dpqo6bHiuoufjTCCTxdqTNzA6vv0XCi7876iXQ1atB 2zaA66aKRt9bV4SlPYbbFS2ocskZzm+vTJGoYptigMPnn0SdYkM9jaNw3OdYEGclyn vkKBdz9mE5imA== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 520BC1540434; Fri, 24 Mar 2023 13:52:50 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" , Huacai Chen , Aleksandar Markovic , Thomas Bogendoerfer , Michael Ellerman , Christophe Leroy , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , kvm@vger.kernel.org, Marc Zyngier , Anup Patel , Heiko Carstens , John Ogness Subject: [PATCH rcu v3 2/4] kvm: Remove "select SRCU" Date: Fri, 24 Mar 2023 13:52:47 -0700 Message-Id: <20230324205249.3700408-2-paulmck@kernel.org> X-Mailer: git-send-email 2.40.0.rc2 In-Reply-To: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> References: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org 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 Cc: Huacai Chen Cc: Aleksandar Markovic Cc: Thomas Bogendoerfer Cc: Michael Ellerman Cc: Christophe Leroy Cc: Sean Christopherson Cc: Paolo Bonzini Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Acked-by: Marc Zyngier (arm64) Acked-by: Michael Ellerman (powerpc) Acked-by: Anup Patel (riscv) Acked-by: Heiko Carstens (s390) Reviewed-by: John Ogness Acked-by: Sean Christopherson (x86) --- arch/arm64/kvm/Kconfig | 1 - arch/mips/kvm/Kconfig | 1 - arch/powerpc/kvm/Kconfig | 1 - arch/riscv/kvm/Kconfig | 1 - arch/s390/kvm/Kconfig | 1 - arch/x86/kvm/Kconfig | 1 - 6 files changed, 6 deletions(-) diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index ca6eadeb7d1a..f531da6b362e 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -29,7 +29,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 29e51649203b..a8cdba75f98d 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 select KVM_GENERIC_HARDWARE_ENABLING help diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index a9f57dad6d91..902611954200 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 d5a658a047a7..5682d8c017b3 100644 --- a/arch/riscv/kvm/Kconfig +++ b/arch/riscv/kvm/Kconfig @@ -28,7 +28,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 33f4ff909476..45fdf2a9b2e3 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 8e578311ca9d..89ca7f4c1464 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 select KVM_GENERIC_HARDWARE_ENABLING From patchwork Fri Mar 24 20:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 13187372 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B356BC76195 for ; Fri, 24 Mar 2023 20:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230100AbjCXUw4 (ORCPT ); Fri, 24 Mar 2023 16:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232153AbjCXUwy (ORCPT ); Fri, 24 Mar 2023 16:52:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5AB91F917; Fri, 24 Mar 2023 13:52:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 64D2162C59; Fri, 24 Mar 2023 20:52:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C270AC4339E; Fri, 24 Mar 2023 20:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679691170; bh=gVZf2H+pPP8Z48bMWRqaLr70/kxKUljxkLuxY26wyqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ni1eJN+7kNaWmtKsvVQiiGH6hdHlnW/dT0dspJSWO9nRs0nzMfxmZ6DViaCH8OApe iZJQf+kd/LQSdkHscBbFFCfqlj7NVOkGtdeoV6bGlgV4B7VX/OnrJbc47mip8NCtD2 zP+U0piMIZ4OqbQxukFUqD+oKgAbNw7jZaOcgyQHyRRl7cBlkGiIb52ibIq4ktIinY t3MgsH5IgCMYBs0KAaLYHFcHXP/wPbDvrGz6uTf1tCNl1oDt1YktvcowZOUCZkS/KH Mikw9PsuTr8gryfE0UiHNDffUtcyq+KtCdC+QEJnj+Yo8kEF09OBYP/KnStBKZhNnE mIq55gq2CfyDg== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 55A291540436; Fri, 24 Mar 2023 13:52:50 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" , Andrew Morton , linux-mm@kvack.org, John Ogness Subject: [PATCH rcu v3 3/4] mm: Remove "select SRCU" Date: Fri, 24 Mar 2023 13:52:48 -0700 Message-Id: <20230324205249.3700408-3-paulmck@kernel.org> X-Mailer: git-send-email 2.40.0.rc2 In-Reply-To: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> References: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org 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 Cc: Andrew Morton Cc: Reviewed-by: John Ogness --- mm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/Kconfig b/mm/Kconfig index 4751031f3f05..ebfe5796adf8 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -686,7 +686,6 @@ config BOUNCE config MMU_NOTIFIER bool - select SRCU select INTERVAL_TREE config KSM From patchwork Fri Mar 24 20:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 13187373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A687DC76196 for ; Fri, 24 Mar 2023 20:52:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231903AbjCXUw4 (ORCPT ); Fri, 24 Mar 2023 16:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232173AbjCXUwz (ORCPT ); Fri, 24 Mar 2023 16:52:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0838E1F921; Fri, 24 Mar 2023 13:52:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6DB3A62CBB; Fri, 24 Mar 2023 20:52:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCAC2C4339C; Fri, 24 Mar 2023 20:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679691170; bh=xIAddEU+WGJoAW1SFrSP2UY+CCmqTszBpgMeGVI0lfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L4/mf/Vz1MXwNW+y2oksjjjQ0HcTksqllOBJR7WW0rohnVh76lN9INkPCzhDyuh6A mDZ31Le3u7n6QTM0ayeQoEFvkJk+3W6xJfMh2XIHDnD66dCxVpSOuKpMXWE2ADHdd8 9pQW/G37rCsWIxvwFHhJtihwXeUooPa+A1gWkvkh0eb2KAdiOG5UDR4oaSO4SOEsEt 2g9AV/Nm9kLRTHl1PSvOrTaSJzawFSIQYG8t61X+hDh1NJqNks0oUyY5GMIszTeE70 7hSviQWJWB0CiHo+CXElGzovu0nu6E0Ods8JJKz+qC0MPiwv1PuLvw6yttlwIOP9E7 XXS9dwbvJkJLw== Received: by paulmck-ThinkPad-P72.home (Postfix, from userid 1000) id 590BB1540437; Fri, 24 Mar 2023 13:52:50 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, rostedt@goodmis.org, "Paul E. McKenney" , John Ogness , Petr Mladek Subject: [PATCH rcu v3 4/4] rcu: Remove CONFIG_SRCU Date: Fri, 24 Mar 2023 13:52:49 -0700 Message-Id: <20230324205249.3700408-4-paulmck@kernel.org> X-Mailer: git-send-email 2.40.0.rc2 In-Reply-To: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> References: <8ae81b0e-2e03-4f83-aa3d-c7a0b96c8045@paulmck-laptop> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org Now that all references to CONFIG_SRCU have been removed, it is time to remove CONFIG_SRCU itself. Signed-off-by: Paul E. McKenney Cc: John Ogness Cc: Petr Mladek Reviewed-by: John Ogness --- kernel/rcu/Kconfig | 3 --- tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 ---- 2 files changed, 7 deletions(-) diff --git a/kernel/rcu/Kconfig b/kernel/rcu/Kconfig index ab62074174c3..9071182b1284 100644 --- a/kernel/rcu/Kconfig +++ b/kernel/rcu/Kconfig @@ -53,9 +53,6 @@ config RCU_EXPERT Say N if you are unsure. -config SRCU - def_bool y - config TINY_SRCU bool default y if TINY_RCU diff --git a/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt index 42acb1a64ce1..3f5fb66f16df 100644 --- a/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt +++ b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt @@ -71,9 +71,5 @@ CONFIG_TASKS_RCU These are controlled by CONFIG_PREEMPT and/or CONFIG_SMP. -CONFIG_SRCU - - Selected by CONFIG_RCU_TORTURE_TEST, so cannot disable. - boot parameters ignored: TBD