Skip to contentSkip to conversation

more s390 updates for 5.19 merge window

GIT PULL Merged Heiko Carstens 2 participants 2 messages Jun 3, 2022 s390

lore
Share & tools
lore

Heiko Carstens

author maintainer
#0 lore raw

Hi Linus,

please pull more s390 updates for 5.19 merge window. Just a couple of small improvements, bug fixes and cleanups.

Thanks,
Heiko

The following changes since commit 94d3477897481b92874654455e263e0b1728acb5:

s390/head: get rid of 31 bit leftovers (2022-05-18 13:31:07 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.19-2

for you to fetch changes up to e0ffcf3fe18e0310221461c08969edec2cc7628c:

s390/stack: add union to reflect kvm stack slot usages (2022-06-01 12:03:17 +0200)

----------------------------------------------------------------
more s390 updates for 5.19 merge window

- Add Eric Farman as maintainer for s390 virtio drivers.

- Improve machine check handling, and avoid incorrectly injecting a machine check into a kvm guest.

- Add cond_resched() call to gmap page table walker in order to avoid possible huge latencies. Also use non-quiesing sske instruction to speed up storage key handling.

- Add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP so s390 behaves similar like common code.

- Get sie control block address from correct stack slot in perf event code. This fixes potential random memory accesses.

- Change uaccess code so that the exception handler sets the result of get_user() and __get_kernel_nofault() to zero in case of a fault. Until now this was done via input parameters for inline assemblies. Doing it via fault handling is what most or even all other architectures are doing.

- Couple of other small cleanups and fixes.

----------------------------------------------------------------
Alexander Gordeev (1):
s390/mcck: isolate SIE instruction when setting CIF_MCCK_GUEST flag

Christian Borntraeger (2):
s390/gmap: voluntarily schedule during key setting s390/mm: use non-quiescing sske for KVM switch to keyed guest

Eric Farman (1):
MAINTAINERS: Update s390 virtio-ccw

Heiko Carstens (9):
s390: simplify early program check handler
s390: generate register offsets into pt_regs automatically s390/kexec: add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP s390/uaccess: use symbolic names for inline assembler operands s390/uaccess: use exception handler to zero result on get_user() failure s390/uaccess: use __noreturn instead of __attribute__((noreturn)) s390/uaccess: whitespace cleanup
s390/stack: merge empty stack frame slots
s390/stack: add union to reflect kvm stack slot usages

Jann Horn (1):
s390/crypto: fix scatterwalk_unmap() callers in AES-GCM

Juerg Haefliger (2):
s390/Kconfig: fix indentation
s390/Kconfig.debug: fix indentation

Nico Boehr (1):
s390/perf: obtain sie_block from the right address

 MAINTAINERS                             |   1 +
 arch/s390/Kconfig                       |   8 +-
 arch/s390/Kconfig.debug                 |  12 +-
 arch/s390/crypto/aes_s390.c             |   4 +-
 arch/s390/include/asm/asm-extable.h     |  91 +++++++++-----
 arch/s390/include/asm/kexec.h           |   2 +-
 arch/s390/include/asm/processor.h       |   6 -
 arch/s390/include/asm/stacktrace.h      |  11 +-
 arch/s390/include/asm/uaccess.h         | 217 +++++++++++++++++---------------
 arch/s390/kernel/Makefile               |   2 +-
 arch/s390/kernel/asm-offsets.c          |  26 +++-
 arch/s390/kernel/early.c                |   5 +-
 arch/s390/kernel/{base.S => earlypgm.S} |  33 +----
 arch/s390/kernel/entry.S                |  23 +---
 arch/s390/kernel/entry.h                |   2 +
 arch/s390/kernel/perf_event.c           |   2 +-
 arch/s390/mm/extable.c                  |  39 +++++-
 arch/s390/mm/gmap.c                     |  14 +++
 arch/s390/mm/pgtable.c                  |   2 +-
 19 files changed, 289 insertions(+), 211 deletions(-)
 rename arch/s390/kernel/{base.S => earlypgm.S} (52%)