Commit 9ef2d19e authored by Pierre Morel's avatar Pierre Morel Committed by Cornelia Huck
Browse files

s390x/cpumodel: Set up CPU model for AQIC interception 

Let's add support for the AP-Queue interruption facility to the CPU
model.

The S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, CPU facility indicates
whether the PQAP instruction with the AQIC command is available
to the guest.
This feature will be enabled only if the AP instructions are
available on the linux host and AQIC facility is installed on
the host.

This feature must be turned on from userspace to intercept AP
instructions on the KVM guest. The QEMU command line to turn
this feature on looks something like this:

    qemu-system-s390x ... -cpu xxx,apqi=on ...
or
    ... -cpu host

Right now AP pass-through devices do not support migration,
which means that we do not have to take care of migrating
the interrupt data:
virsh migrate apguest --live qemu+ssh://root@target.lan/system


error: Requested operation is not valid: domain has assigned non-USB host devices

Signed-off-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
[rebase to newest qemu and fixup description]
Message-Id: <20190705153249.12525-1-borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent f5cf94cd

target/s390x/cpu_features_def.inc.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ DEF_FEAT(SEMAPHORE_ASSIST, "sema", STFL, 59, "Semaphore-assist facility") 
DEF_FEAT(TIME_SLICE_INSTRUMENTATION, "tsi", STFL, 60, "Time-slice Instrumentation facility")

DEF_FEAT(MISC_INSTRUCTION_EXT3, "minste3", STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3")

DEF_FEAT(RUNTIME_INSTRUMENTATION, "ri", STFL, 64, "CPU runtime-instrumentation facility")

DEF_FEAT(AP_QUEUE_INTERRUPT_CONTROL, "apqi", STFL, 65, "AP-Queue interruption facility")

DEF_FEAT(ZPCI, "zpci", STFL, 69, "z/PCI facility")

DEF_FEAT(ADAPTER_EVENT_NOTIFICATION, "aen", STFL, 71, "General-purpose-adapter-event-notification facility")

DEF_FEAT(ADAPTER_INT_SUPPRESSION, "ais", STFL, 72, "General-purpose-adapter-interruption-suppression facility")

target/s390x/cpu_models.c

+1 −0
Original line number Diff line number Diff line
@@ -818,6 +818,7 @@ static void check_consistency(const S390CPUModel *model) 
        { S390_FEAT_PTFF_QTOUE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_PTFF_STOE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_PTFF_STOUE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, S390_FEAT_AP },

    };

    int i;

target/s390x/gen-features.c

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static uint16_t full_GEN12_GA1[] = { 
    S390_FEAT_EDAT_2,

    S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,

    S390_FEAT_AP_QUERY_CONFIG_INFO,

    S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL,

    S390_FEAT_AP_FACILITIES_TEST,

    S390_FEAT_AP,

};