diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 85ac1e83f747b16017358ff119c84de5fc4301be..e3821be64a22fed210fae39b68b6e4c720918621 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2183,6 +2183,16 @@ config ARM64_MTE
 
 endmenu # "ARMv8.5 architectural features"
 
+menu "ARMv8.6 architectural features"
+
+config ARM64_TWED
+	bool "Enable support for delayed trapping of WFE"
+	default y
+	help
+	  Delayed Trapping of WFE (part of the ARMv8.6 Extensions)
+
+endmenu
+
 menu "ARMv8.7 architectural features"
 
 config ARM64_EPAN
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index eb65de2f5a09756c247982ecd278703d91d2fd48..eec1886d07e900ea5a3bf0271f2e500c215adaa8 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -533,6 +533,12 @@ CONFIG_ARM64_AS_HAS_MTE=y
 # CONFIG_ARM64_MTE is not set
 # end of ARMv8.5 architectural features
 
+#
+# ARMv8.6 architectural features
+#
+CONFIG_ARM64_TWED=y
+# end of ARMv8.6 architectural features
+
 #
 # ARMv8.7 architectural features
 #
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 2d8b243a86cd4aea48744f0563996b6872f45d18..9385293e6d455534b6f0be11a7466bd9b85a3c5e 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -14,6 +14,7 @@
 
 /* Hyp Configuration Register (HCR) bits */
 
+#define HCR_TWEDEN	(UL(1) << 59)
 #define HCR_TID5	(UL(1) << 58)
 #define HCR_DCT		(UL(1) << 57)
 #define HCR_ATA_SHIFT	56
@@ -74,6 +75,12 @@
 #define HCR_VM		(UL(1) << 0)
 #define HCR_RES0	((UL(1) << 48) | (UL(1) << 39))
 
+#ifdef CONFIG_ARM64_TWED
+#define HCR_TWEDEL_SHIFT	60
+#define HCR_TWEDEL_MAX		(UL(0xf))
+#define HCR_TWEDEL_MASK		(HCR_TWEDEL_MAX << HCR_TWEDEL_SHIFT)
+#endif
+
 /*
  * The bits we set in HCR:
  * TLOR:	Trap LORegion register accesses
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 3d6725ff0bf6d24577c84c6814fcc814b0681fb8..c3fadbaac86f5f97f63cb7f644321906945af905 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -124,6 +124,26 @@ static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)
 	vcpu->arch.hcr_el2 |= HCR_TWI;
 }
 
+#ifdef CONFIG_ARM64_TWED
+static inline void vcpu_set_twed(struct kvm_vcpu *vcpu)
+{
+	if (!cpus_have_const_cap(ARM64_HAS_TWED))
+		return;
+
+	if (twed_enable) {
+		u64 delay = (u64)twe_delay;
+		delay = (delay > HCR_TWEDEL_MAX) ? HCR_TWEDEL_MAX : delay;
+
+		vcpu->arch.hcr_el2 |= FIELD_PREP(HCR_TWEDEL_MASK, delay);
+		vcpu->arch.hcr_el2 |= HCR_TWEDEN;
+	} else {
+		vcpu->arch.hcr_el2 &= ~HCR_TWEDEN;
+	}
+}
+#else
+static inline void vcpu_set_twed(struct kvm_vcpu *vcpu) {}
+#endif
+
 static inline void vcpu_ptrauth_enable(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 |= (HCR_API | HCR_APK);
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index af06ccb7ee343304535c30b8855d6de8d8b1f4fc..cf640d16d6af1f3e705b3f9a90af91ae2e2e3089 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -1151,6 +1151,11 @@ void __init kvm_hyp_reserve(void);
 static inline void kvm_hyp_reserve(void) { }
 #endif
 
+#ifdef CONFIG_ARM64_TWED
+extern bool twed_enable;
+extern unsigned int twe_delay;
+#endif
+
 void kvm_arm_vcpu_power_off(struct kvm_vcpu *vcpu);
 bool kvm_arm_vcpu_stopped(struct kvm_vcpu *vcpu);
 
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 9410e4a032dd50a988d6dbfa761548c4b1a23b52..a51aa8e6a92c8414339c7878e2a1d31c2ef738d8 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2791,6 +2791,15 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
 		.cpu_enable = cpu_enable_mpam,
 		ARM64_CPUID_FIELDS(ID_AA64PFR0_EL1, MPAM, 1)
 	},
+#endif
+#ifdef CONFIG_ARM64_TWED
+	{
+		.desc = "Delayed Trapping of WFE",
+		.capability = ARM64_HAS_TWED,
+		.type = ARM64_CPUCAP_SYSTEM_FEATURE,
+		.matches = has_cpuid_feature,
+		ARM64_CPUID_FIELDS(ID_AA64MMFR1_EL1, TWED, IMP)
+	},
 #endif
 	{},
 };
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 4866b3f7b4ea3847d885e00cfac47a4d7abf9da3..02af6e6e8bfd5c5cb198fa779f6f97a1a70f5c51 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -64,6 +64,14 @@ bool is_kvm_arm_initialised(void)
 	return kvm_arm_initialised;
 }
 
+#ifdef CONFIG_ARM64_TWED
+bool twed_enable;
+module_param(twed_enable, bool, 0644);
+
+unsigned int twe_delay;
+module_param(twe_delay, uint, 0644);
+#endif
+
 int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
 {
 	return kvm_vcpu_exiting_guest_mode(vcpu) == IN_GUEST_MODE;
@@ -983,6 +991,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
 		kvm_arm_setup_debug(vcpu);
 		kvm_arch_vcpu_ctxflush_fp(vcpu);
 
+		vcpu_set_twed(vcpu);
+
 		/**************************************************************
 		 * Enter the guest
 		 */
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps
index c60a603d2cfe27042b99c497cfe293f1ad111e3e..30b0cdaeb192ea0afb0f8062173f7ce4c26d3302 100644
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@ -50,6 +50,7 @@ HAS_STAGE2_FWB
 HAS_TCR2
 HAS_TIDCP1
 HAS_TLB_RANGE
+HAS_TWED
 HAS_VIRT_HOST_EXTN
 HAS_WFXT
 HW_DBM