| Message ID | 20250408155527.123341-5-zycai@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices | expand |
On 08/04/2025 17.55, Zhuoying Cai wrote: > From: Collin Walling <walling@linux.ibm.com> ... > Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> So the patch is from Collin, but S-o-b only by you? Looks weird, this should either have an additional S-o-b by Collin, too, or not have that "From:" line at all? ... > diff --git a/include/hw/s390x/ipl/diag320.h b/include/hw/s390x/ipl/diag320.h > new file mode 100644 > index 0000000000..d6f70c65df > --- /dev/null > +++ b/include/hw/s390x/ipl/diag320.h > @@ -0,0 +1,19 @@ > +/* > + * S/390 DIAGNOSE 320 definitions and structures > + * > + * Copyright 2025 IBM Corp. > + * Author(s): Zhuoying Cai <zycai@linux.ibm.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or (at > + * your option) any later version. See the COPYING file in the top-level > + * directory. By the way, new files need a SPDX-License-Identifier nowadays to make scripts/checkpatch.pl happy. > + */ > + > +#ifndef S390X_DIAG320_H > +#define S390X_DIAG320_H > + > +#define DIAG_320_SUBC_QUERY_ISM 0 > + > +#define DIAG_320_RC_OK 0x0001 > + > +#endif > diff --git a/target/s390x/diag.c b/target/s390x/diag.c > index da44b0133e..cb840e4b97 100644 > --- a/target/s390x/diag.c > +++ b/target/s390x/diag.c > @@ -192,3 +192,39 @@ out: > break; > } > } > + > +void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) > +{ > + S390CPU *cpu = env_archcpu(env); > + uint64_t subcode = env->regs[r3]; > + uint64_t addr = env->regs[r1]; > + int rc; Do we also need a s390_has_feat(S390_FEAT_DIAG_320) check here? > + if (env->psw.mask & PSW_MASK_PSTATE) { > + s390_program_interrupt(env, PGM_PRIVILEGED, ra); > + return; > + } > + > + if (r1 & 1) { > + s390_program_interrupt(env, PGM_SPECIFICATION, ra); > + return; > + } > + > + switch (subcode) { > + case DIAG_320_SUBC_QUERY_ISM: > + uint64_t ism = 0; > + > + if (s390_cpu_virt_mem_write(cpu, addr, (uint8_t)r1, &ism, I think you could drop the (uint8_t) here? > + be64_to_cpu(sizeof(ism)))) { be64_to_cpu() looks very wrong here! Thomas
On 4/11/25 9:43 AM, Thomas Huth wrote: > On 08/04/2025 17.55, Zhuoying Cai wrote: >> From: Collin Walling <walling@linux.ibm.com> > ... >> Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> > > So the patch is from Collin, but S-o-b only by you? Looks weird, this should > either have an additional S-o-b by Collin, too, or not have that "From:" > line at all? > Joy took over the bulk of this item as I had to shift priorities. The initial version of this patch was mine, but the work now reflects hers. The "from" line should not be there. @Joy, when you go through your rebasing/patch fixup, make sure this gets a `git commit ... --reset-author` so it reflects you as the proper owner. [...]
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 8c2a442255..1bd73b4dc1 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -17,6 +17,7 @@ #include "cpu.h" #include "exec/address-spaces.h" #include "hw/qdev-core.h" +#include "hw/s390x/ipl/diag320.h" #include "hw/s390x/ipl/qipl.h" #include "qom/object.h" diff --git a/include/hw/s390x/ipl/diag320.h b/include/hw/s390x/ipl/diag320.h new file mode 100644 index 0000000000..d6f70c65df --- /dev/null +++ b/include/hw/s390x/ipl/diag320.h @@ -0,0 +1,19 @@ +/* + * S/390 DIAGNOSE 320 definitions and structures + * + * Copyright 2025 IBM Corp. + * Author(s): Zhuoying Cai <zycai@linux.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or (at + * your option) any later version. See the COPYING file in the top-level + * directory. + */ + +#ifndef S390X_DIAG320_H +#define S390X_DIAG320_H + +#define DIAG_320_SUBC_QUERY_ISM 0 + +#define DIAG_320_RC_OK 0x0001 + +#endif diff --git a/target/s390x/diag.c b/target/s390x/diag.c index da44b0133e..cb840e4b97 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -192,3 +192,39 @@ out: break; } } + +void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) +{ + S390CPU *cpu = env_archcpu(env); + uint64_t subcode = env->regs[r3]; + uint64_t addr = env->regs[r1]; + int rc; + + if (env->psw.mask & PSW_MASK_PSTATE) { + s390_program_interrupt(env, PGM_PRIVILEGED, ra); + return; + } + + if (r1 & 1) { + s390_program_interrupt(env, PGM_SPECIFICATION, ra); + return; + } + + switch (subcode) { + case DIAG_320_SUBC_QUERY_ISM: + uint64_t ism = 0; + + if (s390_cpu_virt_mem_write(cpu, addr, (uint8_t)r1, &ism, + be64_to_cpu(sizeof(ism)))) { + s390_cpu_virt_mem_handle_exc(cpu, ra); + return; + } + + rc = DIAG_320_RC_OK; + break; + default: + s390_program_interrupt(env, PGM_SPECIFICATION, ra); + return; + } + env->regs[r1 + 1] = rc; +} diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index d07ca879a3..b013751478 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -98,6 +98,7 @@ #define DIAG_TIMEREVENT 0x288 #define DIAG_IPL 0x308 #define DIAG_SET_CONTROL_PROGRAM_CODES 0x318 +#define DIAG_CERT_STORE 0x320 #define DIAG_KVM_HYPERCALL 0x500 #define DIAG_KVM_BREAKPOINT 0x501 @@ -1561,6 +1562,16 @@ static void handle_diag_318(S390CPU *cpu, struct kvm_run *run) } } +static void kvm_handle_diag_320(S390CPU *cpu, struct kvm_run *run) +{ + uint64_t r1, r3; + + r1 = (run->s390_sieic.ipa & 0x00f0) >> 4; + r3 = run->s390_sieic.ipa & 0x000f; + + handle_diag_320(&cpu->env, r1, r3, RA_IGNORED); +} + #define DIAG_KVM_CODE_MASK 0x000000000000ffff static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb) @@ -1591,6 +1602,9 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb) case DIAG_KVM_BREAKPOINT: r = handle_sw_breakpoint(cpu, run); break; + case DIAG_CERT_STORE: + kvm_handle_diag_320(cpu, run); + break; default: trace_kvm_insn_diag(func_code); kvm_s390_program_interrupt(cpu, PGM_SPECIFICATION); diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index a4ba6227ab..86a652f833 100644 --- a/target/s390x/s390x-internal.h +++ b/target/s390x/s390x-internal.h @@ -400,6 +400,8 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3); void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra); +void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, + uintptr_t ra); /* translate.c */