diff mbox series

[v3,29/29] LoongArch: KVM: Enable kvm config and add the makefile

Message ID 20230228070057.3687180-30-zhaotianrui@loongson.cn
State New
Headers
Series Add KVM LoongArch support |

Commit Message

zhaotianrui Feb. 28, 2023, 7 a.m. UTC 
  Enable loongarch kvm config and add the makefile to support build kvm
module.

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                | 21 ++++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 arch/loongarch/kvm/Kconfig
 create mode 100644 arch/loongarch/kvm/Makefile

Comments

kernel test robot March 1, 2023, 12:23 a.m. UTC | #1 
Hi Tianrui,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on kvm/queue]
[also build test WARNING on linus/master v6.2 next-20230228]
[cannot apply to kvm/linux-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Tianrui-Zhao/LoongArch-KVM-Add-kvm-related-header-files/20230228-151250
base:   https://git.kernel.org/pub/scm/virt/kvm/kvm.git queue
patch link:    https://lore.kernel.org/r/20230228070057.3687180-30-zhaotianrui%40loongson.cn
patch subject: [PATCH v3 29/29] LoongArch: KVM: Enable kvm config and add the makefile
config: loongarch-allmodconfig (https://download.01.org/0day-ci/archive/20230301/202303010850.bV3yQ7cW-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/7833c6dd07758557e28d69f9138c83adfbf06aeb
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Tianrui-Zhao/LoongArch-KVM-Add-kvm-related-header-files/20230228-151250
        git checkout 7833c6dd07758557e28d69f9138c83adfbf06aeb
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=loongarch olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=loongarch SHELL=/bin/bash arch/loongarch/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202303010850.bV3yQ7cW-lkp@intel.com/

All warnings (new ones prefixed by >>):

   In file included from include/trace/define_trace.h:102,
                    from arch/loongarch/kvm/trace.h:169,
                    from arch/loongarch/kvm/vcpu.c:14:
   arch/loongarch/kvm/./trace.h: In function 'trace_raw_output_kvm_exit_gspr':
>> arch/loongarch/kvm/./trace.h:69:23: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
      69 |             TP_printk("inst word: 0x%08lx",
         |                       ^~~~~~~~~~~~~~~~~~~~
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   include/trace/trace_events.h:45:30: note: in expansion of macro 'PARAMS'
      45 |                              PARAMS(print));                   \
         |                              ^~~~~~
   arch/loongarch/kvm/./trace.h:58:1: note: in expansion of macro 'TRACE_EVENT'
      58 | TRACE_EVENT(kvm_exit_gspr,
         | ^~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:69:13: note: in expansion of macro 'TP_printk'
      69 |             TP_printk("inst word: 0x%08lx",
         |             ^~~~~~~~~
   In file included from include/trace/trace_events.h:237:
   arch/loongarch/kvm/./trace.h:69:41: note: format string is defined here
      69 |             TP_printk("inst word: 0x%08lx",
         |                                     ~~~~^
         |                                         |
         |                                         long unsigned int
         |                                     %08x
   arch/loongarch/kvm/./trace.h: In function 'trace_raw_output_kvm_exit':
   arch/loongarch/kvm/./trace.h:54:31: warning: left-hand operand of comma expression has no effect [-Wunused-value]
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |                               ^
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   arch/loongarch/kvm/./trace.h:87:13: note: in expansion of macro 'TP_printk'
      87 |             TP_printk("[%s]PC: 0x%08lx",
         |             ^~~~~~~~~
   arch/loongarch/kvm/./trace.h:88:23: note: in expansion of macro '__print_symbolic'
      88 |                       __print_symbolic(__entry->reason,
         |                       ^~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:89:40: note: in expansion of macro 'kvm_trace_symbol_exit_types'
      89 |                                        kvm_trace_symbol_exit_types),
         |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:54:48: error: expected ';' before '}' token
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |                                                ^
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   arch/loongarch/kvm/./trace.h:87:13: note: in expansion of macro 'TP_printk'
      87 |             TP_printk("[%s]PC: 0x%08lx",
         |             ^~~~~~~~~
   arch/loongarch/kvm/./trace.h:88:23: note: in expansion of macro '__print_symbolic'
      88 |                       __print_symbolic(__entry->reason,
         |                       ^~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:89:40: note: in expansion of macro 'kvm_trace_symbol_exit_types'
      89 |                                        kvm_trace_symbol_exit_types),
         |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:54:49: error: expected ')' before ',' token
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |                                                 ^
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   arch/loongarch/kvm/./trace.h:87:13: note: in expansion of macro 'TP_printk'
      87 |             TP_printk("[%s]PC: 0x%08lx",
         |             ^~~~~~~~~
   arch/loongarch/kvm/./trace.h:88:23: note: in expansion of macro '__print_symbolic'
      88 |                       __print_symbolic(__entry->reason,
         |                       ^~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:89:40: note: in expansion of macro 'kvm_trace_symbol_exit_types'
      89 |                                        kvm_trace_symbol_exit_types),
         |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:54:9: warning: initialization of 'long unsigned int' from 'char *' makes integer from pointer without a cast [-Wint-conversion]
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |         ^
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   arch/loongarch/kvm/./trace.h:87:13: note: in expansion of macro 'TP_printk'
      87 |             TP_printk("[%s]PC: 0x%08lx",
         |             ^~~~~~~~~
   arch/loongarch/kvm/./trace.h:88:23: note: in expansion of macro '__print_symbolic'
      88 |                       __print_symbolic(__entry->reason,
         |                       ^~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:89:40: note: in expansion of macro 'kvm_trace_symbol_exit_types'
      89 |                                        kvm_trace_symbol_exit_types),
         |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:54:9: note: (near initialization for 'symbols[0].mask')
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |         ^
   include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
     203 |         trace_event_printf(iter, print);                                \
         |                                  ^~~~~
   arch/loongarch/kvm/./trace.h:87:13: note: in expansion of macro 'TP_printk'
      87 |             TP_printk("[%s]PC: 0x%08lx",
         |             ^~~~~~~~~
   arch/loongarch/kvm/./trace.h:88:23: note: in expansion of macro '__print_symbolic'
      88 |                       __print_symbolic(__entry->reason,
         |                       ^~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:89:40: note: in expansion of macro 'kvm_trace_symbol_exit_types'
      89 |                                        kvm_trace_symbol_exit_types),
         |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   arch/loongarch/kvm/./trace.h:54:9: error: initializer element is not constant
      54 |         ({ KVM_TRACE_EXIT_IDLE,         "IDLE" },                       \
         |         ^


vim +69 arch/loongarch/kvm/./trace.h

2747799ba604af Tianrui Zhao 2023-02-28  51  
2747799ba604af Tianrui Zhao 2023-02-28  52  /* Tracepoints for VM exits */
2747799ba604af Tianrui Zhao 2023-02-28  53  #define kvm_trace_symbol_exit_types					\
2747799ba604af Tianrui Zhao 2023-02-28  54  	({ KVM_TRACE_EXIT_IDLE,		"IDLE" },			\
2747799ba604af Tianrui Zhao 2023-02-28  55  	{ KVM_TRACE_EXIT_CACHE,		"CACHE" },			\
2747799ba604af Tianrui Zhao 2023-02-28  56  	{ KVM_TRACE_EXIT_SIGNAL,	"Signal" })
2747799ba604af Tianrui Zhao 2023-02-28  57  
2747799ba604af Tianrui Zhao 2023-02-28  58  TRACE_EVENT(kvm_exit_gspr,
2747799ba604af Tianrui Zhao 2023-02-28  59  	    TP_PROTO(struct kvm_vcpu *vcpu, unsigned int inst_word),
2747799ba604af Tianrui Zhao 2023-02-28  60  	    TP_ARGS(vcpu, inst_word),
2747799ba604af Tianrui Zhao 2023-02-28  61  	    TP_STRUCT__entry(
2747799ba604af Tianrui Zhao 2023-02-28  62  			__field(unsigned int, inst_word)
2747799ba604af Tianrui Zhao 2023-02-28  63  	    ),
2747799ba604af Tianrui Zhao 2023-02-28  64  
2747799ba604af Tianrui Zhao 2023-02-28  65  	    TP_fast_assign(
2747799ba604af Tianrui Zhao 2023-02-28  66  			__entry->inst_word = inst_word;
2747799ba604af Tianrui Zhao 2023-02-28  67  	    ),
2747799ba604af Tianrui Zhao 2023-02-28  68  
2747799ba604af Tianrui Zhao 2023-02-28 @69  	    TP_printk("inst word: 0x%08lx",
2747799ba604af Tianrui Zhao 2023-02-28  70  		      __entry->inst_word)
2747799ba604af Tianrui Zhao 2023-02-28  71  );
2747799ba604af Tianrui Zhao 2023-02-28  72  
2747799ba604af Tianrui Zhao 2023-02-28  73
diff mbox series

Patch

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 9cc8b84f7eb0..424ad93927ce 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -142,6 +142,7 @@  config LOONGARCH
 	select USE_PERCPU_NUMA_NODE_ID
 	select USER_STACKTRACE_SUPPORT
 	select ZONE_DMA32
+	select HAVE_KVM
 
 config 32BIT
 	bool
@@ -541,3 +542,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 eb84cae642e5..9a6e31b43916 100644
--- a/arch/loongarch/configs/loongson3_defconfig
+++ b/arch/loongarch/configs/loongson3_defconfig
@@ -62,6 +62,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..42e9dcc18a07
--- /dev/null
+++ b/arch/loongarch/kvm/Makefile
@@ -0,0 +1,21 @@ 
+# 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