Commit 0723a166 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Heiko Carstens:

 - Use the MSI parent domain API instead of the legacy API for setup and
   teardown of PCI MSI IRQs

 - Select POSIX_CPU_TIMERS_TASK_WORK now that VIRT_XFER_TO_GUEST_WORK
   has been implemented for s390

 - Fix a KVM bug which can lead to guest memory corruption

 - Fix KASAN shadow memory mapping for hotplugged memory

 - Minor bug fixes and improvements

* tag 's390-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/bug: Add missing alignment
  s390/bug: Add missing CONFIG_BUG ifdef again
  KVM: s390: Fix gmap_helper_zap_one_page() again
  s390/pci: Migrate s390 IRQ logic to IRQ domain API
  genirq: Change hwirq parameter to irq_hw_number_t
  s390: Select POSIX_CPU_TIMERS_TASK_WORK
  s390: Unmap early KASAN shadow on memory offlining
  s390/vmem: Support 2G page splitting for KASAN shadow freeing
  s390/boot: Use entire page for PTEs
  s390/vmur: Use scnprintf() instead of sprintf()
parents 840b22ed 70075e3d

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ config S390 
	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_POSIX_CPU_TIMERS_TASK_WORK

	select HAVE_PREEMPT_DYNAMIC_KEY

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE
@@ -254,6 +255,7 @@ config S390 
	select HOTPLUG_SMT

	select IOMMU_HELPER		if PCI

	select IOMMU_SUPPORT		if PCI

	select IRQ_MSI_LIB		if PCI

	select KASAN_VMALLOC if KASAN

	select LOCK_MM_AND_FIND_VMA

	select MMU_GATHER_MERGE_VMAS

arch/s390/boot/vmem.c

+2 −14
Original line number Diff line number Diff line
@@ -244,22 +244,10 @@ static void *boot_crst_alloc(unsigned long val) 


static pte_t *boot_pte_alloc(void)

{

	static void *pte_leftover;

	pte_t *pte;



	/*

	 * handling pte_leftovers this way helps to avoid memory fragmentation

	 * during POPULATE_KASAN_MAP_SHADOW when EDAT is off

	 */

	if (!pte_leftover) {

		pte_leftover = (void *)physmem_alloc_or_die(RR_VMEM, PAGE_SIZE, PAGE_SIZE);

		pte = pte_leftover + _PAGE_TABLE_SIZE;

	pte = (void *)physmem_alloc_or_die(RR_VMEM, PAGE_SIZE, PAGE_SIZE);

	__arch_set_page_dat(pte, 1);

	} else {

		pte = pte_leftover;

		pte_leftover = NULL;

	}



	memset64((u64 *)pte, _PAGE_INVALID, PTRS_PER_PTE);

	return pte;

}

arch/s390/include/asm/bug.h

+5 −0
Original line number Diff line number Diff line
@@ -4,11 +4,14 @@ 


#include <linux/stringify.h>



#ifdef CONFIG_BUG



#ifndef CONFIG_DEBUG_BUGVERBOSE

#define _BUGVERBOSE_LOCATION(file, line)

#else

#define __BUGVERBOSE_LOCATION(file, line)			\

		.pushsection .rodata.str, "aMS", @progbits, 1;	\

		.align 2;					\

	10002:	.ascii file "\0";				\

		.popsection;					\

								\
@@ -52,6 +55,8 @@ do { \ 


#define HAVE_ARCH_BUG



#endif /* CONFIG_BUG */



#include <asm-generic/bug.h>



#endif /* _ASM_S390_BUG_H */

arch/s390/include/asm/page.h

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ static inline int page_reset_referenced(unsigned long addr) 
	return CC_TRANSFORM(cc);

}



int split_pud_page(pud_t *pudp, unsigned long addr);



/* Bits int the storage key */

#define _PAGE_CHANGED		0x02	/* HW changed bit		*/

#define _PAGE_REFERENCED	0x04	/* HW referenced bit		*/

arch/s390/include/asm/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/pci.h>

#include <linux/mutex.h>

#include <linux/iommu.h>

#include <linux/irqdomain.h>

#include <linux/pci_hotplug.h>

#include <asm/pci_clp.h>

#include <asm/pci_debug.h>
@@ -109,6 +110,7 @@ struct zpci_bus { 
	struct list_head	resources;

	struct list_head	bus_next;

	struct resource		bus_resource;

	struct irq_domain	*msi_parent_domain;

	int			topo;		/* TID if topo_is_tid, PCHID otherwise */

	int			domain_nr;

	u8			multifunction	: 1;
@@ -310,6 +312,9 @@ int zpci_dma_exit_device(struct zpci_dev *zdev); 
/* IRQ */

int __init zpci_irq_init(void);

void __init zpci_irq_exit(void);

int zpci_set_irq(struct zpci_dev *zdev);

int zpci_create_parent_msi_domain(struct zpci_bus *zbus);

void zpci_remove_parent_msi_domain(struct zpci_bus *zbus);



/* FMB */

int zpci_fmb_enable_device(struct zpci_dev *);