| Message ID | 20200310134008.130038-6-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: Protected Virtualization support | expand |
On 10.03.20 14:39, Janosch Frank wrote: > Secure guests no longer intercept with code 4 for an instruction > interception. Instead they have codes 104 and 108 for secure > instruction interception and secure instruction notification > respectively. > > The 104 mirrors the 4 interception. > > The 108 is a notification interception to let KVM and QEMU know that > something changed and we need to update tracking information or > perform specific tasks. It's currently taken for the following > instructions: > > * stpx (To inform about the changed prefix location) Set prefix (SPX), no? > * sclp (On incorrect SCCB values, so we can inject a IRQ) > * sigp (All but "stop and store status") > * diag308 (Subcodes 0/1) Furthermore SPX is also not reaching QEMU, no? Maybe add something like Of these exits only sclp errors, state changing sigps and diag308 will reach QEMU. QEMU will do its parts of the job, while the ultravisor has done the instruction part of the job. With that Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/kvm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index 1d6fd6a27b..eec0b92479 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -115,6 +115,8 @@ > #define ICPT_CPU_STOP 0x28 > #define ICPT_OPEREXC 0x2c > #define ICPT_IO 0x40 > +#define ICPT_PV_INSTR 0x68 > +#define ICPT_PV_INSTR_NOTIFICATION 0x6c > > #define NR_LOCAL_IRQS 32 > /* > @@ -1693,6 +1695,8 @@ static int handle_intercept(S390CPU *cpu) > (long)cs->kvm_run->psw_addr); > switch (icpt_code) { > case ICPT_INSTRUCTION: > + case ICPT_PV_INSTR: > + case ICPT_PV_INSTR_NOTIFICATION: > r = handle_instruction(cpu, run); > break; > case ICPT_PROGRAM: >
On 3/10/20 4:20 PM, Christian Borntraeger wrote: > On 10.03.20 14:39, Janosch Frank wrote: >> Secure guests no longer intercept with code 4 for an instruction >> interception. Instead they have codes 104 and 108 for secure >> instruction interception and secure instruction notification >> respectively. >> >> The 104 mirrors the 4 interception. >> >> The 108 is a notification interception to let KVM and QEMU know that >> something changed and we need to update tracking information or >> perform specific tasks. It's currently taken for the following >> instructions: >> >> * stpx (To inform about the changed prefix location) > > Set prefix (SPX), no? > >> * sclp (On incorrect SCCB values, so we can inject a IRQ) >> * sigp (All but "stop and store status") >> * diag308 (Subcodes 0/1) > > Furthermore SPX is also not reaching QEMU, no? > Maybe add something like > > Of these exits only sclp errors, state changing sigps and > diag308 will reach QEMU. QEMU will do its parts of the > job, while the ultravisor has done the instruction part of > the job. > > With that > Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Sure, I'll also change secure execution to protected virtualization in the first sentence... > > >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> Reviewed-by: David Hildenbrand <david@redhat.com> >> --- >> target/s390x/kvm.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c >> index 1d6fd6a27b..eec0b92479 100644 >> --- a/target/s390x/kvm.c >> +++ b/target/s390x/kvm.c >> @@ -115,6 +115,8 @@ >> #define ICPT_CPU_STOP 0x28 >> #define ICPT_OPEREXC 0x2c >> #define ICPT_IO 0x40 >> +#define ICPT_PV_INSTR 0x68 >> +#define ICPT_PV_INSTR_NOTIFICATION 0x6c >> >> #define NR_LOCAL_IRQS 32 >> /* >> @@ -1693,6 +1695,8 @@ static int handle_intercept(S390CPU *cpu) >> (long)cs->kvm_run->psw_addr); >> switch (icpt_code) { >> case ICPT_INSTRUCTION: >> + case ICPT_PV_INSTR: >> + case ICPT_PV_INSTR_NOTIFICATION: >> r = handle_instruction(cpu, run); >> break; >> case ICPT_PROGRAM: >>
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 1d6fd6a27b..eec0b92479 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -115,6 +115,8 @@ #define ICPT_CPU_STOP 0x28 #define ICPT_OPEREXC 0x2c #define ICPT_IO 0x40 +#define ICPT_PV_INSTR 0x68 +#define ICPT_PV_INSTR_NOTIFICATION 0x6c #define NR_LOCAL_IRQS 32 /* @@ -1693,6 +1695,8 @@ static int handle_intercept(S390CPU *cpu) (long)cs->kvm_run->psw_addr); switch (icpt_code) { case ICPT_INSTRUCTION: + case ICPT_PV_INSTR: + case ICPT_PV_INSTR_NOTIFICATION: r = handle_instruction(cpu, run); break; case ICPT_PROGRAM: