Skip to content

s390x/tcg: cleanup and fix program interrupts

David Hildenbrand qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest16 patches 2 repliesIn review
  2. v216 patches 22 repliesSuperseded
  3. v115 patches 38 repliesSuperseded

Changes in v3 from the cover letter

- "s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw()" -- don't break old KVM
- Unfortunately not able to come up with a better solution for "s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG)" so I assume we'll go with this for now.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16s390x/tcg: introduce and use s390_program_interrupt()target/s390x/cpu.h target/s390x/crypto_helper.c target/s390x/excp_helper.c +3 more+30 -350 replies
2/16s390x/tcg: get rid of runtime_exception()target/s390x/fpu_helper.c target/s390x/int_helper.c target/s390x/internal.h +1 more+8 -260 replies
3/16s390x/tcg: rip out dead tpi codehw/s390x/css.c include/hw/s390x/css.h target/s390x/internal.h +1 more+0 -340 replies
4/16s390x/ioinst: pass the retaddr to all IO instructionstarget/s390x/cpu.h target/s390x/internal.h target/s390x/ioinst.c +2 more+75 -690 replies
5/16s390x/pci: pass the retaddr to all PCI instructionshw/s390x/s390-pci-inst.c hw/s390x/s390-pci-inst.h target/s390x/kvm.c+59 -540 replies
6/16s390x/diag: pass the retaddr into handle_diag_308()target/s390x/diag.c target/s390x/internal.h target/s390x/kvm.c +1 more+11 -100 replies
7/16s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG)hw/s390x/s390-pci-inst.c target/s390x/cpu.h target/s390x/ioinst.c +1 more+39 -30 replies
8/16s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw()target/s390x/mmu_helper.c+6 -30 replies
9/16s390x/tcg: io instructions don't need potential_page_fault()target/s390x/translate.c+0 -100 replies
10/16s390x/tcg: use s390_program_interrupt() in SCLP Service Calltarget/s390x/misc_helper.c target/s390x/translate.c+2 -40 replies
11/16s390x/tcg: use s390_program_interrupt() in DIAGtarget/s390x/misc_helper.c target/s390x/translate.c+1 -40 replies
12/16s390x/tcg: use s390_program_interrupt() in per_check_exception()target/s390x/misc_helper.c target/s390x/translate.c+1 -40 replies
13/16s390x/tcg: use s390_program_interrupt() in SACFtarget/s390x/cc_helper.c+1 -10 replies
14/16s390x/tcg: use s390_program_interrupt() in STSItarget/s390x/misc_helper.c target/s390x/translate.c+1 -20 replies
15/16s390x/tcg: drop program_interrupt()target/s390x/cpu.h target/s390x/interrupt.c+5 -180 replies
16/16s390x/tcg: drop potential_page_fault()target/s390x/translate.c+2 -70 replies

Reviews trailers per patch

14 of 16 patches have a Reviewed-by or Acked-by.

PatchRichard HendersonThomas Huth
1/16R-b R-b
2/16R-b R-b
3/16R-b R-b
4/16R-b R-b
5/16R-b R-b
6/16R-b
7/16R-b
8/16
9/16R-b R-b
10/16
11/16R-b
12/16R-b
13/16R-b R-b
14/16R-b R-b
15/16R-b R-b
16/16R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [Qemu-devel] [PATCH v3 for-2.12 00/16] s390x/tcg: cleanup and fix program interrupts

I have quite some patches on my queue for 2.12. (booting Fedora 26/27 guests, floating interrupts, machine checks, missing instructions ...)

So let's start slowly This series gets rid of program_interrupt() and potential_page_fault(). We now always properly restore the cpu state when injecting/delivering a program interrupt. So there is no need to update the state via potential_page_fault() anymore.

In addition, handling for program interrupts comming via s390_cpu_virt_mem_rw() was missing something for the TCG case. Also fixed.

v2 -> v3:
- "s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw()" -- don't break old KVM
- Unfortunately not able to come up with a better solution for "s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG)" so I assume we'll go with this for now.

v1 -> v2:
- renamed program_interrupt_ra() to s390_program_interrupt()
- introduce and use RA_IGNORED for KVM.
- switch to cpu_exit_loop_restore() and don't check if ra is set
- "s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG)" -> split out "s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw()"
- "s390x/tcg: use program_interrupt_ra() in SCLP Service Call" -> moved qemu_mutex_lock_iothread(); further up
- "s390x/tcg: drop program_interrupt()"
-> move restore to tcg_s390_program_interrupt() via cpu_loop_exit_restore()
- smaller requested cleanups

David Hildenbrand (16):
s390x/tcg: introduce and use s390_program_interrupt() s390x/tcg: get rid of runtime_exception()
s390x/tcg: rip out dead tpi code
s390x/ioinst: pass the retaddr to all IO instructions s390x/pci: pass the retaddr to all PCI instructions s390x/diag: pass the retaddr into handle_diag_308()
s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG) s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw() s390x/tcg: io instructions don't need potential_page_fault() s390x/tcg: use s390_program_interrupt() in SCLP Service Call s390x/tcg: use s390_program_interrupt() in DIAG
s390x/tcg: use s390_program_interrupt() in per_check_exception() s390x/tcg: use s390_program_interrupt() in SACF
s390x/tcg: use s390_program_interrupt() in STSI
s390x/tcg: drop program_interrupt()
s390x/tcg: drop potential_page_fault()

 hw/s390x/css.c               |   6 ---
 hw/s390x/s390-pci-inst.c     |  90 +++++++++++++++++++---------------
 hw/s390x/s390-pci-inst.h     |  16 +++---
 include/hw/s390x/css.h       |   1 -
 target/s390x/cc_helper.c     |   2 +-
 target/s390x/cpu.h           |   5 +-
 target/s390x/crypto_helper.c |   7 +--
 target/s390x/diag.c          |  14 +++---
 target/s390x/excp_helper.c   |   5 +-
 target/s390x/fpu_helper.c    |   2 +-
 target/s390x/int_helper.c    |  14 +++---
 target/s390x/internal.h      |  35 +++++++-------
 target/s390x/interrupt.c     |   9 ++--
 target/s390x/ioinst.c        | 113 +++++++++++++++++++------------------------
 target/s390x/kvm.c           |  43 ++++++++--------
 target/s390x/mem_helper.c    |  35 +++++---------
 target/s390x/misc_helper.c   |  52 +++++++-------------
 target/s390x/mmu_helper.c    |  23 +++++++--
 target/s390x/translate.c     |  27 +----------
 19 files changed, 228 insertions(+), 271 deletions(-)
Signature · 1 line
2.14.3