Message ID | 20230530015223.147755-30-zhaotianrui@loongson.cn (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add KVM LoongArch support | expand |
Reviewed-by: Bibo, Mao <maobibo@loongson.cn> 在 2023/5/30 09:52, Tianrui Zhao 写道: > Enable LoongArch kvm config and add the makefile to support build kvm > module. > > Reported-by: kernel test robot <lkp@intel.com> > Link: https://lore.kernel.org/oe-kbuild-all/202304131526.iXfLaVZc-lkp@intel.com/ > Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn> > --- > arch/loongarch/Kbuild | 1 + > arch/loongarch/Kconfig | 2 ++ > arch/loongarch/configs/loongson3_defconfig | 2 ++ > arch/loongarch/kvm/Kconfig | 38 ++++++++++++++++++++++ > arch/loongarch/kvm/Makefile | 22 +++++++++++++ > 5 files changed, 65 insertions(+) > create mode 100644 arch/loongarch/kvm/Kconfig > create mode 100644 arch/loongarch/kvm/Makefile > > diff --git a/arch/loongarch/Kbuild b/arch/loongarch/Kbuild > index b01f5cdb27e0..40be8a1696f9 100644 > --- a/arch/loongarch/Kbuild > +++ b/arch/loongarch/Kbuild > @@ -2,6 +2,7 @@ obj-y += kernel/ > obj-y += mm/ > obj-y += net/ > obj-y += vdso/ > +obj-y += kvm/ > > # for cleaning > subdir- += boot > diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig > index d38b066fc931..16ddf4f6f9bd 100644 > --- a/arch/loongarch/Kconfig > +++ b/arch/loongarch/Kconfig > @@ -113,6 +113,7 @@ config LOONGARCH > select HAVE_KPROBES > select HAVE_KPROBES_ON_FTRACE > select HAVE_KRETPROBES > + select HAVE_KVM > select HAVE_MOD_ARCH_SPECIFIC > select HAVE_NMI > select HAVE_PCI > @@ -604,3 +605,4 @@ source "drivers/acpi/Kconfig" > endmenu > > source "drivers/firmware/Kconfig" > +source "arch/loongarch/kvm/Kconfig" > diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig > index 6cd26dd3c134..3c0cbe6ad08f 100644 > --- a/arch/loongarch/configs/loongson3_defconfig > +++ b/arch/loongarch/configs/loongson3_defconfig > @@ -63,6 +63,8 @@ CONFIG_EFI_ZBOOT=y > CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y > CONFIG_EFI_CAPSULE_LOADER=m > CONFIG_EFI_TEST=m > +CONFIG_VIRTUALIZATION=y > +CONFIG_KVM=m > CONFIG_MODULES=y > CONFIG_MODULE_FORCE_LOAD=y > CONFIG_MODULE_UNLOAD=y > diff --git a/arch/loongarch/kvm/Kconfig b/arch/loongarch/kvm/Kconfig > new file mode 100644 > index 000000000000..8a999b4c0232 > --- /dev/null > +++ b/arch/loongarch/kvm/Kconfig > @@ -0,0 +1,38 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# KVM configuration > +# > + > +source "virt/kvm/Kconfig" > + > +menuconfig VIRTUALIZATION > + bool "Virtualization" > + help > + Say Y here to get to see options for using your Linux host to run > + other operating systems inside virtual machines (guests). > + This option alone does not add any kernel code. > + > + If you say N, all options in this submenu will be skipped and > + disabled. > + > +if VIRTUALIZATION > + > +config KVM > + tristate "Kernel-based Virtual Machine (KVM) support" > + depends on HAVE_KVM > + select MMU_NOTIFIER > + select ANON_INODES > + select PREEMPT_NOTIFIERS > + select KVM_MMIO > + select KVM_GENERIC_DIRTYLOG_READ_PROTECT > + select HAVE_KVM_VCPU_ASYNC_IOCTL > + select HAVE_KVM_EVENTFD > + select SRCU > + help > + Support hosting virtualized guest machines using hardware > + virtualization extensions. You will need a fairly processor > + equipped with virtualization extensions. > + > + If unsure, say N. > + > +endif # VIRTUALIZATION > diff --git a/arch/loongarch/kvm/Makefile b/arch/loongarch/kvm/Makefile > new file mode 100644 > index 000000000000..2335e873a6ef > --- /dev/null > +++ b/arch/loongarch/kvm/Makefile > @@ -0,0 +1,22 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Makefile for LOONGARCH KVM support > +# > + > +ccflags-y += -I $(srctree)/$(src) > + > +include $(srctree)/virt/kvm/Makefile.kvm > + > +obj-$(CONFIG_KVM) += kvm.o > + > +kvm-y += main.o > +kvm-y += vm.o > +kvm-y += vmid.o > +kvm-y += tlb.o > +kvm-y += mmu.o > +kvm-y += vcpu.o > +kvm-y += exit.o > +kvm-y += interrupt.o > +kvm-y += timer.o > +kvm-y += switch.o > +kvm-y += csr_ops.o
diff --git a/arch/loongarch/Kbuild b/arch/loongarch/Kbuild index b01f5cdb27e0..40be8a1696f9 100644 --- a/arch/loongarch/Kbuild +++ b/arch/loongarch/Kbuild @@ -2,6 +2,7 @@ obj-y += kernel/ obj-y += mm/ obj-y += net/ obj-y += vdso/ +obj-y += kvm/ # for cleaning subdir- += boot diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index d38b066fc931..16ddf4f6f9bd 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -113,6 +113,7 @@ config LOONGARCH select HAVE_KPROBES select HAVE_KPROBES_ON_FTRACE select HAVE_KRETPROBES + select HAVE_KVM select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI select HAVE_PCI @@ -604,3 +605,4 @@ source "drivers/acpi/Kconfig" endmenu source "drivers/firmware/Kconfig" +source "arch/loongarch/kvm/Kconfig" diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig index 6cd26dd3c134..3c0cbe6ad08f 100644 --- a/arch/loongarch/configs/loongson3_defconfig +++ b/arch/loongarch/configs/loongson3_defconfig @@ -63,6 +63,8 @@ CONFIG_EFI_ZBOOT=y CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_CAPSULE_LOADER=m CONFIG_EFI_TEST=m +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y diff --git a/arch/loongarch/kvm/Kconfig b/arch/loongarch/kvm/Kconfig new file mode 100644 index 000000000000..8a999b4c0232 --- /dev/null +++ b/arch/loongarch/kvm/Kconfig @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# KVM configuration +# + +source "virt/kvm/Kconfig" + +menuconfig VIRTUALIZATION + bool "Virtualization" + help + Say Y here to get to see options for using your Linux host to run + other operating systems inside virtual machines (guests). + This option alone does not add any kernel code. + + If you say N, all options in this submenu will be skipped and + disabled. + +if VIRTUALIZATION + +config KVM + tristate "Kernel-based Virtual Machine (KVM) support" + depends on HAVE_KVM + select MMU_NOTIFIER + select ANON_INODES + select PREEMPT_NOTIFIERS + select KVM_MMIO + select KVM_GENERIC_DIRTYLOG_READ_PROTECT + select HAVE_KVM_VCPU_ASYNC_IOCTL + select HAVE_KVM_EVENTFD + select SRCU + help + Support hosting virtualized guest machines using hardware + virtualization extensions. You will need a fairly processor + equipped with virtualization extensions. + + If unsure, say N. + +endif # VIRTUALIZATION diff --git a/arch/loongarch/kvm/Makefile b/arch/loongarch/kvm/Makefile new file mode 100644 index 000000000000..2335e873a6ef --- /dev/null +++ b/arch/loongarch/kvm/Makefile @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for LOONGARCH KVM support +# + +ccflags-y += -I $(srctree)/$(src) + +include $(srctree)/virt/kvm/Makefile.kvm + +obj-$(CONFIG_KVM) += kvm.o + +kvm-y += main.o +kvm-y += vm.o +kvm-y += vmid.o +kvm-y += tlb.o +kvm-y += mmu.o +kvm-y += vcpu.o +kvm-y += exit.o +kvm-y += interrupt.o +kvm-y += timer.o +kvm-y += switch.o +kvm-y += csr_ops.o
Enable LoongArch kvm config and add the makefile to support build kvm module. Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/oe-kbuild-all/202304131526.iXfLaVZc-lkp@intel.com/ Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn> --- arch/loongarch/Kbuild | 1 + arch/loongarch/Kconfig | 2 ++ arch/loongarch/configs/loongson3_defconfig | 2 ++ arch/loongarch/kvm/Kconfig | 38 ++++++++++++++++++++++ arch/loongarch/kvm/Makefile | 22 +++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 arch/loongarch/kvm/Kconfig create mode 100644 arch/loongarch/kvm/Makefile