target/i386/sev: add support to query the attestation report
PATCH v3 1/1 target/i386/sev: add support to query the attestation report
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the LAUNCH_UPDATE and sign it with the PEK.
Note, we already have a command (LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through the LAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike the LAUNCH_MEASURE command the ATTESATION_REPORT command can be called while the guest is running.
Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
---
v3:
* free the buffer in error path.
v2:
* add trace event.
* fix the goto to return NULL on failure.
* make the mnonce as a base64 encoded string
linux-headers/linux/kvm.h | 8 +++++ qapi/misc-target.json | 38 ++++++++++++++++++++++ target/i386/monitor.c | 6 ++++ target/i386/sev-stub.c | 7 ++++ target/i386/sev.c | 67 +++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 2 ++ target/i386/trace-events | 1 + 7 files changed, 129 insertions(+)
linux-headers/linux/kvm.h +8 -0
@@ -1591,6 +1591,8 @@ enum sev_cmd_id {KVM_SEV_DBG_ENCRYPT ,/* Guest certificates commands */ KVM_SEV_CERT_EXPORT , +/* Attestation report */ +KVM_SEV_GET_ATTESTATION_REPORT , KVM_SEV_NR_MAX, };
@@ -1643,6 +1645,12 @@ struct kvm_sev_dbg {__u32 len; }; +struct kvm_sev_attestation_report { +__u8 mnonce[16 ]; +__u64 uaddr; +__u32 len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
qapi/misc-target.json +38 -0
@@ -285,3 +285,41 @@ ## { 'command': 'query-gic-capabilities', 'returns': ['GICCapability'], 'if': 'defined(TARGET_ARM)' } + + +## +# @SevAttestationReport: +# +# The struct describes attestation report for a Secure Encrypted Virtualization +# feature. +# +# @data: guest attestation report (base64 encoded) +# +# +# Since: 6.1 +## +{ 'struct': 'SevAttestationReport', + 'data': { 'data': 'str'}, + 'if': 'defined(TARGET_I386)' } + +## +# @query-sev-attestation-report: +# +# This command is used to get the SEV attestation report, and is supported on AMD +# X86 platforms only. +# +# @mnonce: a random 16 bytes value encoded in base64 (it will be included in report) +# +# Returns: SevAttestationReport objects. +# +# Since: 6.1 +# +# Example: +# +# -> { "execute" : "query-sev-attestation-report", "arguments": { "mnonce": "aaaaaaa" } } +# <- { "return" : { "data": "aaaaaaaabbbddddd"} } +# +## +{ 'command': 'query-sev-attestation-report', 'data': { 'mnonce': 'str' }, + 'returns': 'SevAttestationReport', + 'if': 'defined(TARGET_I386)' }
target/i386/monitor.c +6 -0
@@ -757,3 +757,9 @@ void qmp_sev_inject_launch_secret(const char *packet_hdr,sev_inject_launch_secret (packet_hdr, secret, gpa, errp); } + +SevAttestationReport * +qmp_query_sev_attestation_report (const char *mnonce,Error **errp) +{ +return sev_get_attestation_report (mnonce, errp); +}
target/i386/sev-stub.c +7 -0
@@ -74,3 +74,10 @@ int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size) {abort (); } + +SevAttestationReport * +sev_get_attestation_report (const char *mnonce,Error **errp) +{ +error_setg (errp,"SEV is not available in this QEMU" ); +return NULL ; +}
target/i386/sev.c +67 -0
73 lines not on this page · raw message
target/i386/sev_i386.h +2 -0
@@ -35,5 +35,7 @@ extern uint32_t sev_get_cbit_position(void);extern uint32_t sev_get_reduced_phys_bits (void );extern char *sev_get_launch_measurement (void );extern SevCapability *sev_get_capabilities (Error **errp); +extern SevAttestationReport * +sev_get_attestation_report (const char *mnonce,Error **errp);#endif
target/i386/trace-events +1 -0
@@ -10,3 +10,4 @@ kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64 kvm_sev_launch_measurement(const char *value) "data %s" kvm_sev_launch_finish(void) "" kvm_sev_launch_secret(uint64_t hpa, uint64_t hva, uint64_t secret, int len) "hpa 0x%" PRIx64 " hva 0x%" PRIx64 " data 0x%" PRIx64 " len %d" +kvm_sev_attestation_report(const char *mnonce, const char *data) "mnonce %s data %s"
Signature · 1 line
2.17.1
Quoted 9 lines · Brijesh Singh
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the
LAUNCH_UPDATEand sign it with the PEK.Note, we already have a command (
LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through theLAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike theLAUNCH_MEASUREcommand theATTESATION_REPORTcommand can be called while the guest
typo: 'ATTESATION_REPORT'
Quoted 5 lines
is running.
Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
Quoted 8 lines
Cc James Bottomley <[email protected]>Cc Tom Lendacky <[email protected]>Cc Eric Blake <[email protected]>Cc Paolo Bonzini <[email protected]>Reviewed-by James Bottomley <[email protected]>Tested-by James Bottomley <[email protected]>Signed-off-by Brijesh Singh <[email protected]>
Looks good to me!
Hi,
Ping. Please let me know if you have any feedback on this patch.
Thanks
Quoted 240 lines · Brijesh Singh
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the
LAUNCH_UPDATEand sign it with the PEK.Note, we already have a command (
LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through theLAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike theLAUNCH_MEASUREcommand theATTESATION_REPORTcommand can be called while the guest is running.Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
Cc James Bottomley <[email protected]>Cc Tom Lendacky <[email protected]>Cc Eric Blake <[email protected]>Cc Paolo Bonzini <[email protected]>Reviewed-by James Bottomley <[email protected]>Tested-by James Bottomley <[email protected]>Signed-off-by Brijesh Singh <[email protected]>---
v3:
* free the buffer in error path.v2:
* add trace event.
* fix the goto to return NULL on failure.
* make the mnonce as a base64 encoded stringlinux-headers/linux/kvm.h | 8 +++++ qapi/misc-target.json | 38 ++++++++++++++++++++++ target/i386/monitor.c | 6 ++++ target/i386/sev-stub.c | 7 ++++ target/i386/sev.c | 67 +++++++++++++++++++++++++++++++++++++++ target/i386/sev_i386.h | 2 ++ target/i386/trace-events | 1 + 7 files changed, 129 insertions(+)linux-headers/linux/kvm.h +8
-0@@ -1591,6 +1591,8 @@ enum sev_cmd_id {KVM_SEV_DBG_ENCRYPT ,/* Guest certificates commands */ KVM_SEV_CERT_EXPORT , +/* Attestation report */ +KVM_SEV_GET_ATTESTATION_REPORT , KVM_SEV_NR_MAX, };@@ -1643,6 +1645,12 @@ struct kvm_sev_dbg {__u32 len; }; +struct kvm_sev_attestation_report { +__u8 mnonce[16 ]; +__u64 uaddr; +__u32 len; +}; +#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)qapi/misc-target.json +38
-0@@ -285,3 +285,41 @@ ## { 'command': 'query-gic-capabilities', 'returns': ['GICCapability'], 'if': 'defined(TARGET_ARM)' } + + +## +# @SevAttestationReport: +# +# The struct describes attestation report for a Secure Encrypted Virtualization +# feature. +# +# @data: guest attestation report (base64 encoded) +# +# +# Since: 6.1 +## +{ 'struct': 'SevAttestationReport', + 'data': { 'data': 'str'}, + 'if': 'defined(TARGET_I386)' } + +## +# @query-sev-attestation-report: +# +# This command is used to get the SEV attestation report, and is supported on AMD +# X86 platforms only. +# +# @mnonce: a random 16 bytes value encoded in base64 (it will be included in report) +# +# Returns: SevAttestationReport objects. +# +# Since: 6.1 +# +# Example: +# +# -> { "execute" : "query-sev-attestation-report", "arguments": { "mnonce": "aaaaaaa" } } +# <- { "return" : { "data": "aaaaaaaabbbddddd"} } +# +## +{ 'command': 'query-sev-attestation-report', 'data': { 'mnonce': 'str' }, + 'returns': 'SevAttestationReport', + 'if': 'defined(TARGET_I386)' }target/i386/monitor.c +6
-0@@ -757,3 +757,9 @@ void qmp_sev_inject_launch_secret(const char *packet_hdr,sev_inject_launch_secret (packet_hdr, secret, gpa, errp); } + +SevAttestationReport * +qmp_query_sev_attestation_report (const char *mnonce,Error **errp) +{ +return sev_get_attestation_report (mnonce, errp); +}target/i386/sev-stub.c +7
-0@@ -74,3 +74,10 @@ int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size) {abort (); } + +SevAttestationReport * +sev_get_attestation_report (const char *mnonce,Error **errp) +{ +error_setg (errp,"SEV is not available in this QEMU" ); +return NULL ; +}target/i386/sev.c +67
-0@@ -491,6 +491,73 @@ out:return cap; } +SevAttestationReport * +sev_get_attestation_report (const char *mnonce,Error **errp) +{ +struct kvm_sev_attestation_report input = {}; +SevAttestationReport *report =NULL ; +SevGuestState *sev = sev_guest; +guchar *data; +guchar *buf; +gsize len; +int err =0 , ret; + +if (!sev_enabled ()) { +error_setg (errp,"SEV is not enabled" ); +return NULL ; + } + +/* lets decode the mnonce string */ + buf =g_base64_decode (mnonce, &len); +if (!buf) { +error_setg (errp,"SEV: failed to decode mnonce input" ); +return NULL ; + } + +/* verify the input mnonce length */ +if (len !=sizeof (input.mnonce)) { +error_setg (errp,"SEV: mnonce must be %ld bytes (got %ld)" , +sizeof (input.mnonce), len); +g_free (buf); +return NULL ; + } + +/* Query the report length */ + ret =sev_ioctl (sev->sev_fd,KVM_SEV_GET_ATTESTATION_REPORT , + &input, &err); +if (ret <0 ) { +if (err !=SEV_RET_INVALID_LEN ) { +error_setg (errp,"failed to query the attestation report length " +"ret=%d fw_err=%d (%s)" , ret, err,fw_error_to_str (err)); +g_free (buf); +return NULL ; + } + } + + data =g_malloc (input.len); + input.uaddr = (unsigned long )data; +memcpy (input.mnonce, buf,sizeof (input.mnonce)); + +/* Query the report */ + ret =sev_ioctl (sev->sev_fd,KVM_SEV_GET_ATTESTATION_REPORT , + &input, &err); +if (ret) { +error_setg_errno (errp, errno,"Failed to get attestation report" +" ret=%d fw_err=%d (%s)" , ret, err,fw_error_to_str (err)); + goto e_free_data; + } + + report =g_new0 (SevAttestationReport,1 ); + report->data =g_base64_encode (data, input.len); + +trace_kvm_sev_attestation_report (mnonce, report->data); + +e_free_data: +g_free (data); +g_free (buf); +return report; +} +static int sev_read_file_base64 (const char *filename,guchar **data,gsize *len) {target/i386/sev_i386.h +2
-0@@ -35,5 +35,7 @@ extern uint32_t sev_get_cbit_position(void);extern uint32_t sev_get_reduced_phys_bits (void );extern char *sev_get_launch_measurement (void );extern SevCapability *sev_get_capabilities (Error **errp); +extern SevAttestationReport * +sev_get_attestation_report (const char *mnonce,Error **errp);#endif target/i386/trace-events +1
-0@@ -10,3 +10,4 @@ kvm_sev_launch_update_data(void *addr, uint64_t len) "addr %p len 0x%" PRIx64 kvm_sev_launch_measurement(const char *value) "data %s" kvm_sev_launch_finish(void) "" kvm_sev_launch_secret(uint64_t hpa, uint64_t hva, uint64_t secret, int len) "hpa 0x%" PRIx64 " hva 0x%" PRIx64 " data 0x%" PRIx64 " len %d" +kvm_sev_attestation_report(const char *mnonce, const char *data) "mnonce %s data %s"
Eduardo Habkost
AppliedQuoted 14 lines · Brijesh Singh
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the
LAUNCH_UPDATEand sign it with the PEK.Note, we already have a command (
LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through theLAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike theLAUNCH_MEASUREcommand theATTESATION_REPORTcommand can be called while the guest is running.Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
Quoted 8 lines
Cc James Bottomley <[email protected]>Cc Tom Lendacky <[email protected]>Cc Eric Blake <[email protected]>Cc Paolo Bonzini <[email protected]>Reviewed-by James Bottomley <[email protected]>Tested-by James Bottomley <[email protected]>Signed-off-by Brijesh Singh <[email protected]>
Queued, thanks!
Signature · 1 line
Eduardo
Quoted 23 lines · Brijesh Singh
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the
LAUNCH_UPDATEand sign it with the PEK.Note, we already have a command (
LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through theLAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike theLAUNCH_MEASUREcommand theATTESATION_REPORTcommand can be called while the guest is running.Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
Cc James Bottomley <[email protected]>Cc Tom Lendacky <[email protected]>Cc Eric Blake <[email protected]>Cc Paolo Bonzini <[email protected]>Reviewed-by James Bottomley <[email protected]>Tested-by James Bottomley <[email protected]>Signed-off-by Brijesh Singh <[email protected]>---
[...]
Quoted 1 line
+ gsize len;
[...]
Review
Quoted 4 lines
(quoted diff) +4
-0+ /* verify the input mnonce length */ + if (len != sizeof(input.mnonce)) { + error_setg(errp, "SEV: mnonce must be %ld bytes (got %ld)", + sizeof(input.mnonce), len);
This breaks the build on i386. Failed CI job:
https://gitlab.com/ehabkost/qemu/-/jobs/1300032082
I'm applying the following fixup.
---
target/i386/sev.c +1 -1
@@ -517,7 +517,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp)/* verify the input mnonce length */ if (len !=sizeof (input.mnonce)) { -error_setg (errp,"SEV: mnonce must be %ld bytes (got %ld)" , +error_setg (errp,"SEV: mnonce must be %ld bytes (got %" G_GSIZE_FORMAT ")" ,sizeof (input.mnonce), len);g_free (buf);return NULL ;
Signature · 1 line
Eduardo
Quoted 44 lines · Eduardo Habkost
Quoted 23 lines · Brijesh Singh
The SEV FW >= 0.23 added a new command that can be used to query the attestation report containing the SHA-256 digest of the guest memory and VMSA encrypted with the
LAUNCH_UPDATEand sign it with the PEK.Note, we already have a command (
LAUNCH_MEASURE) that can be used to query the SHA-256 digest of the guest memory encrypted through theLAUNCH_UPDATE. The main difference between previous and this command is that the report is signed with the PEK and unlike theLAUNCH_MEASUREcommand theATTESATION_REPORTcommand can be called while the guest is running.Add a QMP interface "query-sev-attestation-report" that can be used to get the report encoded in base64.
Cc James Bottomley <[email protected]>Cc Tom Lendacky <[email protected]>Cc Eric Blake <[email protected]>Cc Paolo Bonzini <[email protected]>Reviewed-by James Bottomley <[email protected]>Tested-by James Bottomley <[email protected]>Signed-off-by Brijesh Singh <[email protected]>---
[...]
Quoted 1 line
+ gsize len;
[...]
Review
Quoted 4 lines
(quoted diff) +4
-0+ /* verify the input mnonce length */ + if (len != sizeof(input.mnonce)) { + error_setg(errp, "SEV: mnonce must be %ld bytes (got %ld)", + sizeof(input.mnonce), len);This breaks the build on i386. Failed CI job:
https://gitlab.com/ehabkost/qemu/-/jobs/1300032082I'm applying the following fixup.
Signed-off-by Eduardo Habkost <[email protected]>---
target/i386/sev.c +0
-0
target/i386/sev.c sev_get_attestation_report(const char *mnonce, Error **errp) · line 523
Quoted 8 lines
target/i386/sev.c +1
-1@@ -517,7 +517,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp)/* verify the input mnonce length */ if (len !=sizeof (input.mnonce)) { -error_setg (errp,"SEV: mnonce must be %ld bytes (got %ld)" , +error_setg (errp,"SEV: mnonce must be %ld bytes (got %" G_GSIZE_FORMAT ")" ,sizeof (input.mnonce), len);g_free (buf);return NULL ;
The fix was incomplete, additional fixup was required.
---
target/i386/sev.c renamed from 0e135d56e53 +1 -1
@@ -517,7 +517,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp)/* verify the input mnonce length */ if (len !=sizeof (input.mnonce)) { -error_setg (errp,"SEV: mnonce must be %ld bytes (got %" G_GSIZE_FORMAT ")" , +error_setg (errp,"SEV: mnonce must be %zu bytes (got %" G_GSIZE_FORMAT ")" ,sizeof (input.mnonce), len);g_free (buf);return NULL ;
Signature · 1 line
Eduardo