On Tue, Jan 12, 2021 at 03:45:08PM +1100, David Gibson wrote: > At least some s390 cpu models support "Protected Virtualization" (PV), > a mechanism to protect guests from eavesdropping by a compromised > hypervisor. > > This is similar in function to other mechanisms like AMD's SEV and > POWER's PEF, which are controlled by the "confidential-guest-support" > machine option. s390 is a slightly special case, because we already > supported PV, simply by using a CPU model with the required feature > (S390_FEAT_UNPACK). > > To integrate this with the option used by other platforms, we > implement the following compromise: > > - When the confidential-guest-support option is set, s390 will > recognize it, verify that the CPU can support PV (failing if not) > and set virtio default options necessary for encrypted or protected > guests, as on other platforms. i.e. if confidential-guest-support > is set, we will either create a guest capable of entering PV mode, > or fail outright. > > - If confidential-guest-support is not set, guests might still be > able to enter PV mode, if the CPU has the right model. This may be > a little surprising, but shouldn't actually be harmful. > > To start a guest supporting Protected Virtualization using the new > option use the command line arguments: > -object s390-pv-guest,id=pv0 -machine confidential-guest-support=pv0 > > Signed-off-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> > --- > docs/confidential-guest-support.txt | 3 ++ > docs/system/s390x/protvirt.rst | 19 +++++++--- > hw/s390x/pv.c | 58 +++++++++++++++++++++++++++++ > include/hw/s390x/pv.h | 1 + > target/s390x/kvm.c | 3 ++ > 5 files changed, 78 insertions(+), 6 deletions(-) > diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c > index ab3a2482aa..85592e100a 100644 > --- a/hw/s390x/pv.c > +++ b/hw/s390x/pv.c > @@ -14,8 +14,11 @@ > #include <linux/kvm.h> > > #include "cpu.h" > +#include "qapi/error.h" > #include "qemu/error-report.h" > #include "sysemu/kvm.h" > +#include "qom/object_interfaces.h" > +#include "exec/confidential-guest-support.h" > #include "hw/s390x/ipl.h" > #include "hw/s390x/pv.h" > > @@ -111,3 +114,58 @@ void s390_pv_inject_reset_error(CPUState *cs) > /* Report that we are unable to enter protected mode */ > env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV; > } > + > +#define TYPE_S390_PV_GUEST "s390-pv-guest" > +#define S390_PV_GUEST(obj) \ > + OBJECT_CHECK(S390PVGuestState, (obj), TYPE_S390_PV_GUEST) > + > +typedef struct S390PVGuestState S390PVGuestState; Can use OBJECT_DECLARE_TYPE for this. Also same comment about struct naming vs type naming. > + > +/** > + * S390PVGuestState: > + * > + * The S390PVGuestState object is basically a dummy used to tell the > + * confidential guest support system to use s390's PV mechanism. > + * > + * # $QEMU \ > + * -object s390-pv-guest,id=pv0 \ > + * -machine ...,confidential-guest-support=pv0 > + */ > +struct S390PVGuestState { > + Object parent_obj; > +}; > + > +int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp) > +{ > + if (!object_dynamic_cast(OBJECT(cgs), TYPE_S390_PV_GUEST)) { > + return 0; > + } > + > + if (!s390_has_feat(S390_FEAT_UNPACK)) { > + error_setg(errp, > + "CPU model does not support Protected Virtualization"); > + return -1; > + } > + > + cgs->ready = true; > + > + return 0; > +} > + > +static const TypeInfo s390_pv_guest_info = { > + .parent = TYPE_CONFIDENTIAL_GUEST_SUPPORT, > + .name = TYPE_S390_PV_GUEST, > + .instance_size = sizeof(S390PVGuestState), > + .interfaces = (InterfaceInfo[]) { > + { TYPE_USER_CREATABLE }, > + { } > + } > +}; > + > +static void > +s390_pv_register_types(void) > +{ > + type_register_static(&s390_pv_guest_info); > +} > + > +type_init(s390_pv_register_types); This can all use OBJECT_DEFINE_TYPE_WITH_INTERFACES Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|