Revert "ANDROID: KVM: arm64: Allow userspace to receive SHARE and UNSHARE notifications"

This reverts commit 0b7e337baf.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Idfaa58fd19bbd63cd1c154b0db808a6010780cd6
This commit is contained in:
Will Deacon
2022-07-07 15:51:26 +01:00
parent e27735571c
commit 691a2f8a06
2 changed files with 1 additions and 10 deletions

View File

@@ -65,8 +65,7 @@ static DEFINE_PER_CPU(unsigned char, kvm_arm_hardware_enabled);
DEFINE_STATIC_KEY_FALSE(userspace_irqchip_in_use);
/* KVM "vendor" hypercalls which may be forwarded to userspace on request. */
#define KVM_EXIT_HYPERCALL_VALID_MASK (BIT(ARM_SMCCC_KVM_FUNC_MEM_SHARE) | \
BIT(ARM_SMCCC_KVM_FUNC_MEM_UNSHARE))
#define KVM_EXIT_HYPERCALL_VALID_MASK (0)
int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
{

View File

@@ -163,14 +163,6 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID:
kvm_ptp_get_time(vcpu, val);
break;
case ARM_SMCCC_VENDOR_HYP_KVM_MEM_SHARE_FUNC_ID:
if (!kvm_vcpu_exit_hcall(vcpu, ARM_SMCCC_KVM_FUNC_MEM_SHARE, 3))
return 0;
break;
case ARM_SMCCC_VENDOR_HYP_KVM_MEM_UNSHARE_FUNC_ID:
if (!kvm_vcpu_exit_hcall(vcpu, ARM_SMCCC_KVM_FUNC_MEM_UNSHARE, 3))
return 0;
break;
case ARM_SMCCC_TRNG_VERSION:
case ARM_SMCCC_TRNG_FEATURES:
case ARM_SMCCC_TRNG_GET_UUID: