From 6a79462cdb93b0dc9b604e95ccc86f29fa2a09b4 Mon Sep 17 00:00:00 2001 From: wangkaiyuan Date: Wed, 13 Aug 2025 14:39:08 +0800 Subject: [PATCH] anolis: kvm: modify CONFIG_KVM to y on arm64 ANBZ: #23560 On some ARM64 machines, the vhe feature is not supported. If the kvm module config is set to m, which causes the kvm module to fail to load. Signed-off-by: wangkaiyuan --- anolis/configs/L0-MANDATORY/arm64/CONFIG_KVM | 1 + anolis/configs/L0-MANDATORY/{default => loongarch}/CONFIG_KVM | 0 anolis/configs/L0-MANDATORY/riscv/CONFIG_KVM | 1 + anolis/configs/L0-MANDATORY/x86/CONFIG_KVM | 1 + anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_ARM_HOST_VHE_ONLY | 1 - anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_EXPORT_SYMBOL | 1 - anolis/configs/L1-RECOMMEND/arm64/CONFIG_NVHE_EL2_DEBUG | 1 + anolis/configs/L2-OPTIONAL/arm64/CONFIG_IRQ_BYPASS_MANAGER | 1 + .../L2-OPTIONAL/{default => loongarch}/CONFIG_IRQ_BYPASS_MANAGER | 0 anolis/configs/L2-OPTIONAL/riscv/CONFIG_IRQ_BYPASS_MANAGER | 1 + anolis/configs/L2-OPTIONAL/sw_64-6b/CONFIG_IRQ_BYPASS_MANAGER | 1 + anolis/configs/L2-OPTIONAL/sw_64-8a/CONFIG_IRQ_BYPASS_MANAGER | 1 + anolis/configs/L2-OPTIONAL/x86/CONFIG_IRQ_BYPASS_MANAGER | 1 + 13 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 anolis/configs/L0-MANDATORY/arm64/CONFIG_KVM rename anolis/configs/L0-MANDATORY/{default => loongarch}/CONFIG_KVM (100%) create mode 100644 anolis/configs/L0-MANDATORY/riscv/CONFIG_KVM create mode 100644 anolis/configs/L0-MANDATORY/x86/CONFIG_KVM delete mode 100644 anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_ARM_HOST_VHE_ONLY delete mode 100644 anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_EXPORT_SYMBOL create mode 100644 anolis/configs/L1-RECOMMEND/arm64/CONFIG_NVHE_EL2_DEBUG create mode 100644 anolis/configs/L2-OPTIONAL/arm64/CONFIG_IRQ_BYPASS_MANAGER rename anolis/configs/L2-OPTIONAL/{default => loongarch}/CONFIG_IRQ_BYPASS_MANAGER (100%) create mode 100644 anolis/configs/L2-OPTIONAL/riscv/CONFIG_IRQ_BYPASS_MANAGER create mode 100644 anolis/configs/L2-OPTIONAL/sw_64-6b/CONFIG_IRQ_BYPASS_MANAGER create mode 100644 anolis/configs/L2-OPTIONAL/sw_64-8a/CONFIG_IRQ_BYPASS_MANAGER create mode 100644 anolis/configs/L2-OPTIONAL/x86/CONFIG_IRQ_BYPASS_MANAGER diff --git a/anolis/configs/L0-MANDATORY/arm64/CONFIG_KVM b/anolis/configs/L0-MANDATORY/arm64/CONFIG_KVM new file mode 100644 index 000000000000..14f90d8d6801 --- /dev/null +++ b/anolis/configs/L0-MANDATORY/arm64/CONFIG_KVM @@ -0,0 +1 @@ +CONFIG_KVM=y diff --git a/anolis/configs/L0-MANDATORY/default/CONFIG_KVM b/anolis/configs/L0-MANDATORY/loongarch/CONFIG_KVM similarity index 100% rename from anolis/configs/L0-MANDATORY/default/CONFIG_KVM rename to anolis/configs/L0-MANDATORY/loongarch/CONFIG_KVM diff --git a/anolis/configs/L0-MANDATORY/riscv/CONFIG_KVM b/anolis/configs/L0-MANDATORY/riscv/CONFIG_KVM new file mode 100644 index 000000000000..cf9bf67a6a49 --- /dev/null +++ b/anolis/configs/L0-MANDATORY/riscv/CONFIG_KVM @@ -0,0 +1 @@ +CONFIG_KVM=m diff --git a/anolis/configs/L0-MANDATORY/x86/CONFIG_KVM b/anolis/configs/L0-MANDATORY/x86/CONFIG_KVM new file mode 100644 index 000000000000..cf9bf67a6a49 --- /dev/null +++ b/anolis/configs/L0-MANDATORY/x86/CONFIG_KVM @@ -0,0 +1 @@ +CONFIG_KVM=m diff --git a/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_ARM_HOST_VHE_ONLY b/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_ARM_HOST_VHE_ONLY deleted file mode 100644 index 34bf688735ec..000000000000 --- a/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_ARM_HOST_VHE_ONLY +++ /dev/null @@ -1 +0,0 @@ -CONFIG_KVM_ARM_HOST_VHE_ONLY=y diff --git a/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_EXPORT_SYMBOL b/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_EXPORT_SYMBOL deleted file mode 100644 index a5548e411e76..000000000000 --- a/anolis/configs/L1-RECOMMEND/arm64/CONFIG_KVM_EXPORT_SYMBOL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_KVM_EXPORT_SYMBOL=y diff --git a/anolis/configs/L1-RECOMMEND/arm64/CONFIG_NVHE_EL2_DEBUG b/anolis/configs/L1-RECOMMEND/arm64/CONFIG_NVHE_EL2_DEBUG new file mode 100644 index 000000000000..4b6b822e4808 --- /dev/null +++ b/anolis/configs/L1-RECOMMEND/arm64/CONFIG_NVHE_EL2_DEBUG @@ -0,0 +1 @@ +# CONFIG_NVHE_EL2_DEBUG is not set diff --git a/anolis/configs/L2-OPTIONAL/arm64/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/arm64/CONFIG_IRQ_BYPASS_MANAGER new file mode 100644 index 000000000000..b10c64ccdb3a --- /dev/null +++ b/anolis/configs/L2-OPTIONAL/arm64/CONFIG_IRQ_BYPASS_MANAGER @@ -0,0 +1 @@ +CONFIG_IRQ_BYPASS_MANAGER=y diff --git a/anolis/configs/L2-OPTIONAL/default/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/loongarch/CONFIG_IRQ_BYPASS_MANAGER similarity index 100% rename from anolis/configs/L2-OPTIONAL/default/CONFIG_IRQ_BYPASS_MANAGER rename to anolis/configs/L2-OPTIONAL/loongarch/CONFIG_IRQ_BYPASS_MANAGER diff --git a/anolis/configs/L2-OPTIONAL/riscv/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/riscv/CONFIG_IRQ_BYPASS_MANAGER new file mode 100644 index 000000000000..c7d0aceb3588 --- /dev/null +++ b/anolis/configs/L2-OPTIONAL/riscv/CONFIG_IRQ_BYPASS_MANAGER @@ -0,0 +1 @@ +CONFIG_IRQ_BYPASS_MANAGER=m diff --git a/anolis/configs/L2-OPTIONAL/sw_64-6b/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/sw_64-6b/CONFIG_IRQ_BYPASS_MANAGER new file mode 100644 index 000000000000..c7d0aceb3588 --- /dev/null +++ b/anolis/configs/L2-OPTIONAL/sw_64-6b/CONFIG_IRQ_BYPASS_MANAGER @@ -0,0 +1 @@ +CONFIG_IRQ_BYPASS_MANAGER=m diff --git a/anolis/configs/L2-OPTIONAL/sw_64-8a/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/sw_64-8a/CONFIG_IRQ_BYPASS_MANAGER new file mode 100644 index 000000000000..c7d0aceb3588 --- /dev/null +++ b/anolis/configs/L2-OPTIONAL/sw_64-8a/CONFIG_IRQ_BYPASS_MANAGER @@ -0,0 +1 @@ +CONFIG_IRQ_BYPASS_MANAGER=m diff --git a/anolis/configs/L2-OPTIONAL/x86/CONFIG_IRQ_BYPASS_MANAGER b/anolis/configs/L2-OPTIONAL/x86/CONFIG_IRQ_BYPASS_MANAGER new file mode 100644 index 000000000000..c7d0aceb3588 --- /dev/null +++ b/anolis/configs/L2-OPTIONAL/x86/CONFIG_IRQ_BYPASS_MANAGER @@ -0,0 +1 @@ +CONFIG_IRQ_BYPASS_MANAGER=m -- Gitee