* [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes
@ 2013-09-12 19:01 Christian Borntraeger
2013-09-12 19:01 ` [Qemu-devel] [PULLv2 1/6] s390/kvm: Add check for priviledged SCLP handler Christian Borntraeger
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Christian Borntraeger @ 2013-09-12 19:01 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Christian Borntraeger, Alexander Graf, qemu-devel
Anthony,
The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
are available in the git repository at:
git://github.com/borntraeger/qemu.git tags/s390-20130902
for you to fetch changes up to d66b1005d2ade6ce7854581aac6f3222f6dd7ea4:
s390/ioinst: Moved the CC setting to the IO instruction handlers (2013-09-02 16:55:14 +0200)
----------------------------------------------------------------
This is a bunch of cleanups and fixes for the s390 architecture.
Series is
Acked-by: Alexander Graf <agraf@suse.de>
----------------------------------------------------------------
Christian Borntraeger (2):
s390/dump: zero out padding bytes in notes sections
s390/ipl: Update the s390-ccw.img rom
Cornelia Huck (1):
s390/ipl: Fix waiting for virtio processing
Thomas Huth (3):
s390/kvm: Add check for priviledged SCLP handler
s390/cpu: Make setcc() function available to other files
s390/ioinst: Moved the CC setting to the IO instruction handlers
pc-bios/s390-ccw.img | Bin 9432 -> 9336 bytes
pc-bios/s390-ccw/virtio.c | 7 +--
pc-bios/s390-ccw/virtio.h | 1 +
target-s390x/arch_dump.c | 1 +
target-s390x/cpu.h | 11 ++++-
target-s390x/ioinst.c | 110 +++++++++++++++++++++-------------------------
target-s390x/ioinst.h | 26 +++++------
target-s390x/kvm.c | 54 ++++++++---------------
8 files changed, 96 insertions(+), 114 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [Qemu-devel] [PULLv2 1/6] s390/kvm: Add check for priviledged SCLP handler 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger @ 2013-09-12 19:01 ` Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 2/6] s390/dump: zero out padding bytes in notes sections Christian Borntraeger ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:01 UTC (permalink / raw) To: Anthony Liguori Cc: Christian Borntraeger, Thomas Huth, Alexander Graf, qemu-devel From: Thomas Huth <thuth@linux.vnet.ibm.com> The SCLP instruction is priviledged, so we should make sure that we generate an exception when it is called from the problem state. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- target-s390x/kvm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 185c8f5..dc1ed56 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -448,6 +448,10 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, int r = 0; cpu_synchronize_state(CPU(cpu)); + if (env->psw.mask & PSW_MASK_PSTATE) { + enter_pgmcheck(cpu, PGM_PRIVILEGED); + return 0; + } sccb = env->regs[ipbh0 & 0xf]; code = env->regs[(ipbh0 & 0xf0) >> 4]; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULLv2 2/6] s390/dump: zero out padding bytes in notes sections 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 1/6] s390/kvm: Add check for priviledged SCLP handler Christian Borntraeger @ 2013-09-12 19:01 ` Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 3/6] s390/ipl: Fix waiting for virtio processing Christian Borntraeger ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:01 UTC (permalink / raw) To: Anthony Liguori; +Cc: Christian Borntraeger, Alexander Graf, qemu-devel The prstatus of an s390x dump contains several padding areas. Zero out these bytes to make reading the notes section easier with a hexdump. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- target-s390x/arch_dump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-s390x/arch_dump.c b/target-s390x/arch_dump.c index 9d36116..5cbb53c 100644 --- a/target-s390x/arch_dump.c +++ b/target-s390x/arch_dump.c @@ -151,6 +151,7 @@ static int s390x_write_all_elf64_notes(const char *note_name, int ret = -1; for (nf = note_func; nf->note_contents_func; nf++) { + memset(¬e, 0, sizeof(note)); note.hdr.n_namesz = cpu_to_be32(sizeof(note.name)); note.hdr.n_descsz = cpu_to_be32(nf->contents_size); strncpy(note.name, note_name, sizeof(note.name)); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULLv2 3/6] s390/ipl: Fix waiting for virtio processing 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 1/6] s390/kvm: Add check for priviledged SCLP handler Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 2/6] s390/dump: zero out padding bytes in notes sections Christian Borntraeger @ 2013-09-12 19:01 ` Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 4/6] s390/ipl: Update the s390-ccw.img rom Christian Borntraeger ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:01 UTC (permalink / raw) To: Anthony Liguori Cc: Cornelia Huck, Christian Borntraeger, Alexander Graf, qemu-devel From: Cornelia Huck <cornelia.huck@de.ibm.com> The guest side must not manipulate the index for the used buffers. Instead, remember the state of the used buffer locally and wait until it has moved. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- pc-bios/s390-ccw/virtio.c | 7 ++++--- pc-bios/s390-ccw/virtio.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 49f2d29..4d6e48f 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -123,6 +123,7 @@ static void vring_init(struct vring *vr, unsigned int num, void *p, /* We're running with interrupts off anyways, so don't bother */ vr->used->flags = VRING_USED_F_NO_NOTIFY; vr->used->idx = 0; + vr->used_idx = 0; debug_print_addr("init vr", vr); } @@ -150,8 +151,6 @@ static void vring_send_buf(struct vring *vr, void *p, int len, int flags) if (!(flags & VRING_DESC_F_NEXT)) { vr->avail->idx++; } - - vr->used->idx = vr->next_idx; } static u64 get_clock(void) @@ -180,7 +179,8 @@ static int vring_wait_reply(struct vring *vr, int timeout) struct subchannel_id schid = vr->schid; int r = 0; - while (vr->used->idx == vr->next_idx) { + /* Wait until the used index has moved. */ + while (vr->used->idx == vr->used_idx) { vring_notify(schid); if (timeout && (get_second() >= target_second)) { r = 1; @@ -189,6 +189,7 @@ static int vring_wait_reply(struct vring *vr, int timeout) yield(); } + vr->used_idx = vr->used->idx; vr->next_idx = 0; vr->desc[0].len = 0; vr->desc[0].flags = 0; diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index 86fdd57..772a63f 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -115,6 +115,7 @@ struct vring_used { struct vring { unsigned int num; int next_idx; + int used_idx; struct vring_desc *desc; struct vring_avail *avail; struct vring_used *used; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULLv2 4/6] s390/ipl: Update the s390-ccw.img rom 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger ` (2 preceding siblings ...) 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 3/6] s390/ipl: Fix waiting for virtio processing Christian Borntraeger @ 2013-09-12 19:01 ` Christian Borntraeger 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 5/6] s390/cpu: Make setcc() function available to other files Christian Borntraeger 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 6/6] s390/ioinst: Moved the CC setting to the IO instruction handlers Christian Borntraeger 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:01 UTC (permalink / raw) To: Anthony Liguori; +Cc: Christian Borntraeger, Alexander Graf, qemu-devel Rebuild of the virtio-ccw rom containing these patches: 1. s390/ipl: Fix waiting for virtio processing Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- pc-bios/s390-ccw.img | Bin 9432 -> 9336 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index 05fc7c2fae97caf222d9ccce88631d8a20ccd565..6727f0ca39d6bf6d114974d1535cb7ad9e56355f 100644 GIT binary patch literal 9336 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 U<32@#56aKxd7D2r=jhYF0b?J4UH||9 literal 9432 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 BZma+R -- 1.8.3.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULLv2 5/6] s390/cpu: Make setcc() function available to other files 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger ` (3 preceding siblings ...) 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 4/6] s390/ipl: Update the s390-ccw.img rom Christian Borntraeger @ 2013-09-12 19:02 ` Christian Borntraeger 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 6/6] s390/ioinst: Moved the CC setting to the IO instruction handlers Christian Borntraeger 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:02 UTC (permalink / raw) To: Anthony Liguori Cc: Christian Borntraeger, Thomas Huth, Alexander Graf, qemu-devel From: Thomas Huth <thuth@linux.vnet.ibm.com> Moved the setcc() function to cpu.h so that it can be used by other files, too. It now also does not modify the kvm state anymore since this gets updated during kvm_arch_put_registers() anyway. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- target-s390x/cpu.h | 11 +++++++++-- target-s390x/kvm.c | 12 ------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 8be5648..a2c077b 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -148,6 +148,7 @@ typedef struct CPUS390XState { } CPUS390XState; #include "cpu-qom.h" +#include <sysemu/kvm.h> /* distinguish between 24 bit and 31 bit addressing */ #define HIGH_ORDER_BIT 0x80000000 @@ -692,6 +693,14 @@ static inline const char *cc_name(int cc_op) return cc_names[cc_op]; } +static inline void setcc(S390CPU *cpu, uint64_t cc) +{ + CPUS390XState *env = &cpu->env; + + env->psw.mask &= ~(3ull << 44); + env->psw.mask |= (cc & 3) << 44; +} + typedef struct LowCore { /* prefix area: defined by architecture */ @@ -1058,8 +1067,6 @@ void program_interrupt(CPUS390XState *env, uint32_t code, int ilen); void QEMU_NORETURN runtime_exception(CPUS390XState *env, int excp, uintptr_t retaddr); -#include <sysemu/kvm.h> - #ifdef CONFIG_KVM void kvm_s390_io_interrupt(S390CPU *cpu, uint16_t subchannel_id, uint16_t subchannel_nr, uint32_t io_int_parm, diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index dc1ed56..3dff6be 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -427,18 +427,6 @@ static void enter_pgmcheck(S390CPU *cpu, uint16_t code) kvm_s390_interrupt(cpu, KVM_S390_PROGRAM_INT, code); } -static inline void setcc(S390CPU *cpu, uint64_t cc) -{ - CPUS390XState *env = &cpu->env; - CPUState *cs = CPU(cpu); - - cs->kvm_run->psw_mask &= ~(3ull << 44); - cs->kvm_run->psw_mask |= (cc & 3) << 44; - - env->psw.mask &= ~(3ul << 44); - env->psw.mask |= (cc & 3) << 44; -} - static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, uint16_t ipbh0) { -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULLv2 6/6] s390/ioinst: Moved the CC setting to the IO instruction handlers 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger ` (4 preceding siblings ...) 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 5/6] s390/cpu: Make setcc() function available to other files Christian Borntraeger @ 2013-09-12 19:02 ` Christian Borntraeger 5 siblings, 0 replies; 7+ messages in thread From: Christian Borntraeger @ 2013-09-12 19:02 UTC (permalink / raw) To: Anthony Liguori Cc: Christian Borntraeger, Thomas Huth, Alexander Graf, qemu-devel From: Thomas Huth <thuth@linux.vnet.ibm.com> The IO instruction handlers now take care of setting the CC value on their own, so that the confusing return code magic in kvm_handle_css_inst() is not needed anymore. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- target-s390x/ioinst.c | 110 +++++++++++++++++++++++--------------------------- target-s390x/ioinst.h | 26 ++++++------ target-s390x/kvm.c | 38 +++++++---------- 3 files changed, 77 insertions(+), 97 deletions(-) diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 85fd285..8d6363d 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -36,7 +36,7 @@ int ioinst_disassemble_sch_ident(uint32_t value, int *m, int *cssid, int *ssid, return 0; } -int ioinst_handle_xsch(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1) { int cssid, ssid, schid, m; SubchDev *sch; @@ -44,8 +44,8 @@ int ioinst_handle_xsch(CPUS390XState *env, uint64_t reg1) int cc; if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { - program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + program_interrupt(&cpu->env, PGM_OPERAND, 2); + return; } trace_ioinst_sch_id("xsch", cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid); @@ -66,11 +66,10 @@ int ioinst_handle_xsch(CPUS390XState *env, uint64_t reg1) cc = 1; break; } - - return cc; + setcc(cpu, cc); } -int ioinst_handle_csch(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1) { int cssid, ssid, schid, m; SubchDev *sch; @@ -78,8 +77,8 @@ int ioinst_handle_csch(CPUS390XState *env, uint64_t reg1) int cc; if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { - program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + program_interrupt(&cpu->env, PGM_OPERAND, 2); + return; } trace_ioinst_sch_id("csch", cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid); @@ -91,10 +90,10 @@ int ioinst_handle_csch(CPUS390XState *env, uint64_t reg1) } else { cc = 0; } - return cc; + setcc(cpu, cc); } -int ioinst_handle_hsch(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1) { int cssid, ssid, schid, m; SubchDev *sch; @@ -102,8 +101,8 @@ int ioinst_handle_hsch(CPUS390XState *env, uint64_t reg1) int cc; if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { - program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + program_interrupt(&cpu->env, PGM_OPERAND, 2); + return; } trace_ioinst_sch_id("hsch", cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid); @@ -124,8 +123,7 @@ int ioinst_handle_hsch(CPUS390XState *env, uint64_t reg1) cc = 1; break; } - - return cc; + setcc(cpu, cc); } static int ioinst_schib_valid(SCHIB *schib) @@ -141,7 +139,7 @@ static int ioinst_schib_valid(SCHIB *schib) return 1; } -int ioinst_handle_msch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) +void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb) { int cssid, ssid, schid, m; SubchDev *sch; @@ -150,22 +148,21 @@ int ioinst_handle_msch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) int ret = -ENODEV; int cc; hwaddr len = sizeof(*schib); + CPUS390XState *env = &cpu->env; addr = decode_basedisp_s(env, ipb); if (addr & 3) { program_interrupt(env, PGM_SPECIFICATION, 2); - return -EIO; + return; } schib = s390_cpu_physical_memory_map(env, addr, &len, 0); if (!schib || len != sizeof(*schib)) { program_interrupt(env, PGM_ADDRESSING, 2); - cc = -EIO; goto out; } if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid) || !ioinst_schib_valid(schib)) { program_interrupt(env, PGM_OPERAND, 2); - cc = -EIO; goto out; } trace_ioinst_sch_id("msch", cssid, ssid, schid); @@ -187,9 +184,10 @@ int ioinst_handle_msch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc = 1; break; } + setcc(cpu, cc); + out: s390_cpu_physical_memory_unmap(env, schib, len, 0); - return cc; } static void copy_orb_from_guest(ORB *dest, const ORB *src) @@ -213,7 +211,7 @@ static int ioinst_orb_valid(ORB *orb) return 1; } -int ioinst_handle_ssch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) +void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb) { int cssid, ssid, schid, m; SubchDev *sch; @@ -222,23 +220,22 @@ int ioinst_handle_ssch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) int ret = -ENODEV; int cc; hwaddr len = sizeof(*orig_orb); + CPUS390XState *env = &cpu->env; addr = decode_basedisp_s(env, ipb); if (addr & 3) { program_interrupt(env, PGM_SPECIFICATION, 2); - return -EIO; + return; } orig_orb = s390_cpu_physical_memory_map(env, addr, &len, 0); if (!orig_orb || len != sizeof(*orig_orb)) { program_interrupt(env, PGM_ADDRESSING, 2); - cc = -EIO; goto out; } copy_orb_from_guest(&orb, orig_orb); if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid) || !ioinst_orb_valid(&orb)) { program_interrupt(env, PGM_OPERAND, 2); - cc = -EIO; goto out; } trace_ioinst_sch_id("ssch", cssid, ssid, schid); @@ -260,38 +257,39 @@ int ioinst_handle_ssch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc = 1; break; } + setcc(cpu, cc); out: s390_cpu_physical_memory_unmap(env, orig_orb, len, 0); - return cc; } -int ioinst_handle_stcrw(CPUS390XState *env, uint32_t ipb) +void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb) { CRW *crw; uint64_t addr; int cc; hwaddr len = sizeof(*crw); + CPUS390XState *env = &cpu->env; addr = decode_basedisp_s(env, ipb); if (addr & 3) { program_interrupt(env, PGM_SPECIFICATION, 2); - return -EIO; + return; } crw = s390_cpu_physical_memory_map(env, addr, &len, 1); if (!crw || len != sizeof(*crw)) { program_interrupt(env, PGM_ADDRESSING, 2); - cc = -EIO; goto out; } cc = css_do_stcrw(crw); /* 0 - crw stored, 1 - zeroes stored */ + setcc(cpu, cc); + out: s390_cpu_physical_memory_unmap(env, crw, len, 1); - return cc; } -int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) +void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb) { int cssid, ssid, schid, m; SubchDev *sch; @@ -299,22 +297,21 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) int cc; SCHIB *schib; hwaddr len = sizeof(*schib); + CPUS390XState *env = &cpu->env; addr = decode_basedisp_s(env, ipb); if (addr & 3) { program_interrupt(env, PGM_SPECIFICATION, 2); - return -EIO; + return; } schib = s390_cpu_physical_memory_map(env, addr, &len, 1); if (!schib || len != sizeof(*schib)) { program_interrupt(env, PGM_ADDRESSING, 2); - cc = -EIO; goto out; } if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { program_interrupt(env, PGM_OPERAND, 2); - cc = -EIO; goto out; } trace_ioinst_sch_id("stsch", cssid, ssid, schid); @@ -336,9 +333,10 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc = 0; } } + setcc(cpu, cc); + out: s390_cpu_physical_memory_unmap(env, schib, len, 1); - return cc; } int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) @@ -575,7 +573,7 @@ static void ioinst_handle_chsc_unimplemented(ChscResp *res) res->param = 0; } -int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb) +void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb) { ChscReq *req; ChscResp *res; @@ -584,7 +582,7 @@ int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb) uint16_t len; uint16_t command; hwaddr map_size = TARGET_PAGE_SIZE; - int ret = 0; + CPUS390XState *env = &cpu->env; trace_ioinst("chsc"); reg = (ipb >> 20) & 0x00f; @@ -592,19 +590,17 @@ int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb) /* Page boundary? */ if (addr & 0xfff) { program_interrupt(env, PGM_SPECIFICATION, 2); - return -EIO; + return; } req = s390_cpu_physical_memory_map(env, addr, &map_size, 1); if (!req || map_size != TARGET_PAGE_SIZE) { program_interrupt(env, PGM_ADDRESSING, 2); - ret = -EIO; goto out; } len = be16_to_cpu(req->len); /* Length field valid? */ if ((len < 16) || (len > 4088) || (len & 7)) { program_interrupt(env, PGM_OPERAND, 2); - ret = -EIO; goto out; } memset((char *)req + len, 0, TARGET_PAGE_SIZE - len); @@ -628,7 +624,6 @@ int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb) out: s390_cpu_physical_memory_unmap(env, req, map_size, 1); - return ret; } int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb) @@ -666,18 +661,19 @@ out: #define SCHM_REG1_UPD(_reg) ((_reg & 0x0000000000000002) >> 1) #define SCHM_REG1_DCT(_reg) (_reg & 0x0000000000000001) -int ioinst_handle_schm(CPUS390XState *env, uint64_t reg1, uint64_t reg2, - uint32_t ipb) +void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1, uint64_t reg2, + uint32_t ipb) { uint8_t mbk; int update; int dct; + CPUS390XState *env = &cpu->env; trace_ioinst("schm"); if (SCHM_REG1_RES(reg1)) { program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + return; } mbk = SCHM_REG1_MBK(reg1); @@ -686,15 +682,13 @@ int ioinst_handle_schm(CPUS390XState *env, uint64_t reg1, uint64_t reg2, if (update && (reg2 & 0x000000000000001f)) { program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + return; } css_do_schm(mbk, update, dct, update ? reg2 : 0); - - return 0; } -int ioinst_handle_rsch(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_rsch(S390CPU *cpu, uint64_t reg1) { int cssid, ssid, schid, m; SubchDev *sch; @@ -702,8 +696,8 @@ int ioinst_handle_rsch(CPUS390XState *env, uint64_t reg1) int cc; if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { - program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + program_interrupt(&cpu->env, PGM_OPERAND, 2); + return; } trace_ioinst_sch_id("rsch", cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid); @@ -724,24 +718,23 @@ int ioinst_handle_rsch(CPUS390XState *env, uint64_t reg1) cc = 1; break; } - - return cc; - + setcc(cpu, cc); } #define RCHP_REG1_RES(_reg) (_reg & 0x00000000ff00ff00) #define RCHP_REG1_CSSID(_reg) ((_reg & 0x0000000000ff0000) >> 16) #define RCHP_REG1_CHPID(_reg) (_reg & 0x00000000000000ff) -int ioinst_handle_rchp(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_rchp(S390CPU *cpu, uint64_t reg1) { int cc; uint8_t cssid; uint8_t chpid; int ret; + CPUS390XState *env = &cpu->env; if (RCHP_REG1_RES(reg1)) { program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + return; } cssid = RCHP_REG1_CSSID(reg1); @@ -764,19 +757,16 @@ int ioinst_handle_rchp(CPUS390XState *env, uint64_t reg1) default: /* Invalid channel subsystem. */ program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + return; } - - return cc; + setcc(cpu, cc); } #define SAL_REG1_INVALID(_reg) (_reg & 0x0000000080000000) -int ioinst_handle_sal(CPUS390XState *env, uint64_t reg1) +void ioinst_handle_sal(S390CPU *cpu, uint64_t reg1) { /* We do not provide address limit checking, so let's suppress it. */ if (SAL_REG1_INVALID(reg1) || reg1 & 0x000000000000ffff) { - program_interrupt(env, PGM_OPERAND, 2); - return -EIO; + program_interrupt(&cpu->env, PGM_OPERAND, 2); } - return 0; } diff --git a/target-s390x/ioinst.h b/target-s390x/ioinst.h index 7bed291..613da49 100644 --- a/target-s390x/ioinst.h +++ b/target-s390x/ioinst.h @@ -214,20 +214,20 @@ typedef struct IOIntCode { int ioinst_disassemble_sch_ident(uint32_t value, int *m, int *cssid, int *ssid, int *schid); -int ioinst_handle_xsch(CPUS390XState *env, uint64_t reg1); -int ioinst_handle_csch(CPUS390XState *env, uint64_t reg1); -int ioinst_handle_hsch(CPUS390XState *env, uint64_t reg1); -int ioinst_handle_msch(CPUS390XState *env, uint64_t reg1, uint32_t ipb); -int ioinst_handle_ssch(CPUS390XState *env, uint64_t reg1, uint32_t ipb); -int ioinst_handle_stcrw(CPUS390XState *env, uint32_t ipb); -int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb); +void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1); +void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1); +void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1); +void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); +void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); +void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb); +void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb); -int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb); +void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb); int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb); -int ioinst_handle_schm(CPUS390XState *env, uint64_t reg1, uint64_t reg2, - uint32_t ipb); -int ioinst_handle_rsch(CPUS390XState *env, uint64_t reg1); -int ioinst_handle_rchp(CPUS390XState *env, uint64_t reg1); -int ioinst_handle_sal(CPUS390XState *env, uint64_t reg1); +void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1, uint64_t reg2, + uint32_t ipb); +void ioinst_handle_rsch(S390CPU *cpu, uint64_t reg1); +void ioinst_handle_rchp(S390CPU *cpu, uint64_t reg1); +void ioinst_handle_sal(S390CPU *cpu, uint64_t reg1); #endif diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 3dff6be..f254b9b 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -455,8 +455,6 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, static int kvm_handle_css_inst(S390CPU *cpu, struct kvm_run *run, uint8_t ipa0, uint8_t ipa1, uint8_t ipb) { - int r = 0; - int no_cc = 0; CPUS390XState *env = &cpu->env; CPUState *cs = CPU(cpu); @@ -470,69 +468,61 @@ static int kvm_handle_css_inst(S390CPU *cpu, struct kvm_run *run, switch (ipa1) { case PRIV_XSCH: - r = ioinst_handle_xsch(env, env->regs[1]); + ioinst_handle_xsch(cpu, env->regs[1]); break; case PRIV_CSCH: - r = ioinst_handle_csch(env, env->regs[1]); + ioinst_handle_csch(cpu, env->regs[1]); break; case PRIV_HSCH: - r = ioinst_handle_hsch(env, env->regs[1]); + ioinst_handle_hsch(cpu, env->regs[1]); break; case PRIV_MSCH: - r = ioinst_handle_msch(env, env->regs[1], run->s390_sieic.ipb); + ioinst_handle_msch(cpu, env->regs[1], run->s390_sieic.ipb); break; case PRIV_SSCH: - r = ioinst_handle_ssch(env, env->regs[1], run->s390_sieic.ipb); + ioinst_handle_ssch(cpu, env->regs[1], run->s390_sieic.ipb); break; case PRIV_STCRW: - r = ioinst_handle_stcrw(env, run->s390_sieic.ipb); + ioinst_handle_stcrw(cpu, run->s390_sieic.ipb); break; case PRIV_STSCH: - r = ioinst_handle_stsch(env, env->regs[1], run->s390_sieic.ipb); + ioinst_handle_stsch(cpu, env->regs[1], run->s390_sieic.ipb); break; case PRIV_TSCH: /* We should only get tsch via KVM_EXIT_S390_TSCH. */ fprintf(stderr, "Spurious tsch intercept\n"); break; case PRIV_CHSC: - r = ioinst_handle_chsc(env, run->s390_sieic.ipb); + ioinst_handle_chsc(cpu, run->s390_sieic.ipb); break; case PRIV_TPI: /* This should have been handled by kvm already. */ fprintf(stderr, "Spurious tpi intercept\n"); break; case PRIV_SCHM: - no_cc = 1; - r = ioinst_handle_schm(env, env->regs[1], env->regs[2], - run->s390_sieic.ipb); + ioinst_handle_schm(cpu, env->regs[1], env->regs[2], + run->s390_sieic.ipb); break; case PRIV_RSCH: - r = ioinst_handle_rsch(env, env->regs[1]); + ioinst_handle_rsch(cpu, env->regs[1]); break; case PRIV_RCHP: - r = ioinst_handle_rchp(env, env->regs[1]); + ioinst_handle_rchp(cpu, env->regs[1]); break; case PRIV_STCPS: /* We do not provide this instruction, it is suppressed. */ - no_cc = 1; - r = 0; break; case PRIV_SAL: - no_cc = 1; - r = ioinst_handle_sal(env, env->regs[1]); + ioinst_handle_sal(cpu, env->regs[1]); break; case PRIV_SIGA: /* Not provided, set CC = 3 for subchannel not operational */ - r = 3; + setcc(cpu, 3); break; default: return -1; } - if (r >= 0 && !no_cc) { - setcc(cpu, r); - } - return 0; } -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-09-12 19:02 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-09-12 19:01 [Qemu-devel] [PULLv2 0/6] s390: cleanups and fixes Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 1/6] s390/kvm: Add check for priviledged SCLP handler Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 2/6] s390/dump: zero out padding bytes in notes sections Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 3/6] s390/ipl: Fix waiting for virtio processing Christian Borntraeger 2013-09-12 19:01 ` [Qemu-devel] [PULLv2 4/6] s390/ipl: Update the s390-ccw.img rom Christian Borntraeger 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 5/6] s390/cpu: Make setcc() function available to other files Christian Borntraeger 2013-09-12 19:02 ` [Qemu-devel] [PULLv2 6/6] s390/ioinst: Moved the CC setting to the IO instruction handlers Christian Borntraeger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).