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

s390x/cpu topology: interception of PTF instruction

Browse Source 
When the host supports the CPU topology facility, the PTF
instruction with function code 2 is interpreted by the SIE,
provided that the userland hypervisor activates the interpretation
by using the KVM_CAP_S390_CPU_TOPOLOGY KVM extension.

The PTF instructions with function code 0 and 1 are intercepted
and must be emulated by the userland hypervisor.

During RESET all CPU of the configuration are placed in
horizontal polarity.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Co-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Message-ID: <20231016183925.2384704-8-nsg@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Pierre Morel 2023-10-16 20:39:11 +02:00 committed by Thomas Huth
parent 3d6e75f4df
commit af37bad52e
3 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hw/s390x/cpu-topology.c
View File

@ -90,6 +90,60 @@ static void s390_topology_init(MachineState *ms)
smp->books * smp->drawers);
}
/*
* s390_handle_ptf:
*
* @register 1: contains the function code
*
* Function codes 0 (horizontal) and 1 (vertical) define the CPU
* polarization requested by the guest.
*
* Function code 2 is handling topology changes and is interpreted
* by the SIE.
*/
void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra)
{
CpuS390Polarization polarization;
CPUS390XState *env = &cpu->env;
uint64_t reg = env->regs[r1];
int fc = reg & S390_TOPO_FC_MASK;
if (!s390_has_feat(S390_FEAT_CONFIGURATION_TOPOLOGY)) {
s390_program_interrupt(env, PGM_OPERATION, ra);
return;
}
if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, ra);
return;
}
if (reg & ~S390_TOPO_FC_MASK) {
s390_program_interrupt(env, PGM_SPECIFICATION, ra);
return;
}
polarization = S390_CPU_POLARIZATION_VERTICAL;
switch (fc) {
case 0:
polarization = S390_CPU_POLARIZATION_HORIZONTAL;
/* fallthrough */
case 1:
if (s390_topology.polarization == polarization) {
env->regs[r1] |= S390_PTF_REASON_DONE;
setcc(cpu, 2);
} else {
s390_topology.polarization = polarization;
s390_cpu_topology_set_changed(true);
setcc(cpu, 0);
}
break;
default:
/* Note that fc == 2 is interpreted by the SIE */
s390_program_interrupt(env, PGM_SPECIFICATION, ra);
}
}
/**
* s390_topology_reset:
*
@ -99,6 +153,7 @@ static void s390_topology_init(MachineState *ms)
void s390_topology_reset(void)
{
s390_cpu_topology_set_changed(false);
s390_topology.polarization = S390_CPU_POLARIZATION_HORIZONTAL;
}
/**

6
include/hw/s390x/s390-virtio-ccw.h
View File

@ -30,6 +30,12 @@ struct S390CcwMachineState {
uint8_t loadparm[8];
};
#define S390_PTF_REASON_NONE (0x00 << 8)
#define S390_PTF_REASON_DONE (0x01 << 8)
#define S390_PTF_REASON_BUSY (0x02 << 8)
#define S390_TOPO_FC_MASK 0xffUL
void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra);
struct S390CcwMachineClass {
/*< private >*/
MachineClass parent_class;

11
target/s390x/kvm/kvm.c
View File

@ -86,6 +86,7 @@
#define PRIV_B9_EQBS 0x9c
#define PRIV_B9_CLP 0xa0
#define PRIV_B9_PTF 0xa2
#define PRIV_B9_PCISTG 0xd0
#define PRIV_B9_PCILG 0xd2
#define PRIV_B9_RPCIT 0xd3
@ -1457,6 +1458,13 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run)
}
}
static void kvm_handle_ptf(S390CPU *cpu, struct kvm_run *run)
{
uint8_t r1 = (run->s390_sieic.ipb >> 20) & 0x0f;
s390_handle_ptf(cpu, r1, RA_IGNORED);
}
static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
{
int r = 0;
@ -1474,6 +1482,9 @@ static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
case PRIV_B9_RPCIT:
r = kvm_rpcit_service_call(cpu, run);
break;
case PRIV_B9_PTF:
kvm_handle_ptf(cpu, run);
break;
case PRIV_B9_EQBS:
/* just inject exception */
r = -1;