From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23458C4332F for ; Wed, 1 Nov 2023 12:55:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DE568E000E; Wed, 1 Nov 2023 08:55:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68CF08D0040; Wed, 1 Nov 2023 08:55:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 555298E000E; Wed, 1 Nov 2023 08:55:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 44C998D0040 for ; Wed, 1 Nov 2023 08:55:16 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1E9021CB4FD for ; Wed, 1 Nov 2023 12:55:16 +0000 (UTC) X-FDA: 81409381032.13.5FD9115 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by imf15.hostedemail.com (Postfix) with ESMTP id 505BAA0012 for ; Wed, 1 Nov 2023 12:55:14 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=waYvyVAn; spf=pass (imf15.hostedemail.com: domain of tabba@google.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=tabba@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698843314; a=rsa-sha256; cv=none; b=3MdUJ+wZJY4R2JrC4rDUfgA/7jJGemUGciCf5AOvBKtDzNj/8rBLFnR+f+MM8RtI0NVO0t wom/v9wIJkRis4Bqy80ViAyUi1Daeo/qEcB9hd9S1ZXspJNS1tyik1yChbEkJSN/k391r6 vjS1nZ3vqpFnUEMUfFVPx74e5SGl3SQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=waYvyVAn; spf=pass (imf15.hostedemail.com: domain of tabba@google.com designates 209.85.219.42 as permitted sender) smtp.mailfrom=tabba@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698843314; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Kcbm3pgdDavcIpgSUdmAtURkVA09XH/izRcxwAHeEyo=; b=uPp4g8Xsj+MkkQFN6xwPf8UTjMFdYwlgxhTQ18UG+3xi75gOcShtheu1j3jdol1NjSO/KO UCOP8tQ1lBjyJCxVVZqmx3WIeYAf6OLnHnOtUy5UyHMmBeuzUoxX6y5+syw69HZMJnuzem ZCDtAkcbPjeiNdz+bmCaJETOoP7XN0A= Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-66d0760cd20so7293846d6.0 for ; Wed, 01 Nov 2023 05:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698843313; x=1699448113; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Kcbm3pgdDavcIpgSUdmAtURkVA09XH/izRcxwAHeEyo=; b=waYvyVAnlG6DyHS3KqZrQFVXu5SnQs9BfAGKfpbAHKKPMAG3Szkmos8b2WurngR60+ 5y8m2Pifg829xHw0kxyKhLBGBEnY2pRMk4V8Qif2eA6gzrJJnnSgkuTzwXP+Oj+5gXrv 27LgbobUHamFDrN/z+6ZPZZfIpk512IwME6QMIqcFdhDijjazaRtzc8VS8AFSE8hUs3Z /ANDK2tWnj1+S5tAf1cVGW46hEeofAajad3y0/llDklOkSUpu+kid6696Z+T23qjpnrB QwoWnL2HuolfY+3e/ck4djEcVdrFVG6Qf/DwQ3drzDNG6eu4hI4cIWlmnNW/R+B8YjYX WvQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698843313; x=1699448113; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kcbm3pgdDavcIpgSUdmAtURkVA09XH/izRcxwAHeEyo=; b=q9YziYcQ8VWUwmmFUM81mx/DhpVwoUZG89sMkt3ldmED+ww8muzxP5iZG/zQWjK9ez yAB05iw4JWZexkA0ikjm+DcYZIfiTg1iTYa+a+6U7A5Sc4jSPqsKV9NtEyJihogVc8ds piuoHcVGbkqJFfWmoq2Pc21LmgU1yxJgLEPVSIp4u6gqV7ehCC7T93p4feiT/TNW4crb oWGLl4FwIo4cYgWZcFPAsIpKHqQ59CLRp9akoG8EnyWCVir9nEsoj9jcZq0tKovFkmZz emkGJ1E5bLwABKIVJC2WcLtWCbd4jT82mqa98Z+VyXL/+9ahS0HVW6ZniJoXcCToTFZk vnbA== X-Gm-Message-State: AOJu0Yy8l5GgBIEbBnHiVb6kD/zEkZ/11QmT52QEzZ0N4z0MsLXiQD7X o2BHXkR9r3OtpxbVHq1xaxYkDXOINaoqADxIJLbgtw== X-Google-Smtp-Source: AGHT+IF/ktOWLkTr0vIBJTyx2IkHtp7uKWr0KOEDhG6yK9eOP39Rcd526AUvWlkdMjeNqRjSvUGFcj7XE4fSnIPoLYY= X-Received: by 2002:a05:6214:f0b:b0:66d:5cfe:82a6 with SMTP id gw11-20020a0562140f0b00b0066d5cfe82a6mr9652104qvb.27.1698843313194; Wed, 01 Nov 2023 05:55:13 -0700 (PDT) MIME-Version: 1.0 References: <20231027182217.3615211-1-seanjc@google.com> <20231027182217.3615211-8-seanjc@google.com> In-Reply-To: <20231027182217.3615211-8-seanjc@google.com> From: Fuad Tabba Date: Wed, 1 Nov 2023 12:54:37 +0000 Message-ID: Subject: Re: [PATCH v13 07/35] KVM: Convert KVM_ARCH_WANT_MMU_NOTIFIER to CONFIG_KVM_GENERIC_MMU_NOTIFIER To: Sean Christopherson Cc: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , =?UTF-8?B?TWlja2HDq2wgU2FsYcO8bg==?= , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 505BAA0012 X-Stat-Signature: rpng7i7wbr4zjr6jdq1npb4cdrokenja X-Rspam-User: X-HE-Tag: 1698843314-434753 X-HE-Meta: U2FsdGVkX1/Nl83ssY2GslQls/1uM7iNHaN7tadXlhRTR++RYyeCuG2K8phyPYCRjI4xm5AuiKbIeD+ne4JZRDxsw/eOOfmvYGxNuiBT2znZNRDx7wUMomnpwOihQdDR69HWqdWeQyjcPoHyAe0++MrL40xAiP06mzCjtN0Aqo78/3qxpyD+KPHijXfT+vCmPFQHa42bJk59CjLmA33xi4qNh84ApO04PLUOku12j9crvrsNDfHxrdOjTy1N5LuSVCwh/lN7bwvpZEAydtlE4rWRYNEqbr39p2kHL4Elm4PFkrZJyRTPIP4Qb9ZdIGI1Y1G+rzWLMstlXfrMWtignmO6wO3zsgVrMHxhmzdjUOcPj5kpAEQMWO9cisFlg8N5DJzIVr/d2H4/uYjwN+6ejcXpJ4G3byfRmAvwz6uZi8bUpew/VzPZ9WYUyDtKw5+fez2JXDE/uRc/maCRbu6IbCwWa5kFttNYD+zXDIUYTEYUjksK9vG81RUYmTXjll/iT2d9lBnKDTi/70goQ+8h7O2cMONKmRIoNA1ME+Ll3njKY7BCifcLeFipaOoUiN/iRhZv4e0a1d9jsgU2HQ5Oj8DhFIvKkmDzv4Y09sF1lsfpK8pjP0oPJYjjb7O+EZST1GR8AmIl4xmPYLRLvxElvohsFM6qhOLZ2TPF+weZla0p56m5ANvp7ffxQfHv6/j+lWhb44sNOwZuBBG+uG2KDdzbed1TqY2EMVPACv4gEtftz7IR33XEkE5WXUDW6XAFbg93zg9x3xtRlmj/pC0YNH/ehjaIM/q4XREGuoo3UT7KU19j13x+8QkOGEfFla8k/7W6c1Wza+5JDHLa3KBelZ+mNtSEn89CgbIoQIO3rlpLujjCzYKnwyUEnFZhb/7R49j8nluqmM/RXs6KdjNvslLUMjr/W6xkKW6Fj2nirSnBdQNB7yDD4zxOcaskGU5s1HOr0rirmN9tUuFVPvm GRlJGr7m 1AtL8pWMeB0bCDCGKZdqBjdPEB2m3GqZX1two+eZ8QKVAUHtyxQi7jHErLdMUkLUtT951DGRWWWytbwDW4HAOAl2PslcH3S+eBdgo+HsjOqGjBXZwy53n5tiJk8IlwGc4cg+vpW1+JI+/X68KucasU3ihtHH9Pl0zkgQXa6CqnN9mWoPzf0UVQ5P6Lp/bLS/H3TblpULsXkB1+9hn/LUn3xiIfqkzE0J/esgZmfq9Xrk/pFn8UCvNx9+V6tfICmRCNI0nvTza0iW4ObXUdz81pVASJbkwfl4fxACJnH7reSjndjRNm9jRzC0bPvdMQ5NFK3MU4I1tr1jqSMASPSCLOvtsbb+432edzWjh39Sj5J0A5/pRRO21boOmQ9+Y6MgtyMwWZTHSPQEp0rldTaB/hQ/3E+zPLazYCN+/bEwc+QSJTHMAFz3jH+r1DhYKSSbcjsLDgyIhAo/bCQc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Oct 27, 2023 at 7:22=E2=80=AFPM Sean Christopherson wrote: > > Convert KVM_ARCH_WANT_MMU_NOTIFIER into a Kconfig and select it where > appropriate to effectively maintain existing behavior. Using a proper > Kconfig will simplify building more functionality on top of KVM's > mmu_notifier infrastructure. > > Add a forward declaration of kvm_gfn_range to kvm_types.h so that > including arch/powerpc/include/asm/kvm_ppc.h's with CONFIG_KVM=3Dn doesn'= t > generate warnings due to kvm_gfn_range being undeclared. PPC defines > hooks for PR vs. HV without guarding them via #ifdeffery, e.g. > > bool (*unmap_gfn_range)(struct kvm *kvm, struct kvm_gfn_range *range); > bool (*age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range); > bool (*test_age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range); > bool (*set_spte_gfn)(struct kvm *kvm, struct kvm_gfn_range *range); > > Alternatively, PPC could forward declare kvm_gfn_range, but there's no > good reason not to define it in common KVM. > > Acked-by: Anup Patel > Signed-off-by: Sean Christopherson > --- Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba (Tested x86 and arm64 on qemu) Cheers, /fuad > arch/arm64/include/asm/kvm_host.h | 2 -- > arch/arm64/kvm/Kconfig | 2 +- > arch/mips/include/asm/kvm_host.h | 2 -- > arch/mips/kvm/Kconfig | 2 +- > arch/powerpc/include/asm/kvm_host.h | 2 -- > arch/powerpc/kvm/Kconfig | 8 ++++---- > arch/powerpc/kvm/powerpc.c | 4 +--- > arch/riscv/include/asm/kvm_host.h | 2 -- > arch/riscv/kvm/Kconfig | 2 +- > arch/x86/include/asm/kvm_host.h | 2 -- > arch/x86/kvm/Kconfig | 2 +- > include/linux/kvm_host.h | 6 +++--- > include/linux/kvm_types.h | 1 + > virt/kvm/Kconfig | 4 ++++ > virt/kvm/kvm_main.c | 10 +++++----- > 15 files changed, 22 insertions(+), 29 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/k= vm_host.h > index af06ccb7ee34..9e046b64847a 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -921,8 +921,6 @@ int __kvm_arm_vcpu_get_events(struct kvm_vcpu *vcpu, > int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, > struct kvm_vcpu_events *events); > > -#define KVM_ARCH_WANT_MMU_NOTIFIER > - > void kvm_arm_halt_guest(struct kvm *kvm); > void kvm_arm_resume_guest(struct kvm *kvm); > > diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig > index 83c1e09be42e..1a777715199f 100644 > --- a/arch/arm64/kvm/Kconfig > +++ b/arch/arm64/kvm/Kconfig > @@ -22,7 +22,7 @@ menuconfig KVM > bool "Kernel-based Virtual Machine (KVM) support" > depends on HAVE_KVM > select KVM_GENERIC_HARDWARE_ENABLING > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > select PREEMPT_NOTIFIERS > select HAVE_KVM_CPU_RELAX_INTERCEPT > select KVM_MMIO > diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm= _host.h > index 54a85f1d4f2c..179f320cc231 100644 > --- a/arch/mips/include/asm/kvm_host.h > +++ b/arch/mips/include/asm/kvm_host.h > @@ -810,8 +810,6 @@ int kvm_mips_mkclean_gpa_pt(struct kvm *kvm, gfn_t st= art_gfn, gfn_t end_gfn); > pgd_t *kvm_pgd_alloc(void); > void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu); > > -#define KVM_ARCH_WANT_MMU_NOTIFIER > - > /* Emulation */ > enum emulation_result update_pc(struct kvm_vcpu *vcpu, u32 cause); > int kvm_get_badinstr(u32 *opc, struct kvm_vcpu *vcpu, u32 *out); > diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig > index a8cdba75f98d..c04987d2ed2e 100644 > --- a/arch/mips/kvm/Kconfig > +++ b/arch/mips/kvm/Kconfig > @@ -25,7 +25,7 @@ config KVM > select HAVE_KVM_EVENTFD > select HAVE_KVM_VCPU_ASYNC_IOCTL > select KVM_MMIO > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > select INTERVAL_TREE > select KVM_GENERIC_HARDWARE_ENABLING > help > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/a= sm/kvm_host.h > index 14ee0dece853..4b5c3f2acf78 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -62,8 +62,6 @@ > > #include > > -#define KVM_ARCH_WANT_MMU_NOTIFIER > - > #define HPTEG_CACHE_NUM (1 << 15) > #define HPTEG_HASH_BITS_PTE 13 > #define HPTEG_HASH_BITS_PTE_LONG 12 > diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig > index 902611954200..b33358ee6424 100644 > --- a/arch/powerpc/kvm/Kconfig > +++ b/arch/powerpc/kvm/Kconfig > @@ -42,7 +42,7 @@ config KVM_BOOK3S_64_HANDLER > config KVM_BOOK3S_PR_POSSIBLE > bool > select KVM_MMIO > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > > config KVM_BOOK3S_HV_POSSIBLE > bool > @@ -85,7 +85,7 @@ 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 MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > select CMA > help > Support running unmodified book3s_64 guest kernels in > @@ -194,7 +194,7 @@ config KVM_E500V2 > depends on !CONTEXT_TRACKING_USER > select KVM > select KVM_MMIO > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > help > Support running unmodified E500 guest kernels in virtual machin= es on > E500v2 host processors. > @@ -211,7 +211,7 @@ config KVM_E500MC > select KVM > select KVM_MMIO > select KVM_BOOKE_HV > - select MMU_NOTIFIER > + 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 8d3ec483bc2b..aac75c98a956 100644 > --- a/arch/powerpc/kvm/powerpc.c > +++ b/arch/powerpc/kvm/powerpc.c > @@ -632,9 +632,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, lon= g ext) > break; > #endif > case KVM_CAP_SYNC_MMU: > -#if !defined(CONFIG_MMU_NOTIFIER) || !defined(KVM_ARCH_WANT_MMU_NOTIFIER= ) > - BUILD_BUG(); > -#endif > + 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/include/asm/kvm_host.h b/arch/riscv/include/asm/k= vm_host.h > index 1ebf20dfbaa6..66ee9ff483e9 100644 > --- a/arch/riscv/include/asm/kvm_host.h > +++ b/arch/riscv/include/asm/kvm_host.h > @@ -249,8 +249,6 @@ struct kvm_vcpu_arch { > static inline void kvm_arch_sync_events(struct kvm *kvm) {} > static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} > > -#define KVM_ARCH_WANT_MMU_NOTIFIER > - > #define KVM_RISCV_GSTAGE_TLB_MIN_ORDER 12 > > void kvm_riscv_local_hfence_gvma_vmid_gpa(unsigned long vmid, > diff --git a/arch/riscv/kvm/Kconfig b/arch/riscv/kvm/Kconfig > index dfc237d7875b..ae2e05f050ec 100644 > --- a/arch/riscv/kvm/Kconfig > +++ b/arch/riscv/kvm/Kconfig > @@ -30,7 +30,7 @@ config KVM > select KVM_GENERIC_HARDWARE_ENABLING > select KVM_MMIO > select KVM_XFER_TO_GUEST_WORK > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > select PREEMPT_NOTIFIERS > help > Support hosting virtualized guest machines. > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_h= ost.h > index 70d139406bc8..31e84668014e 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -2129,8 +2129,6 @@ enum { > # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, 0) > #endif > > -#define KVM_ARCH_WANT_MMU_NOTIFIER > - > int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v); > int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu); > int kvm_cpu_has_extint(struct kvm_vcpu *v); > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig > index ed90f148140d..091b74599c22 100644 > --- a/arch/x86/kvm/Kconfig > +++ b/arch/x86/kvm/Kconfig > @@ -24,7 +24,7 @@ config KVM > depends on HIGH_RES_TIMERS > depends on X86_LOCAL_APIC > select PREEMPT_NOTIFIERS > - select MMU_NOTIFIER > + select KVM_GENERIC_MMU_NOTIFIER > select HAVE_KVM_IRQCHIP > select HAVE_KVM_PFNCACHE > select HAVE_KVM_IRQFD > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 11d091688346..5faba69403ac 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -253,7 +253,7 @@ bool kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t = cr2_or_gpa, > int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); > #endif > > -#ifdef KVM_ARCH_WANT_MMU_NOTIFIER > +#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER > union kvm_mmu_notifier_arg { > pte_t pte; > }; > @@ -783,7 +783,7 @@ struct kvm { > struct hlist_head irq_ack_notifier_list; > #endif > > -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) > +#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER > struct mmu_notifier mmu_notifier; > unsigned long mmu_invalidate_seq; > long mmu_invalidate_in_progress; > @@ -1946,7 +1946,7 @@ extern const struct _kvm_stats_desc kvm_vm_stats_de= sc[]; > extern const struct kvm_stats_header kvm_vcpu_stats_header; > extern const struct _kvm_stats_desc kvm_vcpu_stats_desc[]; > > -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) > +#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER > static inline int mmu_invalidate_retry(struct kvm *kvm, unsigned long mm= u_seq) > { > if (unlikely(kvm->mmu_invalidate_in_progress)) > diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h > index 6f4737d5046a..9d1f7835d8c1 100644 > --- a/include/linux/kvm_types.h > +++ b/include/linux/kvm_types.h > @@ -6,6 +6,7 @@ > struct kvm; > struct kvm_async_pf; > struct kvm_device_ops; > +struct kvm_gfn_range; > struct kvm_interrupt; > struct kvm_irq_routing_table; > struct kvm_memory_slot; > diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig > index 484d0873061c..ecae2914c97e 100644 > --- a/virt/kvm/Kconfig > +++ b/virt/kvm/Kconfig > @@ -92,3 +92,7 @@ config HAVE_KVM_PM_NOTIFIER > > config KVM_GENERIC_HARDWARE_ENABLING > bool > + > +config KVM_GENERIC_MMU_NOTIFIER > + select MMU_NOTIFIER > + bool > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 4dba682586ee..6e708017064d 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -535,7 +535,7 @@ void kvm_destroy_vcpus(struct kvm *kvm) > } > EXPORT_SYMBOL_GPL(kvm_destroy_vcpus); > > -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) > +#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); > @@ -960,14 +960,14 @@ static int kvm_init_mmu_notifier(struct kvm *kvm) > return mmu_notifier_register(&kvm->mmu_notifier, current->mm); > } > > -#else /* !(CONFIG_MMU_NOTIFIER && KVM_ARCH_WANT_MMU_NOTIFIER) */ > +#else /* !CONFIG_KVM_GENERIC_MMU_NOTIFIER */ > > static int kvm_init_mmu_notifier(struct kvm *kvm) > { > return 0; > } > > -#endif /* CONFIG_MMU_NOTIFIER && KVM_ARCH_WANT_MMU_NOTIFIER */ > +#endif /* CONFIG_KVM_GENERIC_MMU_NOTIFIER */ > > #ifdef CONFIG_HAVE_KVM_PM_NOTIFIER > static int kvm_pm_notifier_call(struct notifier_block *bl, > @@ -1287,7 +1287,7 @@ 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: > -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) > +#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER > if (kvm->mmu_notifier.ops) > mmu_notifier_unregister(&kvm->mmu_notifier, current->mm); > #endif > @@ -1347,7 +1347,7 @@ static void kvm_destroy_vm(struct kvm *kvm) > kvm->buses[i] =3D NULL; > } > kvm_coalesced_mmio_free(kvm); > -#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) > +#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER > mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); > /* > * At this point, pending calls to invalidate_range_start() > -- > 2.42.0.820.g83a721a137-goog >