| Message ID | 1dff8015f9f9cf735de21a16e5dba14371c39155.1712141833.git.roy.hopkins@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,01/10] meson: Add optional dependency on IGVM library | expand |
Hi Roy, On 3/4/24 13:11, Roy Hopkins wrote: > In preparation for supporting the processing of IGVM files to configure > guests, this adds a set of functions to ConfidentialGuestSupport > allowing configuration of secure virtual machines that can be > implemented for each supported isolation platform type such as Intel TDX > or AMD SEV-SNP. These functions will be called by IGVM processing code > in subsequent patches. > > This commit provides a default implementation of the functions that > either perform no action or generate a warning or error when they are > called. Targets that support ConfidentalGuestSupport should override > these implementations. > > Signed-off-by: Roy Hopkins <roy.hopkins@suse.com> > --- > backends/confidential-guest-support.c | 32 ++++++++++ > include/exec/confidential-guest-support.h | 74 +++++++++++++++++++++++ > 2 files changed, 106 insertions(+) > struct ConfidentialGuestSupport { > Object parent; > > @@ -60,6 +94,46 @@ struct ConfidentialGuestSupport { > */ > char *igvm_filename; > #endif > + > + /* > + * The following virtual methods need to be implemented by systems that > + * support confidential guests that can be configured with IGVM and are > + * used during processing of the IGVM file with process_igvm(). > + */ > + > + /* > + * Check for to see if this confidential guest supports a particular > + * platform or configuration > + */ > + int (*check_support)(ConfidentialGuestPlatformType platform, > + uint16_t platform_version, uint8_t highest_vtl, > + uint64_t shared_gpa_boundary); > + > + /* > + * Configure part of the state of a guest for a particular set of data, page > + * type and gpa. This can be used for example to pre-populate and measure > + * guest memory contents, define private ranges or set the initial CPU state > + * for one or more CPUs. > + * > + * If memory_type is CGS_PAGE_TYPE_VMSA then ptr points to the initial CPU > + * context for a virtual CPU. The format of the data depends on the type of > + * confidential virtual machine. For example, for SEV-ES ptr will point to a > + * vmcb_save_area structure that should be copied into guest memory at the > + * address specified in gpa. The cpu_index parameter contains the index of > + * the CPU the VMSA applies to. > + */ > + int (*set_guest_state)(hwaddr gpa, uint8_t *ptr, uint64_t len, > + ConfidentialGuestPageType memory_type, > + uint16_t cpu_index, Error **errp); > + > + /* > + * Iterate the system memory map, getting the entry with the given index > + * that can be populated into guest memory. > + * > + * Returns 0 for ok, 1 if the index is out of range and -1 on error. > + */ > + int (*get_mem_map_entry)(int index, ConfidentialGuestMemoryMapEntry *entry, > + Error **errp); > }; > > typedef struct ConfidentialGuestSupportClass { Methods are usually a class field, not an instance one. Any reason to diverge from this norm? Regards, Phil.
On Thu, Apr 04, 2024 at 10:00:53AM +0200, Philippe Mathieu-Daudé wrote: > Hi Roy, > > On 3/4/24 13:11, Roy Hopkins wrote: > > In preparation for supporting the processing of IGVM files to configure > > guests, this adds a set of functions to ConfidentialGuestSupport > > allowing configuration of secure virtual machines that can be > > implemented for each supported isolation platform type such as Intel TDX > > or AMD SEV-SNP. These functions will be called by IGVM processing code > > in subsequent patches. > > > > This commit provides a default implementation of the functions that > > either perform no action or generate a warning or error when they are > > called. Targets that support ConfidentalGuestSupport should override > > these implementations. > > > > Signed-off-by: Roy Hopkins <roy.hopkins@suse.com> > > --- > > backends/confidential-guest-support.c | 32 ++++++++++ > > include/exec/confidential-guest-support.h | 74 +++++++++++++++++++++++ > > 2 files changed, 106 insertions(+) > > > > struct ConfidentialGuestSupport { > > Object parent; > > @@ -60,6 +94,46 @@ struct ConfidentialGuestSupport { > > */ > > char *igvm_filename; > > #endif > > + > > + /* > > + * The following virtual methods need to be implemented by systems that > > + * support confidential guests that can be configured with IGVM and are > > + * used during processing of the IGVM file with process_igvm(). > > + */ > > + > > + /* > > + * Check for to see if this confidential guest supports a particular > > + * platform or configuration > > + */ > > + int (*check_support)(ConfidentialGuestPlatformType platform, > > + uint16_t platform_version, uint8_t highest_vtl, > > + uint64_t shared_gpa_boundary); > > + > > + /* > > + * Configure part of the state of a guest for a particular set of data, page > > + * type and gpa. This can be used for example to pre-populate and measure > > + * guest memory contents, define private ranges or set the initial CPU state > > + * for one or more CPUs. > > + * > > + * If memory_type is CGS_PAGE_TYPE_VMSA then ptr points to the initial CPU > > + * context for a virtual CPU. The format of the data depends on the type of > > + * confidential virtual machine. For example, for SEV-ES ptr will point to a > > + * vmcb_save_area structure that should be copied into guest memory at the > > + * address specified in gpa. The cpu_index parameter contains the index of > > + * the CPU the VMSA applies to. > > + */ > > + int (*set_guest_state)(hwaddr gpa, uint8_t *ptr, uint64_t len, > > + ConfidentialGuestPageType memory_type, > > + uint16_t cpu_index, Error **errp); > > + > > + /* > > + * Iterate the system memory map, getting the entry with the given index > > + * that can be populated into guest memory. > > + * > > + * Returns 0 for ok, 1 if the index is out of range and -1 on error. > > + */ > > + int (*get_mem_map_entry)(int index, ConfidentialGuestMemoryMapEntry *entry, > > + Error **errp); > > }; > > typedef struct ConfidentialGuestSupportClass { > > Methods are usually a class field, not an instance one. Any > reason to diverge from this norm? Agreed, this should all be against the Class. With regards, Daniel
diff --git a/backends/confidential-guest-support.c b/backends/confidential-guest-support.c index da436fb736..cb0bc543c0 100644 --- a/backends/confidential-guest-support.c +++ b/backends/confidential-guest-support.c @@ -14,6 +14,8 @@ #include "qemu/osdep.h" #include "exec/confidential-guest-support.h" +#include "qemu/error-report.h" +#include "qapi/error.h" OBJECT_DEFINE_ABSTRACT_TYPE(ConfidentialGuestSupport, confidential_guest_support, @@ -45,8 +47,38 @@ static void confidential_guest_support_class_init(ObjectClass *oc, void *data) #endif } +static int check_support(ConfidentialGuestPlatformType platform, + uint16_t platform_version, uint8_t highest_vtl, + uint64_t shared_gpa_boundary) +{ + /* Default: no support. */ + return 0; +} + +static int set_guest_state(hwaddr gpa, uint8_t *ptr, uint64_t len, + ConfidentialGuestPageType memory_type, + uint16_t cpu_index, Error **errp) +{ + error_setg(errp, + "Setting confidential guest state is not supported for this platform"); + return -1; +} + +static int get_mem_map_entry(int index, ConfidentialGuestMemoryMapEntry *entry, + Error **errp) +{ + error_setg( + errp, + "Obtaining the confidential guest memory map is not supported for this platform"); + return -1; +} + static void confidential_guest_support_init(Object *obj) { + ConfidentialGuestSupport *cgs = CONFIDENTIAL_GUEST_SUPPORT(obj); + cgs->check_support = check_support; + cgs->set_guest_state = set_guest_state; + cgs->get_mem_map_entry = get_mem_map_entry; } static void confidential_guest_support_finalize(Object *obj) diff --git a/include/exec/confidential-guest-support.h b/include/exec/confidential-guest-support.h index ec74da8877..a8ad84fa07 100644 --- a/include/exec/confidential-guest-support.h +++ b/include/exec/confidential-guest-support.h @@ -21,10 +21,44 @@ #ifndef CONFIG_USER_ONLY #include "qom/object.h" +#include "exec/hwaddr.h" + +#if defined(CONFIG_IGVM) +#include "igvm/igvm.h" +#endif #define TYPE_CONFIDENTIAL_GUEST_SUPPORT "confidential-guest-support" OBJECT_DECLARE_SIMPLE_TYPE(ConfidentialGuestSupport, CONFIDENTIAL_GUEST_SUPPORT) +typedef enum ConfidentialGuestPlatformType { + CGS_PLATFORM_SEV, + CGS_PLATFORM_SEV_ES, +} ConfidentialGuestPlatformType; + +typedef enum ConfidentialGuestMemoryType { + CGS_MEM_RAM, + CGS_MEM_RESERVED, + CGS_MEM_ACPI, + CGS_MEM_NVS, + CGS_MEM_UNUSABLE, +} ConfidentialGuestMemoryType; + +typedef struct ConfidentialGuestMemoryMapEntry { + uint64_t gpa; + uint64_t size; + ConfidentialGuestMemoryType type; +} ConfidentialGuestMemoryMapEntry; + +typedef enum ConfidentialGuestPageType { + CGS_PAGE_TYPE_NORMAL, + CGS_PAGE_TYPE_VMSA, + CGS_PAGE_TYPE_ZERO, + CGS_PAGE_TYPE_UNMEASURED, + CGS_PAGE_TYPE_SECRETS, + CGS_PAGE_TYPE_CPUID, + CGS_PAGE_TYPE_REQUIRED_MEMORY, +} ConfidentialGuestPageType; + struct ConfidentialGuestSupport { Object parent; @@ -60,6 +94,46 @@ struct ConfidentialGuestSupport { */ char *igvm_filename; #endif + + /* + * The following virtual methods need to be implemented by systems that + * support confidential guests that can be configured with IGVM and are + * used during processing of the IGVM file with process_igvm(). + */ + + /* + * Check for to see if this confidential guest supports a particular + * platform or configuration + */ + int (*check_support)(ConfidentialGuestPlatformType platform, + uint16_t platform_version, uint8_t highest_vtl, + uint64_t shared_gpa_boundary); + + /* + * Configure part of the state of a guest for a particular set of data, page + * type and gpa. This can be used for example to pre-populate and measure + * guest memory contents, define private ranges or set the initial CPU state + * for one or more CPUs. + * + * If memory_type is CGS_PAGE_TYPE_VMSA then ptr points to the initial CPU + * context for a virtual CPU. The format of the data depends on the type of + * confidential virtual machine. For example, for SEV-ES ptr will point to a + * vmcb_save_area structure that should be copied into guest memory at the + * address specified in gpa. The cpu_index parameter contains the index of + * the CPU the VMSA applies to. + */ + int (*set_guest_state)(hwaddr gpa, uint8_t *ptr, uint64_t len, + ConfidentialGuestPageType memory_type, + uint16_t cpu_index, Error **errp); + + /* + * Iterate the system memory map, getting the entry with the given index + * that can be populated into guest memory. + * + * Returns 0 for ok, 1 if the index is out of range and -1 on error. + */ + int (*get_mem_map_entry)(int index, ConfidentialGuestMemoryMapEntry *entry, + Error **errp); }; typedef struct ConfidentialGuestSupportClass {
In preparation for supporting the processing of IGVM files to configure guests, this adds a set of functions to ConfidentialGuestSupport allowing configuration of secure virtual machines that can be implemented for each supported isolation platform type such as Intel TDX or AMD SEV-SNP. These functions will be called by IGVM processing code in subsequent patches. This commit provides a default implementation of the functions that either perform no action or generate a warning or error when they are called. Targets that support ConfidentalGuestSupport should override these implementations. Signed-off-by: Roy Hopkins <roy.hopkins@suse.com> --- backends/confidential-guest-support.c | 32 ++++++++++ include/exec/confidential-guest-support.h | 74 +++++++++++++++++++++++ 2 files changed, 106 insertions(+)