OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390x/pv: Implement a CGS check helper

Browse Source 
When a protected VM is started with the maximum number of CPUs (248),
the service call providing information on the CPUs requires more
buffer space than allocated and QEMU disgracefully aborts :

    LOADPARM=[........]
    Using virtio-blk.
    Using SCSI scheme.
    ...................................................................................
    qemu-system-s390x: KVM_S390_MEM_OP failed: Argument list too long

When protected virtualization is initialized, compute the maximum
number of vCPUs supported by the machine and return useful information
to the user before the machine starts in case of error.

Suggested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20230116174607.2459498-2-clg@kaod.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Cédric Le Goater 2023-01-16 18:46:05 +01:00 committed by Thomas Huth
parent 66ef41d29e
commit 75d7150c63
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/s390x/pv.c
View File

@ -20,6 +20,7 @@
#include "exec/confidential-guest-support.h" #include "exec/confidential-guest-support.h"
#include "hw/s390x/ipl.h" #include "hw/s390x/ipl.h"
#include "hw/s390x/pv.h" #include "hw/s390x/pv.h"
#include "hw/s390x/sclp.h"
#include "target/s390x/kvm/kvm_s390x.h" #include "target/s390x/kvm/kvm_s390x.h"
static bool info_valid; static bool info_valid;
@ -249,6 +250,41 @@ struct S390PVGuestClass {
ConfidentialGuestSupportClass parent_class; ConfidentialGuestSupportClass parent_class;
}; };
/*
* If protected virtualization is enabled, the amount of data that the
* Read SCP Info Service Call can use is limited to one page. The
* available space also depends on the Extended-Length SCCB (ELS)
* feature which can take more buffer space to store feature
* information. This impacts the maximum number of CPUs supported in
* the machine.
*/
static uint32_t s390_pv_get_max_cpus(void)
{
int offset_cpu = s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) ?
offsetof(ReadInfo, entries) : SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET;
return (TARGET_PAGE_SIZE - offset_cpu) / sizeof(CPUEntry);
}
static bool s390_pv_check_cpus(Error **errp)
{
MachineState *ms = MACHINE(qdev_get_machine());
uint32_t pv_max_cpus = s390_pv_get_max_cpus();
if (ms->smp.max_cpus > pv_max_cpus) {
error_setg(errp, "Protected VMs support a maximum of %d CPUs",
pv_max_cpus);
return false;
}
return true;
}
static bool s390_pv_guest_check(ConfidentialGuestSupport *cgs, Error **errp)
{
return s390_pv_check_cpus(errp);
}
int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
{ {
if (!object_dynamic_cast(OBJECT(cgs), TYPE_S390_PV_GUEST)) { if (!object_dynamic_cast(OBJECT(cgs), TYPE_S390_PV_GUEST)) {
@ -261,6 +297,10 @@ int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
return -1; return -1;
} }
if (!s390_pv_guest_check(cgs, errp)) {
return -1;
}
cgs->ready = true; cgs->ready = true;
return 0; return 0;