For confidential guests, guest_memfd is currently used only for private guest memory, and normal guest memory comes from the configured memory backend just as it does for a non-confidential guest. It is now possible to use the same physical memory to back a particular GPA regardless of whether it is in a shared or private state. This avoids the need to rely on discarding memory between shared/private conversions (to avoid doubled memory usage), and is intended to be the primary mode of using guest_memfd for confidential guests moving forward, and future features like hugepage support will likely require it.
Add an option to enable this support. Since ConfidentialGuestSupport is already used to track some guest_memfd-related functionality (e.g. whether it is required for the configured machine), similarly introduce this option as a property of ConfidentialGuestSupport. Also add the KVM-specific checks to enable this support, but leave the option disabled until other required changes are implemented for CGS variants that intend to make use of KVM's in-place conversion support. While technically the convert-in-place option could be introduced as an SEV-specific option, it is a given that TDX will also be introducing in-place conversion support based on the same guest_memfd kernel infrastructure, so introduce it via a new ConfidentialGuestSupportProperties base class that other confidential VM implementations can utilized for common options. Signed-off-by: Michael Roth <[email protected]> --- accel/kvm/kvm-all.c | 19 +++++++++++++++ backends/confidential-guest-support.c | 26 +++++++++++++++++++++ hw/core/machine.c | 5 ++++ include/hw/core/boards.h | 1 + include/system/confidential-guest-support.h | 14 +++++++++++ qapi/qom.json | 16 +++++++++++++ 6 files changed, 81 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 15f237de4e..2b838eb690 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -52,6 +52,7 @@ #include "kvm-cpus.h" #include "system/dirtylimit.h" #include "qemu/range.h" +#include "system/confidential-guest-support.h" #include "hw/core/boards.h" #include "system/stats.h" @@ -3074,6 +3075,24 @@ static int kvm_init(AccelState *as, MachineState *ms) kvm_guest_memfd_flags_supported = kvm_vm_check_extension(s, KVM_CAP_GUEST_MEMFD_FLAGS); + if (machine_require_guest_memfd_convert_in_place(ms)) { + uint64_t guest_memfd_supported_memory_attributes; + + guest_memfd_supported_memory_attributes = + kvm_vm_check_extension(s, KVM_CAP_GUEST_MEMFD_MEMORY_ATTRIBUTES); + + if (!(guest_memfd_supported_memory_attributes & KVM_MEMORY_ATTRIBUTE_PRIVATE)) { + ret = -EINVAL; + error_report("In-place conversion is only supported if private " + "memory attributes can be set via guest_memfd. " + "Please ensure the 'gmem_in_place_conversion' KVM " + "module parameter is set to 0."); + goto err; + } + + kvm_supported_memory_attributes = guest_memfd_supported_memory_attributes; + } + if (s->kernel_irqchip_split == ON_OFF_AUTO_AUTO) { s->kernel_irqchip_split = mc->default_kernel_irqchip_split ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } diff --git a/backends/confidential-guest-support.c b/backends/confidential-guest-support.c index 156dd15e66..29447fa18e 100644 --- a/backends/confidential-guest-support.c +++ b/backends/confidential-guest-support.c @@ -21,6 +21,25 @@ OBJECT_DEFINE_ABSTRACT_TYPE(ConfidentialGuestSupport, CONFIDENTIAL_GUEST_SUPPORT, OBJECT) +static bool +cgs_get_convert_in_place(Object *obj, Error **errp) +{ + return CONFIDENTIAL_GUEST_SUPPORT(obj)->convert_in_place; +} + +static void +cgs_set_convert_in_place(Object *obj, bool value, Error **errp) +{ + ConfidentialGuestSupport *cgs = CONFIDENTIAL_GUEST_SUPPORT(obj); + + if (!cgs->allow_convert_in_place && value) { + error_setg(errp, "In-place conversion support is not supported for this guest configuration."); + return; + } + + cgs->convert_in_place = value; +} + static bool check_support(ConfidentialGuestPlatformType platform, uint16_t platform_version, uint8_t highest_vtl, uint64_t shared_gpa_boundary) @@ -70,6 +89,13 @@ static void confidential_guest_support_class_init(ObjectClass *oc, static void confidential_guest_support_init(Object *obj) { + ConfidentialGuestSupport *cgs = CONFIDENTIAL_GUEST_SUPPORT(obj); + + object_property_add_bool(obj, "convert-in-place", cgs_get_convert_in_place, + cgs_set_convert_in_place); + + cgs->convert_in_place = false; + cgs->allow_convert_in_place = false; } static void confidential_guest_support_finalize(Object *obj) diff --git a/hw/core/machine.c b/hw/core/machine.c index 469033d6b3..5e66dbe193 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1342,6 +1342,11 @@ bool machine_require_guest_memfd_private(MachineState *machine) return machine->cgs && machine->cgs->require_guest_memfd; } +bool machine_require_guest_memfd_convert_in_place(MachineState *machine) +{ + return machine->cgs && machine->cgs->convert_in_place; +} + static char *cpu_slot_to_string(const CPUArchId *cpu) { GString *s = g_string_new(NULL); diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 7925f0451a..5e67095f7c 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -44,6 +44,7 @@ int machine_phandle_start(MachineState *machine); bool machine_dump_guest_core(MachineState *machine); bool machine_mem_merge(MachineState *machine); bool machine_require_guest_memfd_private(MachineState *machine); +bool machine_require_guest_memfd_convert_in_place(MachineState *machine); HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine); void machine_set_cpu_numa_node(MachineState *machine, const CpuInstanceProperties *props, diff --git a/include/system/confidential-guest-support.h b/include/system/confidential-guest-support.h index 5dca717308..c1e9c41ad2 100644 --- a/include/system/confidential-guest-support.h +++ b/include/system/confidential-guest-support.h @@ -20,6 +20,7 @@ #include "qom/object.h" #include "exec/hwaddr.h" +#include "qapi/qapi-visit-qom.h" #define TYPE_CONFIDENTIAL_GUEST_SUPPORT "confidential-guest-support" OBJECT_DECLARE_TYPE(ConfidentialGuestSupport, @@ -92,6 +93,19 @@ struct ConfidentialGuestSupport { * so 'ready' is not set, we'll abort. */ bool ready; + + /* + * True if the machine re-uses physical pages when converting + * between shared/private (as opposed to using different + * physical pages depending on the access type). + */ + bool convert_in_place; + + /* + * CGS implementations will use this to indicate whether or not + * in-place conversion can be enabled by users. + */ + bool allow_convert_in_place; }; typedef struct ConfidentialGuestSupportClass { diff --git a/qapi/qom.json b/qapi/qom.json index 909add4299..20d6fefb04 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -1005,6 +1005,21 @@ 'if': 'CONFIG_IGVM', 'data': { 'file': 'str' } } +## +# @ConfidentialGuestSupportProperties: +# +# Properties for ConfidentialGuestSupport base class. +# +# @convert-in-place: If true, the same physical pages are reused +# when memory is converted between shared and private states. +# If false (default), separate allocations are used depending +# on whether the page is private or shared. +# +# Since: 11.2 +## +{ 'struct': 'ConfidentialGuestSupportProperties', + 'data': { '*convert-in-place': 'bool' } } + ## # @SevCommonProperties: # @@ -1033,6 +1048,7 @@ # Since: 9.1 ## { 'struct': 'SevCommonProperties', + 'base': 'ConfidentialGuestSupportProperties', 'data': { '*sev-device': 'str', '*cbitpos': 'uint32', 'reduced-phys-bits': 'uint32', -- 2.43.0
