From nobody Thu Apr 2 20:26:43 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 779113659F2 for ; Fri, 13 Feb 2026 16:46:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771001207; cv=none; b=gou2f/R3X+l6u+aUQtX0Ux1dTKaPW895uZtWscQJ+dl1pbsqlcAs2o7Pr1sGeiNdbUF+jLfOiZX4J6HU3HORAHgWbRd7uj1z8lAEKqSYY4/jRDgBFVk+Qks8rM76aNHiIlB/BjH4KzJab+MLJllDCnYWQ3HDSS2VGKnb6u8pDZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771001207; c=relaxed/simple; bh=27rVjBPXxz9GsYo6zYxVo4RSxaz61V7B8OpGTw3/foc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jEOvPioTMgnAx6VTjL6LKjwXNUO//RJLEmvM9PQEr6TgriLzlktgJWpub+aL/9emuV8hVaSYKH3SD8n/ly+oBdInqOOZTZMWdlCzIzqDH660rLKD0+1s6MVqdr8aiAgE9gpasTeRULAVAzYa9Bzw7H8dnS7AtRJKqpVKDZtSRPw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YJrdsyt8; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=aJO69kzE; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YJrdsyt8"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="aJO69kzE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771001203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OiMU1K8Q+G3NNaqVMsfaJgjScBXnkEWAPz5l7NAIjWM=; b=YJrdsyt81tcOH8cttGZRb+vSqYWErokGjSA35UZLSslTq47toYlFTERyieb+n/0ZbrBauZ GIf8uNdipnRmr+2vgsS/3wU6ILPZdCMCI6tU5Cfc3UtaPeg2Dg/zk9Xx+u6kc3Tjdavqm0 ZISYD/7nc4a2kipv3y206cn14sP0aiI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-282-fk1f4-RhPJu06wtq5Xo6bw-1; Fri, 13 Feb 2026 11:46:41 -0500 X-MC-Unique: fk1f4-RhPJu06wtq5Xo6bw-1 X-Mimecast-MFC-AGG-ID: fk1f4-RhPJu06wtq5Xo6bw_1771001200 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4836e35292cso8774485e9.1 for ; Fri, 13 Feb 2026 08:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1771001199; x=1771605999; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OiMU1K8Q+G3NNaqVMsfaJgjScBXnkEWAPz5l7NAIjWM=; b=aJO69kzEdAw4j2bkvNgr0+roHW/7mjdU+XAAZpK+KGyD7CoYo8THeDCM6Y9JnC9wI6 vsIWyVZpYSK7FQKutFVVBb0JmzZ/luTLxS7qNEce0wkj7c3evjiAGegFbB5mmuN6Siha pN5iCWdwCGOsZFqx3OugJ7rwnFqS1YahhW2pmuvPIMttUEqhyunyqs/RvR3RYjPZ4iNW cNL/3oZr6SdJi6h9etiPxVJA0FFKPuIex/2JHOOHOJAwSHwtNUkcmHz4pX4qsDSJCJRA OSLkMKx3uxf4/kfLI76AOPqSbY2j+FtxHV1lzpremhzh958NsDASw0sOvLqTr6MZ870S 2SWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771001199; x=1771605999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OiMU1K8Q+G3NNaqVMsfaJgjScBXnkEWAPz5l7NAIjWM=; b=e13ArGyZgm3gAsI6wDyMpu/sMpIfOvLw0SIc3GRqLVOT6h+O6pIx+VTBfNo20g0gDO +YQrlFqS3x+ten8X5PiqRfcfNT+md/IumzGlklTC39ipam7eVU6qWBO4v+W6oeCWMP2X aHa0ICMVY6Vje2GODjHQnXm5FLu0Q6o1Pt/oCuekbfuNzfDzlhCMVmwvcDYXsTVpBlWY 9q9Jh06PEb58IPL9P7SKLuJVglyjE3LQMnXdsH6u9IQS10y42C9Rv0ILLYUrTfIs/qpg 0HxxjI4VDsoPQKfSpOU2fkuCIa4RNHZhmz250wAaAseGvTUwTuHoDi5tPfQxPoo/iIZF sY9Q== X-Gm-Message-State: AOJu0YwVnSFspp+mAme6SajFcXSBU2wgxafXejRz6185pu2yuXRCA1gv oo2/5nUnZBWLZRqgrPW6OeyFb+yDBDQLNwlAGjI6Yw6BqP/NEfVI8rCW7NmQJxHyPQ6yxU6O7Aj 92YbxR7b1VRfbPTzbhys9ZWh5CfDeLuaZmarucZZWpC7LqFZWUgVTrCKU60/c0qqwrRIo/gtkwb Db29VxdBf9GUv/0TsX/Wtvjsji79bCNUzHbksveLBUMx4kJlmKrA== X-Gm-Gg: AZuq6aJE8MoH6t1IKQtWhbuoSFq4nG9Vh4aWfrsO86WAJmMdryDFg3bJuUJVqk0dsJZ g0brAK0KjaSTgM61fBi0IkBYdgKZvBucL+0DlgfpXSZHeSBwREFnQspCLmkdrVJ0+PDIwllr0Co TtFAzSD84jqsqhiuqUlAEfEoNOoMrSiGtu+Df7NQRWkzJGSZHZWLuHR8QEHNvuCFoRtNrpFGHmz xp0Iu5BsKNWzUDy/fL+lyBZC1QrKblRPdeoRiiORTnGfgNSFGYFxVy8tLbeDCfwAnTDzbRqJfCm /06bUw6CVFcHVFHrdN3f+Qs5tzk3Pxn1aYt/naQ6Cto04U7NED/Oum0qUqpJTOAh9CKl08+Ydap SoCdoPRaW3wpLfKdjmUtATb0G29KvWAwvZcmj3Gj7sNM2vnwSG0RJ5pobg83+/vsbgnXSbDJ4f7 RvXptQ287qb8ATcX+f1AsDhEEuLA== X-Received: by 2002:a05:600c:3f0c:b0:47d:5e02:14e5 with SMTP id 5b1f17b1804b1-483739ffa1emr40293405e9.5.1771001199153; Fri, 13 Feb 2026 08:46:39 -0800 (PST) X-Received: by 2002:a05:600c:3f0c:b0:47d:5e02:14e5 with SMTP id 5b1f17b1804b1-483739ffa1emr40292905e9.5.1771001198569; Fri, 13 Feb 2026 08:46:38 -0800 (PST) Received: from [192.168.10.48] ([151.61.26.160]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4834d82a4afsm492647105e9.11.2026.02.13.08.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 08:46:38 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v2 1/2] KVM: remove CONFIG_KVM_GENERIC_MMU_NOTIFIER Date: Fri, 13 Feb 2026 17:46:34 +0100 Message-ID: <20260213164635.33630-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260213164635.33630-1-pbonzini@redhat.com> References: <20260213164635.33630-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All architectures now use MMU notifier for KVM page table management. Remove the Kconfig symbol and the code that is used when it is disabled. Signed-off-by: Paolo Bonzini --- arch/arm64/kvm/Kconfig | 1 - arch/loongarch/kvm/Kconfig | 1 - arch/mips/kvm/Kconfig | 1 - arch/powerpc/kvm/Kconfig | 4 ---- arch/powerpc/kvm/powerpc.c | 1 - arch/riscv/kvm/Kconfig | 1 - arch/s390/kvm/Kconfig | 2 -- arch/x86/kvm/Kconfig | 1 - include/linux/kvm_host.h | 7 +------ virt/kvm/Kconfig | 9 +-------- virt/kvm/kvm_main.c | 16 ---------------- 11 files changed, 2 insertions(+), 42 deletions(-) diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 4f803fd1c99a..7d1f22fd490b 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -21,7 +21,6 @@ menuconfig KVM bool "Kernel-based Virtual Machine (KVM) support" select KVM_COMMON select KVM_GENERIC_HARDWARE_ENABLING - select KVM_GENERIC_MMU_NOTIFIER select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_MMIO select KVM_GENERIC_DIRTYLOG_READ_PROTECT diff --git a/arch/loongarch/kvm/Kconfig b/arch/loongarch/kvm/Kconfig index ed4f724db774..8e5213609975 100644 --- a/arch/loongarch/kvm/Kconfig +++ b/arch/loongarch/kvm/Kconfig @@ -28,7 +28,6 @@ config KVM select KVM_COMMON select KVM_GENERIC_DIRTYLOG_READ_PROTECT select KVM_GENERIC_HARDWARE_ENABLING - select KVM_GENERIC_MMU_NOTIFIER select KVM_MMIO select VIRT_XFER_TO_GUEST_WORK select SCHED_INFO diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig index cc13cc35f208..b1b9a1d67758 100644 --- a/arch/mips/kvm/Kconfig +++ b/arch/mips/kvm/Kconfig @@ -23,7 +23,6 @@ config KVM select KVM_COMMON select KVM_GENERIC_DIRTYLOG_READ_PROTECT select KVM_MMIO - select KVM_GENERIC_MMU_NOTIFIER select KVM_GENERIC_HARDWARE_ENABLING select HAVE_KVM_READONLY_MEM help diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index c9a2d50ff1b0..9a0d1c1aca6c 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig @@ -38,7 +38,6 @@ config KVM_BOOK3S_64_HANDLER config KVM_BOOK3S_PR_POSSIBLE bool select KVM_MMIO - select KVM_GENERIC_MMU_NOTIFIER =20 config KVM_BOOK3S_HV_POSSIBLE bool @@ -81,7 +80,6 @@ config KVM_BOOK3S_64_HV tristate "KVM for POWER7 and later using hypervisor mode in host" depends on KVM_BOOK3S_64 && PPC_POWERNV select KVM_BOOK3S_HV_POSSIBLE - select KVM_GENERIC_MMU_NOTIFIER select KVM_BOOK3S_HV_PMU select CMA help @@ -203,7 +201,6 @@ config KVM_E500V2 depends on !CONTEXT_TRACKING_USER select KVM select KVM_MMIO - select KVM_GENERIC_MMU_NOTIFIER help Support running unmodified E500 guest kernels in virtual machines on E500v2 host processors. @@ -220,7 +217,6 @@ config KVM_E500MC select KVM select KVM_MMIO select KVM_BOOKE_HV - select KVM_GENERIC_MMU_NOTIFIER help Support running unmodified E500MC/E5500/E6500 guest kernels in virtual machines on E500MC/E5500/E6500 host processors. diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 9a89a6d98f97..3da40ea8c562 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -625,7 +625,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long = ext) break; #endif case KVM_CAP_SYNC_MMU: - BUILD_BUG_ON(!IS_ENABLED(CONFIG_KVM_GENERIC_MMU_NOTIFIER)); r =3D 1; break; #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE diff --git a/arch/riscv/kvm/Kconfig b/arch/riscv/kvm/Kconfig index 77379f77840a..ec2cee0a39e0 100644 --- a/arch/riscv/kvm/Kconfig +++ b/arch/riscv/kvm/Kconfig @@ -30,7 +30,6 @@ config KVM select KVM_GENERIC_HARDWARE_ENABLING select KVM_MMIO select VIRT_XFER_TO_GUEST_WORK - select KVM_GENERIC_MMU_NOTIFIER select SCHED_INFO select GUEST_PERF_EVENTS if PERF_EVENTS help diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index 917ac740513e..5b835bc6a194 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -28,9 +28,7 @@ config KVM select HAVE_KVM_INVALID_WAKEUPS select HAVE_KVM_NO_POLL select KVM_VFIO - select MMU_NOTIFIER select VIRT_XFER_TO_GUEST_WORK - select KVM_GENERIC_MMU_NOTIFIER select KVM_MMU_LOCKLESS_AGING help Support hosting paravirtualized guest machines using the SIE diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index d916bd766c94..801bf9e520db 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -20,7 +20,6 @@ if VIRTUALIZATION config KVM_X86 def_tristate KVM if (KVM_INTEL !=3D n || KVM_AMD !=3D n) select KVM_COMMON - select KVM_GENERIC_MMU_NOTIFIER select KVM_ELIDE_TLB_FLUSH_IF_YOUNG select KVM_MMU_LOCKLESS_AGING select HAVE_KVM_IRQCHIP diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index d42a95cbcfbc..db9b6856f6cb 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -253,7 +253,6 @@ bool kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr= 2_or_gpa, int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); #endif =20 -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER union kvm_mmu_notifier_arg { unsigned long attributes; }; @@ -275,7 +274,6 @@ struct kvm_gfn_range { bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range); bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range); -#endif =20 enum { OUTSIDE_GUEST_MODE, @@ -849,13 +847,12 @@ struct kvm { struct hlist_head irq_ack_notifier_list; #endif =20 -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER struct mmu_notifier mmu_notifier; unsigned long mmu_invalidate_seq; long mmu_invalidate_in_progress; gfn_t mmu_invalidate_range_start; gfn_t mmu_invalidate_range_end; -#endif + struct list_head devices; u64 manual_dirty_log_protect; struct dentry *debugfs_dentry; @@ -2118,7 +2115,6 @@ extern const struct _kvm_stats_desc kvm_vm_stats_desc= []; extern const struct kvm_stats_header kvm_vcpu_stats_header; extern const struct _kvm_stats_desc kvm_vcpu_stats_desc[]; =20 -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER static inline int mmu_invalidate_retry(struct kvm *kvm, unsigned long mmu_= seq) { if (unlikely(kvm->mmu_invalidate_in_progress)) @@ -2196,7 +2192,6 @@ static inline bool mmu_invalidate_retry_gfn_unsafe(st= ruct kvm *kvm, =20 return READ_ONCE(kvm->mmu_invalidate_seq) !=3D mmu_seq; } -#endif =20 #ifdef CONFIG_HAVE_KVM_IRQ_ROUTING =20 diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 267c7369c765..794976b88c6f 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -5,6 +5,7 @@ config KVM_COMMON bool select EVENTFD select INTERVAL_TREE + select MMU_NOTIFIER select PREEMPT_NOTIFIERS =20 config HAVE_KVM_PFNCACHE @@ -93,24 +94,16 @@ config HAVE_KVM_PM_NOTIFIER config KVM_GENERIC_HARDWARE_ENABLING bool =20 -config KVM_GENERIC_MMU_NOTIFIER - select MMU_NOTIFIER - bool - config KVM_ELIDE_TLB_FLUSH_IF_YOUNG - depends on KVM_GENERIC_MMU_NOTIFIER bool =20 config KVM_MMU_LOCKLESS_AGING - depends on KVM_GENERIC_MMU_NOTIFIER bool =20 config KVM_GENERIC_MEMORY_ATTRIBUTES - depends on KVM_GENERIC_MMU_NOTIFIER bool =20 config KVM_GUEST_MEMFD - depends on KVM_GENERIC_MMU_NOTIFIER select XARRAY_MULTI bool =20 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 61dca8d37abc..bf5606d76f0c 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -502,7 +502,6 @@ void kvm_destroy_vcpus(struct kvm *kvm) } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_destroy_vcpus); =20 -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER static inline struct kvm *mmu_notifier_to_kvm(struct mmu_notifier *mn) { return container_of(mn, struct kvm, mmu_notifier); @@ -901,15 +900,6 @@ static int kvm_init_mmu_notifier(struct kvm *kvm) return mmu_notifier_register(&kvm->mmu_notifier, current->mm); } =20 -#else /* !CONFIG_KVM_GENERIC_MMU_NOTIFIER */ - -static int kvm_init_mmu_notifier(struct kvm *kvm) -{ - return 0; -} - -#endif /* CONFIG_KVM_GENERIC_MMU_NOTIFIER */ - #ifdef CONFIG_HAVE_KVM_PM_NOTIFIER static int kvm_pm_notifier_call(struct notifier_block *bl, unsigned long state, @@ -1226,10 +1216,8 @@ static struct kvm *kvm_create_vm(unsigned long type,= const char *fdname) out_err_no_debugfs: kvm_coalesced_mmio_free(kvm); out_no_coalesced_mmio: -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER if (kvm->mmu_notifier.ops) mmu_notifier_unregister(&kvm->mmu_notifier, current->mm); -#endif out_err_no_mmu_notifier: kvm_disable_virtualization(); out_err_no_disable: @@ -1292,7 +1280,6 @@ static void kvm_destroy_vm(struct kvm *kvm) kvm->buses[i] =3D NULL; } kvm_coalesced_mmio_free(kvm); -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); /* * At this point, pending calls to invalidate_range_start() @@ -1311,9 +1298,6 @@ static void kvm_destroy_vm(struct kvm *kvm) kvm->mn_active_invalidate_count =3D 0; else WARN_ON(kvm->mmu_invalidate_in_progress); -#else - kvm_flush_shadow_all(kvm); -#endif kvm_arch_destroy_vm(kvm); kvm_destroy_devices(kvm); for (i =3D 0; i < kvm_arch_nr_memslot_as_ids(kvm); i++) { --=20 2.52.0