From: Gavin Shan <gshan@redhat.com>
To: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org, pbonzini@redhat.com,
maz@kernel.org, james.morse@arm.com, Jonathan.Cameron@huawei.com,
mark.rutland@arm.com, will@kernel.org, shan.gavin@gmail.com
Subject: [PATCH v2 06/17] KVM: arm64: Advertise KVM UID to guests via SMCCC
Date: Tue, 9 Feb 2021 13:03:52 +0800 [thread overview]
Message-ID: <20210209050403.103143-7-gshan@redhat.com> (raw)
In-Reply-To: <20210209050403.103143-1-gshan@redhat.com>
From: Will Deacon <will@kernel.org>
We can advertise ourselves to guests as KVM and provide a basic features
bitmap for discoverability of future hypervisor services.
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/kvm/hypercalls.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index a54c4805f2a6..e02e29a12bbf 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -12,13 +12,13 @@
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
{
u32 func_id = smccc_get_function(vcpu);
- long val = SMCCC_RET_NOT_SUPPORTED;
+ long val[4] = { SMCCC_RET_NOT_SUPPORTED };
u32 feature;
gpa_t gpa;
switch (func_id) {
case ARM_SMCCC_VERSION_FUNC_ID:
- val = ARM_SMCCC_VERSION_1_1;
+ val[0] = ARM_SMCCC_VERSION_1_1;
break;
case ARM_SMCCC_ARCH_FEATURES_FUNC_ID:
feature = smccc_get_arg1(vcpu);
@@ -28,10 +28,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
case SPECTRE_VULNERABLE:
break;
case SPECTRE_MITIGATED:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
case SPECTRE_UNAFFECTED:
- val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
+ val[0] = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED;
break;
}
break;
@@ -54,22 +54,31 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
break;
fallthrough;
case SPECTRE_UNAFFECTED:
- val = SMCCC_RET_NOT_REQUIRED;
+ val[0] = SMCCC_RET_NOT_REQUIRED;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = SMCCC_RET_SUCCESS;
+ val[0] = SMCCC_RET_SUCCESS;
break;
}
break;
case ARM_SMCCC_HV_PV_TIME_FEATURES:
- val = kvm_hypercall_pv_features(vcpu);
+ val[0] = kvm_hypercall_pv_features(vcpu);
break;
case ARM_SMCCC_HV_PV_TIME_ST:
gpa = kvm_init_stolen_time(vcpu);
if (gpa != GPA_INVALID)
- val = gpa;
+ val[0] = gpa;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID:
+ val[0] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0;
+ val[1] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1;
+ val[2] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2;
+ val[3] = ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3;
+ break;
+ case ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID:
+ val[0] = BIT(ARM_SMCCC_KVM_FUNC_FEATURES);
break;
case SDEI_1_0_FN_SDEI_VERSION:
case SDEI_1_0_FN_SDEI_EVENT_REGISTER:
@@ -93,6 +102,6 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
return kvm_psci_call(vcpu);
}
- smccc_set_retval(vcpu, val, 0, 0, 0);
+ smccc_set_retval(vcpu, val[0], val[1], val[2], val[3]);
return 1;
}
--
2.23.0
next prev parent reply other threads:[~2021-02-09 5:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 5:03 [PATCH v2 00/17] Support Asynchronous Page Fault Gavin Shan
2021-02-09 5:03 ` [PATCH v2 01/17] KVM: async_pf: Move struct kvm_async_pf around Gavin Shan
2021-02-09 5:03 ` [PATCH v2 02/17] KVM: async_pf: Add helper function to check completion queue Gavin Shan
2021-02-09 5:03 ` [PATCH v2 03/17] KVM: async_pf: Make GFN slot management generic Gavin Shan
2021-02-09 5:03 ` [PATCH v2 04/17] KVM: x86: Use generic async PF slot management Gavin Shan
2021-02-09 5:03 ` [PATCH v2 05/17] arm64: Probe for the presence of KVM hypervisor services during boot Gavin Shan
2021-02-09 5:03 ` Gavin Shan [this message]
2021-02-09 5:03 ` [PATCH v2 07/17] KVM: arm64: Export kvm_handle_user_mem_abort() Gavin Shan
2021-02-09 5:03 ` [PATCH v2 08/17] KVM: arm64: Add paravirtualization header files Gavin Shan
2021-02-09 5:03 ` [PATCH v2 09/17] KVM: arm64: Support page-not-present notification Gavin Shan
2021-02-09 5:03 ` [PATCH v2 10/17] KVM: arm64: Support page-ready notification Gavin Shan
2021-02-09 5:03 ` [PATCH v2 11/17] KVM: arm64: Support async PF hypercalls Gavin Shan
2021-02-09 5:03 ` [PATCH v2 12/17] KVM: arm64: Support async PF ioctl commands Gavin Shan
2021-02-09 5:03 ` [PATCH v2 13/17] KVM: arm64: Export async PF capability Gavin Shan
2021-02-09 5:04 ` [PATCH v2 14/17] arm64: Detect async PF para-virtualization feature Gavin Shan
2021-02-09 5:04 ` [PATCH v2 15/17] arm64: Reschedule process on aync PF Gavin Shan
2021-02-09 5:04 ` [PATCH v2 16/17] arm64: Enable async PF Gavin Shan
2021-02-09 5:04 ` [PATCH v2 17/17] KVM: arm64: Add async PF document Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210209050403.103143-7-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=james.morse@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®