diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 4932a6be9d6fb52607e9c89f9de17d33bc47d352..84229711848d684fd1eb3c2a9ec56a58e95b3b8b 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -756,6 +756,7 @@ CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_HISI_VIRT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
+CONFIG_CVM_HOST=y
 # CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y
 CONFIG_ARCH_VCPU_STAT=y
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index abe581982a7597243b0c1730bb8e27bcbbec04e1..66c0bb96f00796a130a149578bdd35386fa49246 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -27,6 +27,9 @@
 #include <asm/fpsimd.h>
 #include <asm/kvm.h>
 #include <asm/kvm_asm.h>
+#ifdef CONFIG_CVM_HOST
+#include <asm/kvm_tmm.h>
+#endif
 
 #define __KVM_HAVE_ARCH_INTC_INITIALIZED
 
@@ -288,6 +291,11 @@ struct kvm_arch {
 	cpumask_var_t sched_cpus;	/* Union of all vcpu's cpus_ptr */
 	u64 tlbi_dvmbm;
 #endif
+
+#ifdef CONFIG_CVM_HOST
+	struct cvm cvm;
+	bool is_cvm;
+#endif
 };
 
 struct kvm_vcpu_fault_info {
@@ -613,6 +621,10 @@ struct kvm_vcpu_arch {
 	cpumask_var_t sched_cpus;
 	cpumask_var_t pre_sched_cpus;
 #endif
+
+#ifdef CONFIG_CVM_HOST
+	struct cvm_tec tec;
+#endif
 };
 
 /*
diff --git a/arch/arm64/include/asm/kvm_tmm.h b/arch/arm64/include/asm/kvm_tmm.h
new file mode 100644
index 0000000000000000000000000000000000000000..f70d73be034b2214a785427c6166458110c6ab36
--- /dev/null
+++ b/arch/arm64/include/asm/kvm_tmm.h
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2024, The Linux Foundation. All rights reserved.
+ */
+#ifndef __ASM_KVM_TMM_H
+#define __ASM_KVM_TMM_H
+
+#include <uapi/linux/kvm.h>
+
+enum cvm_state {
+	CVM_STATE_NONE,
+	CVM_STATE_NEW,
+	CVM_STATE_ACTIVE,
+	CVM_STATE_DYING
+};
+
+/*
+ * Many of these fields are smaller than u64 but all fields have u64
+ * alignment, so use u64 to ensure correct alignment.
+ */
+struct tmi_cvm_params {
+	u64	flags;
+	u64	s2sz;
+	u64	sve_vl;
+	u64	num_bps;
+	u64	num_wps;
+	u64	pmu_num_cnts;
+	u64	measurement_algo;
+	u64	vmid;
+	u64	ns_vtcr;
+	u64	vttbr_el2;
+	u64	ttt_base;
+	s64	ttt_level_start;
+	u64	ttt_num_start;
+	u8	rpv[64]; /* Bits 512 */
+};
+
+struct cvm {
+	enum cvm_state state;
+	u32 cvm_vmid;
+	u64 rd;
+	u64 loader_start;
+	u64 initrd_start;
+	u64 initrd_size;
+	u64 ram_size;
+	struct kvm_numa_info numa_info;
+	struct tmi_cvm_params *params;
+	bool is_cvm;
+};
+
+/*
+ * struct cvm_tec - Additional per VCPU data for a CVM
+ */
+struct cvm_tec {
+	u64 tec;
+	bool tec_created;
+	void *tec_run;
+};
+
+int kvm_init_tmm(void);
+int kvm_cvm_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap);
+int kvm_init_cvm_vm(struct kvm *kvm);
+void kvm_destroy_cvm(struct kvm *kvm);
+int kvm_create_tec(struct kvm_vcpu *vcpu);
+void kvm_destroy_tec(struct kvm_vcpu *vcpu);
+int kvm_tec_enter(struct kvm_vcpu *vcpu);
+int handle_cvm_exit(struct kvm_vcpu *vcpu, int rec_run_status);
+int kvm_arm_create_cvm(struct kvm *kvm);
+void kvm_free_rd(struct kvm *kvm);
+int cvm_create_rd(struct kvm *kvm);
+int cvm_psci_complete(struct kvm_vcpu *calling, struct kvm_vcpu *target);
+int kvm_arch_tec_init(struct kvm_vcpu *vcpu);
+
+void kvm_cvm_unmap_destroy_range(struct kvm *kvm);
+
+#define CVM_TTT_BLOCK_LEVEL 2
+#define CVM_TTT_MAX_LEVEL   3
+
+#define CVM_PAGE_SHIFT		12
+#define CVM_PAGE_SIZE		BIT(CVM_PAGE_SHIFT)
+#define CVM_TTT_LEVEL_SHIFT(l)	\
+	((CVM_PAGE_SHIFT - 3) * (4 - (l)) + 3)
+#define CVM_L2_BLOCK_SIZE	BIT(CVM_TTT_LEVEL_SHIFT(2))
+
+static inline unsigned long cvm_ttt_level_mapsize(int level)
+{
+	if (WARN_ON(level > CVM_TTT_BLOCK_LEVEL))
+		return CVM_PAGE_SIZE;
+
+	return (1UL << CVM_TTT_LEVEL_SHIFT(level));
+}
+
+#endif
diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index ec8e01f96d6993c778f7cfc6c4aa24098f3c7ee6..1fa6fba6077c884410099375676a427f43fbb691 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -49,6 +49,14 @@ menuconfig KVM
 
 	  If unsure, say N.
 
+config CVM_HOST
+	bool "Enable cvm host feature"
+	depends on KVM
+	help
+	  Support CVM based on S-EL2
+
+	  If unsure, say N.
+
 config NVHE_EL2_DEBUG
 	bool "Debug mode for non-VHE EL2 object"
 	depends on KVM
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index d2ab4a3d69934ad3f776825a3590886dfcb3387f..68f08c5267f62163b206f5eec1801bdcd620ddfc 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1477,6 +1477,23 @@ struct kvm_master_dev_info {
 	struct kvm_msi msi[];
 };
 
+#define MAX_NUMA_NODE 8
+#define MAX_CPU_BIT_MAP 4
+#define MAX_NUMA_BIT_MAP 2
+
+struct kvm_numa_node {
+	__u64 numa_id;
+	__u64 ipa_start;
+	__u64 ipa_size;
+	__u64 host_numa_nodes[MAX_NUMA_BIT_MAP];
+	__u64 cpu_id[MAX_CPU_BIT_MAP];
+};
+
+struct kvm_numa_info {
+	__u64 numa_cnt;
+	struct kvm_numa_node numa_nodes[MAX_NUMA_NODE];
+};
+
 /*
  * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
  * a vcpu fd.