ANDROID: GKI: enable options to run GKI as Microdroid guest

Starting with android15-6.6 we are planning to support running GKI as
Microdroid guest kernel to enable VM use cases that require loading
vendor-provided kernel modules into guest VM (e.g. device assignment).

Additionally adjust the rockpi4_gki.fragment to address the build
breakage caused by changes to the gki_defconfig.

Bug: 302467077
Test: see 613f7c1b2fef7ebe3edd1f89279cb40d2a7bf8fb
Change-Id: Ide66b713a0edee869264ee9dd1def5f21d28c862
Signed-off-by: Nikita Ioffe <[email protected]>

Author: nioffe

BUILD.bazel

@@ -531,7 +531,6 @@ copy_to_dist_dir(
 
 _ROCKPI4_MODULE_OUTS = [
     # keep sorted
-    "drivers/block/virtio_blk.ko",
     "drivers/char/hw_random/virtio-rng.ko",
     "drivers/clk/clk-rk808.ko",
     "drivers/cpufreq/cpufreq-dt.ko",
@@ -576,9 +575,7 @@ _ROCKPI4_MODULE_OUTS = [
     "drivers/thermal/rockchip_thermal.ko",
     "drivers/usb/host/ohci-hcd.ko",
     "drivers/usb/host/ohci-platform.ko",
-    "drivers/virtio/virtio_pci.ko",
     "drivers/virtio/virtio_pci_legacy_dev.ko",
-    "drivers/virtio/virtio_pci_modern_dev.ko",
     "net/core/failover.ko",
 ]
 

arch/arm64/configs/gki_defconfig

@@ -47,6 +47,7 @@ CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_RSEQ is not set
 CONFIG_PROFILING=y
+CONFIG_KEXEC_FILE=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_QCOM=y
@@ -272,6 +273,7 @@ CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
 CONFIG_BT=m
@@ -312,11 +314,14 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_UBLK=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_SRAM=y
 CONFIG_UID_SYS_STATS=y
+CONFIG_OPEN_DICE=m
+CONFIG_VCPU_STALL_DETECTOR=m
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
@@ -401,7 +406,9 @@ CONFIG_SERIAL_SPRD_CONSOLE=y
 CONFIG_NULL_TTY=y
 CONFIG_HVC_DCC=y
 CONFIG_SERIAL_DEV_BUS=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_CCTRNG=m
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVPORT is not set
 # CONFIG_I2C_COMPAT is not set
@@ -559,6 +566,9 @@ CONFIG_GUNYAH=y
 # CONFIG_GUNYAH_QCOM_PLATFORM is not set
 CONFIG_GUNYAH_IRQFD=y
 CONFIG_GUNYAH_IOEVENTFD=y
+CONFIG_VIRTIO_PCI=m
+# CONFIG_VIRTIO_PCI_LEGACY is not set
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
@@ -703,6 +713,7 @@ CONFIG_TRACE_MMIO_ACCESS=y
 CONFIG_CRC_CCITT=y
 CONFIG_XZ_DEC=y
 CONFIG_SWIOTLB_DYNAMIC=y
+CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y

arch/arm64/configs/rockpi4_gki.fragment

@@ -82,3 +82,4 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI_LEGACY=m

arch/x86/configs/gki_defconfig

@@ -52,6 +52,7 @@ CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_RSEQ is not set
 CONFIG_PROFILING=y
+CONFIG_KEXEC_FILE=y
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_HYPERVISOR_GUEST=y
@@ -266,6 +267,7 @@ CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
 CONFIG_BT=m
@@ -296,11 +298,13 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_UBLK=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_SRAM=y
 CONFIG_UID_SYS_STATS=y
+CONFIG_VCPU_STALL_DETECTOR=m
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
@@ -376,6 +380,7 @@ CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_NULL_TTY=y
 CONFIG_SERIAL_DEV_BUS=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_DEVMEM is not set
@@ -514,6 +519,8 @@ CONFIG_DMABUF_SYSFS_STATS=y
 CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
 CONFIG_DMABUF_HEAPS_PAGE_POOL=y
 CONFIG_UIO=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y

modules.bzl

@@ -8,11 +8,14 @@ This module contains a full list of kernel modules
 
 _COMMON_GKI_MODULES_LIST = [
     # keep sorted
+    "drivers/block/virtio_blk.ko",
     "drivers/block/zram/zram.ko",
     "drivers/bluetooth/btbcm.ko",
     "drivers/bluetooth/btqca.ko",
     "drivers/bluetooth/btsdio.ko",
     "drivers/bluetooth/hci_uart.ko",
+    "drivers/char/virtio_console.ko",
+    "drivers/misc/vcpu_stall_detector.ko",
     "drivers/net/can/dev/can-dev.ko",
     "drivers/net/can/slcan/slcan.ko",
     "drivers/net/can/vcan.ko",
@@ -42,6 +45,9 @@ _COMMON_GKI_MODULES_LIST = [
     "drivers/usb/mon/usbmon.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
+    "drivers/virtio/virtio_balloon.ko",
+    "drivers/virtio/virtio_pci.ko",
+    "drivers/virtio/virtio_pci_modern_dev.ko",
     "kernel/kheaders.ko",
     "lib/crypto/libarc4.ko",
     "mm/zsmalloc.ko",
@@ -73,6 +79,7 @@ _COMMON_GKI_MODULES_LIST = [
     "net/rfkill/rfkill.ko",
     "net/tipc/diag.ko",
     "net/tipc/tipc.ko",
+    "net/vmw_vsock/vmw_vsock_virtio_transport.ko",
 ]
 
 # Deprecated - Use `get_gki_modules_list` function instead.
@@ -86,6 +93,8 @@ _ARM_GKI_MODULES_LIST = [
 _ARM64_GKI_MODULES_LIST = [
     # keep sorted
     "arch/arm64/geniezone/gzvm.ko",
+    "drivers/char/hw_random/cctrng.ko",
+    "drivers/misc/open-dice.ko",
     "drivers/ptp/ptp_kvm.ko",
 ]
 
@@ -97,6 +106,7 @@ _X86_GKI_MODULES_LIST = [
 _X86_64_GKI_MODULES_LIST = [
     # keep sorted
     "drivers/ptp/ptp_kvm.ko",
+    "drivers/virtio/virtio_pci_legacy_dev.ko",
 ]
 
 # buildifier: disable=unnamed-macro