s390 updates for 5.7-rc7
Vasily Gorbik
maintainerHello Linus,
please pull s390 changes for 5.7-rc7.
Thank you,
Vasily
The following changes since commit 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8:
Linux 5.7-rc5 (2020-05-10 15:16:58 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.7-4
for you to fetch changes up to 4c1cbcbd6c56c79de2c07159be4f55386bb0bef2:
s390/kaslr: add support for R_390_JMP_SLOT relocation type (2020-05-20 10:13:27 +0200)
----------------------------------------------------------------
s390 updates for 5.7-rc7
- Add missing R_390_JMP_SLOT relocation type in KASLR code.
- Fix set_huge_pte_at for empty ptes issue which has been uncovered with arch page table helper tests.
- Correct initrd location for kdump kernel.
- Fix s390_mmio_read/write with MIO in PCI code.
----------------------------------------------------------------
Gerald Schaefer (2):
s390/mm: fix set_huge_pte_at() for empty ptes s390/kaslr: add support for R_390_JMP_SLOT relocation type
Niklas Schnelle (1):
s390/pci: Fix s390_mmio_read/write with MIO
Philipp Rudo (1):
s390/kexec_file: fix initrd location for kdump kernel
arch/s390/include/asm/pci_io.h | 10 +- arch/s390/kernel/machine_kexec_file.c | 2 +- arch/s390/kernel/machine_kexec_reloc.c | 1 + arch/s390/mm/hugetlbpage.c | 9 +- arch/s390/pci/pci_mmio.c | 213 ++++++++++++++++++++++++++++++++- 5 files changed, 227 insertions(+), 8 deletions(-)
arch/s390/include/asm/pci_io.h +8 -2
@@ -8,6 +8,10 @@#include <linux/slab.h> #include <asm/pci_insn.h> +/* I/O size constraints */ +#define ZPCI_MAX_READ_SIZE 8 +#define ZPCI_MAX_WRITE_SIZE 128 +/* I/O Map */ #define ZPCI_IOMAP_SHIFT 48#define ZPCI_IOMAP_ADDR_BASE 0x8000000000000000UL
@@ -140,7 +144,8 @@ static inline int zpci_memcpy_fromio(void *dst,while (n >0 ) { size =zpci_get_max_write_size ((u64 __force ) src, - (u64 ) dst, n,8 ); + (u64 ) dst, n, +ZPCI_MAX_READ_SIZE ); rc =zpci_read_single (dst, src, size);if (rc)break ;
@@ -161,7 +166,8 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst,while (n >0 ) { size =zpci_get_max_write_size ((u64 __force ) dst, - (u64 ) src, n,128 ); + (u64 ) src, n, +ZPCI_MAX_WRITE_SIZE );if (size >8 )/* main path */ rc =zpci_write_block (dst, src, size);else
arch/s390/kernel/machine_kexec_file.c +1 -1
@@ -151,7 +151,7 @@ static int kexec_file_add_initrd(struct kimage *image, buf.mem += crashk_res.start; buf.memsz = buf.bufsz; - data->parm->initrd_start = buf.mem; + data->parm->initrd_start = data->memsz; data->parm->initrd_size = buf.memsz; data->memsz += buf.memsz;
arch/s390/kernel/machine_kexec_reloc.c +1 -0
@@ -28,6 +28,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val,break ;case R_390_64 :/* Direct 64 bit. */ case R_390_GLOB_DAT : +case R_390_JMP_SLOT : *(u64 *)loc = val;break ;case R_390_PC16 :/* PC relative 16 bit. */
arch/s390/mm/hugetlbpage.c +6 -3
@@ -159,10 +159,13 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, rste &= ~_SEGMENT_ENTRY_NOEXEC;/* Set correct table type for 2G hugepages */ -if ((pte_val (*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) - rste |= _REGION_ENTRY_TYPE_R3 | _REGION3_ENTRY_LARGE; -else +if ((pte_val (*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) { +if (likely (pte_present (pte))) + rste |= _REGION3_ENTRY_LARGE; + rste |= _REGION_ENTRY_TYPE_R3; + }else if (likely (pte_present (pte))) rste |= _SEGMENT_ENTRY_LARGE; +clear_huge_pte_skeys (mm, rste);pte_val (*ptep) = rste; }
arch/s390/pci/pci_mmio.c +211 -2
248 lines not on this page · raw message
The pull request you sent on Sat, 23 May 2020 12:18:25 +0200:
The pull request you sent on Sat, 23 May 2020 12:18:25 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.7-4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9bca7c40850eca2613d79878e6d730faeaa602cf
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker