diff --git a/resources/guest_configs/virtio-mem.config b/resources/guest_configs/virtio-mem.config new file mode 100644 index 00000000000..50670ae5db7 --- /dev/null +++ b/resources/guest_configs/virtio-mem.config @@ -0,0 +1,2 @@ +CONFIG_VIRTIO_MEM=y +CONFIG_STRICT_DEVMEM=y diff --git a/resources/guest_configs/virtio-pmem.config b/resources/guest_configs/virtio-pmem.config new file mode 100644 index 00000000000..3591ba0ef43 --- /dev/null +++ b/resources/guest_configs/virtio-pmem.config @@ -0,0 +1,22 @@ +# Needed for DAX on aarch64. Will be ignored on x86_64 +CONFIG_ARM64_PMEM=y + +CONFIG_DEVICE_MIGRATION=y +CONFIG_ZONE_DEVICE=y +CONFIG_VIRTIO_PMEM=y +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=y +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=y +CONFIG_BTT=y +CONFIG_ND_PFN=y +CONFIG_NVDIMM_PFN=y +CONFIG_NVDIMM_DAX=y +CONFIG_OF_PMEM=y +CONFIG_NVDIMM_KEYS=y +CONFIG_DAX=y +CONFIG_DEV_DAX=y +CONFIG_DEV_DAX_PMEM=y +CONFIG_DEV_DAX_KMEM=y +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y diff --git a/resources/rebuild.sh b/resources/rebuild.sh index 38313b6d0f0..6c0cf247e68 100755 --- a/resources/rebuild.sh +++ b/resources/rebuild.sh @@ -248,15 +248,17 @@ function build_al_kernels { CI_CONFIG="$PWD/guest_configs/ci.config" PCIE_CONFIG="$PWD/guest_configs/pcie.config" + PMEM_CONFIG="$PWD/guest_configs/virtio-pmem.config" + MEM_CONFIG="$PWD/guest_configs/virtio-mem.config" if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then - build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" + build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" fi if [[ $ARCH == "x86_64" && "$KERNEL_VERSION" == @(all|5.10-no-acpi) ]]; then - build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" + build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" fi if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then - build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" + build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" fi # Build debug kernels @@ -265,11 +267,11 @@ function build_al_kernels { OUTPUT_DIR=$OUTPUT_DIR/debug mkdir -pv $OUTPUT_DIR if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then - build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG" + build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG" vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-5.10.* fi if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then - build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG" + build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$MEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG" vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-6.1.* fi }