Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85a0b791 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Heiko Carstens:
 "Since Martin is on vacation you get the s390 pull request from me:

   - Host large page support for KVM guests. As the patches have large
     impact on arch/s390/mm/ this series goes out via both the KVM and
     the s390 tree.

   - Add an option for no compression to the "Kernel compression mode"
     menu, this will come in handy with the rework of the early boot
     code.

   - A large rework of the early boot code that will make life easier
     for KASAN and KASLR. With the rework the bootable uncompressed
     image is not generated anymore, only the bzImage is available. For
     debuggung purposes the new "no compression" option is used.

   - Re-enable the gcc plugins as the issue with the latent entropy
     plugin is solved with the early boot code rework.

   - More spectre relates changes:
      + Detect the etoken facility and remove expolines automatically.
      + Add expolines to a few more indirect branches.

   - A rewrite of the common I/O layer trace points to make them
     consumable by 'perf stat'.

   - Add support for format-3 PCI function measurement blocks.

   - Changes for the zcrypt driver:
      + Add attributes to indicate the load of cards and queues.
      + Restructure some code for the upcoming AP device support in KVM.

   - Build flags improvements in various Makefiles.

   - A few fixes for the kdump support.

   - A couple of patches for gcc 8 compile warning cleanup.

   - Cleanup s390 specific proc handlers.

   - Add s390 support to the restartable sequence self tests.

   - Some PTR_RET vs PTR_ERR_OR_ZERO cleanup.

   - Lots of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (107 commits)
  s390/dasd: fix hanging offline processing due to canceled worker
  s390/dasd: fix panic for failed online processing
  s390/mm: fix addressing exception after suspend/resume
  rseq/selftests: add s390 support
  s390: fix br_r1_trampoline for machines without exrl
  s390/lib: use expoline for all bcr instructions
  s390/numa: move initial setup of node_to_cpumask_map
  s390/kdump: Fix elfcorehdr size calculation
  s390/cpum_sf: save TOD clock base in SDBs for time conversion
  KVM: s390: Add huge page enablement control
  s390/mm: Add huge page gmap linking support
  s390/mm: hugetlb pages within a gmap can not be freed
  KVM: s390: Add skey emulation fault handling
  s390/mm: Add huge pmd storage key handling
  s390/mm: Clear skeys for newly mapped huge guest pmds
  s390/mm: Clear huge page storage keys on enable_skey
  s390/mm: Add huge page dirty sync support
  s390/mm: Add gmap pmd invalidation and clearing
  s390/mm: Add gmap pmd notification bit setting
  s390/mm: Add gmap pmd linking
  ...
parents 13e091b6 669f3765

Documentation/virtual/kvm/api.txt

+16 −0
Original line number Diff line number Diff line
@@ -4391,6 +4391,22 @@ all such vmexits. 


Do not enable KVM_FEATURE_PV_UNHALT if you disable HLT exits.



7.14 KVM_CAP_S390_HPAGE_1M



Architectures: s390

Parameters: none

Returns: 0 on success, -EINVAL if hpage module parameter was not set

	 or cmma is enabled



With this capability the KVM support for memory backing with 1m pages

through hugetlbfs can be enabled for a VM. After the capability is

enabled, cmma can't be enabled anymore and pfmfi and the storage key

interpretation are disabled. If cmma has already been enabled or the

hpage module parameter is not set to 1, -EINVAL is returned.



While it is generally possible to create a huge page backed VM without

this capability, the VM will not be able to run.



8. Other capabilities.

----------------------

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -12408,7 +12408,6 @@ F: drivers/pci/hotplug/s390_pci_hpc.c 


S390 VFIO-CCW DRIVER

M:	Cornelia Huck <cohuck@redhat.com>

M:	Dong Jia Shi <bjsdjshi@linux.ibm.com>

M:	Halil Pasic <pasic@linux.ibm.com>

L:	linux-s390@vger.kernel.org

L:	kvm@vger.kernel.org

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ config S390 
	select HAVE_KERNEL_LZ4

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_UNCOMPRESSED

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES

	select HAVE_KRETPROBES

arch/s390/Makefile

+26 −16
Original line number Diff line number Diff line
@@ -14,8 +14,18 @@ LD_BFD := elf64-s390 
LDFLAGS		:= -m elf64_s390

KBUILD_AFLAGS_MODULE += -fPIC

KBUILD_CFLAGS_MODULE += -fPIC

KBUILD_CFLAGS	+= -m64

KBUILD_AFLAGS	+= -m64

KBUILD_CFLAGS	+= -m64

aflags_dwarf	:= -Wa,-gdwarf-2

KBUILD_AFLAGS_DECOMPRESSOR := -m64 -D__ASSEMBLY__

KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))

KBUILD_CFLAGS_DECOMPRESSOR := -m64 -O2

KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float

KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))

UTS_MACHINE	:= s390x

STACK_SIZE	:= 16384

CHECKFLAGS	+= -D__s390__ -D__s390x__
@@ -52,18 +62,14 @@ cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include 
#

cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls



# old style option for packed stacks

ifeq ($(call cc-option-yn,-mkernel-backchain),y)

cflags-$(CONFIG_PACK_STACK)  += -mkernel-backchain -D__PACK_STACK

aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK

endif



# new style option for packed stacks

ifeq ($(call cc-option-yn,-mpacked-stack),y)

cflags-$(CONFIG_PACK_STACK)  += -mpacked-stack -D__PACK_STACK

aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK

endif



KBUILD_AFLAGS_DECOMPRESSOR += $(aflags-y)

KBUILD_CFLAGS_DECOMPRESSOR += $(cflags-y)



ifeq ($(call cc-option-yn,-mstack-size=8192 -mstack-guard=128),y)

cflags-$(CONFIG_CHECK_STACK) += -mstack-size=$(STACK_SIZE)

ifneq ($(call cc-option-yn,-mstack-size=8192),y)
@@ -71,8 +77,11 @@ cflags-$(CONFIG_CHECK_STACK) += -mstack-guard=$(CONFIG_STACK_GUARD) 
endif

endif



ifdef CONFIG_WARN_DYNAMIC_STACK

  ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y)

cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack

    KBUILD_CFLAGS += -mwarn-dynamicstack

    KBUILD_CFLAGS_DECOMPRESSOR += -mwarn-dynamicstack

  endif

endif



ifdef CONFIG_EXPOLINE
@@ -82,6 +91,7 @@ ifdef CONFIG_EXPOLINE 
    CC_FLAGS_EXPOLINE += -mindirect-branch-table

    export CC_FLAGS_EXPOLINE

    cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE

    aflags-y += -DCC_USING_EXPOLINE

  endif

endif
@@ -102,11 +112,12 @@ KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y) 
KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables $(cfi)

KBUILD_AFLAGS	+= $(aflags-y) $(cfi)

export KBUILD_AFLAGS_DECOMPRESSOR

export KBUILD_CFLAGS_DECOMPRESSOR



OBJCOPYFLAGS	:= -O binary



head-y		:= arch/s390/kernel/head.o

head-y		+= arch/s390/kernel/head64.o

head-y		:= arch/s390/kernel/head64.o



# See arch/s390/Kbuild for content of core part of the kernel

core-y		+= arch/s390/
@@ -121,7 +132,7 @@ boot := arch/s390/boot 
syscalls	:= arch/s390/kernel/syscalls

tools		:= arch/s390/tools



all: image bzImage

all: bzImage



#KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...

KBUILD_IMAGE	:= $(boot)/bzImage
@@ -129,7 +140,7 @@ KBUILD_IMAGE := $(boot)/bzImage 
install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@



image bzImage: vmlinux

bzImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



zfcpdump:
@@ -152,8 +163,7 @@ archprepare: 


# Don't use tabs in echo arguments

define archhelp

  echo  '* image           - Kernel image for IPL ($(boot)/image)'

  echo	'* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'

  echo	'* bzImage         - Kernel image for IPL ($(boot)/bzImage)'

  echo	'  install         - Install kernel using'

  echo	'                    (your) ~/bin/$(INSTALLKERNEL) or'

  echo	'                    (distribution) /sbin/$(INSTALLKERNEL) or'

arch/s390/appldata/appldata_base.c

+45 −77
Original line number Diff line number Diff line
@@ -206,35 +206,28 @@ static int 
appldata_timer_handler(struct ctl_table *ctl, int write,

			   void __user *buffer, size_t *lenp, loff_t *ppos)

{

	unsigned int len;

	char buf[2];

	int timer_active = appldata_timer_active;

	int zero = 0;

	int one = 1;

	int rc;

	struct ctl_table ctl_entry = {

		.procname	= ctl->procname,

		.data		= &timer_active,

		.maxlen		= sizeof(int),

		.extra1		= &zero,

		.extra2		= &one,

	};



	rc = proc_douintvec_minmax(&ctl_entry, write, buffer, lenp, ppos);

	if (rc < 0 || !write)

		return rc;



	if (!*lenp || *ppos) {

		*lenp = 0;

		return 0;

	}

	if (!write) {

		strncpy(buf, appldata_timer_active ? "1\n" : "0\n",

			ARRAY_SIZE(buf));

		len = strnlen(buf, ARRAY_SIZE(buf));

		if (len > *lenp)

			len = *lenp;

		if (copy_to_user(buffer, buf, len))

			return -EFAULT;

		goto out;

	}

	len = *lenp;

	if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len))

		return -EFAULT;

	spin_lock(&appldata_timer_lock);

	if (buf[0] == '1')

	if (timer_active)

		__appldata_vtimer_setup(APPLDATA_ADD_TIMER);

	else if (buf[0] == '0')

	else

		__appldata_vtimer_setup(APPLDATA_DEL_TIMER);

	spin_unlock(&appldata_timer_lock);

out:

	*lenp = len;

	*ppos += len;

	return 0;

}
@@ -248,37 +241,24 @@ static int 
appldata_interval_handler(struct ctl_table *ctl, int write,

			   void __user *buffer, size_t *lenp, loff_t *ppos)

{

	unsigned int len;

	int interval;

	char buf[16];

	int interval = appldata_interval;

	int one = 1;

	int rc;

	struct ctl_table ctl_entry = {

		.procname	= ctl->procname,

		.data		= &interval,

		.maxlen		= sizeof(int),

		.extra1		= &one,

	};



	if (!*lenp || *ppos) {

		*lenp = 0;

		return 0;

	}

	if (!write) {

		len = sprintf(buf, "%i\n", appldata_interval);

		if (len > *lenp)

			len = *lenp;

		if (copy_to_user(buffer, buf, len))

			return -EFAULT;

		goto out;

	}

	len = *lenp;

	if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len))

		return -EFAULT;

	interval = 0;

	sscanf(buf, "%i", &interval);

	if (interval <= 0)

		return -EINVAL;

	rc = proc_dointvec_minmax(&ctl_entry, write, buffer, lenp, ppos);

	if (rc < 0 || !write)

		return rc;



	spin_lock(&appldata_timer_lock);

	appldata_interval = interval;

	__appldata_vtimer_setup(APPLDATA_MOD_TIMER);

	spin_unlock(&appldata_timer_lock);

out:

	*lenp = len;

	*ppos += len;

	return 0;

}
@@ -293,10 +273,17 @@ appldata_generic_handler(struct ctl_table *ctl, int write, 
			   void __user *buffer, size_t *lenp, loff_t *ppos)

{

	struct appldata_ops *ops = NULL, *tmp_ops;

	unsigned int len;

	int rc, found;

	char buf[2];

	struct list_head *lh;

	int rc, found;

	int active;

	int zero = 0;

	int one = 1;

	struct ctl_table ctl_entry = {

		.data		= &active,

		.maxlen		= sizeof(int),

		.extra1		= &zero,

		.extra2		= &one,

	};



	found = 0;

	mutex_lock(&appldata_ops_mutex);
@@ -317,31 +304,15 @@ appldata_generic_handler(struct ctl_table *ctl, int write, 
	}

	mutex_unlock(&appldata_ops_mutex);



	if (!*lenp || *ppos) {

		*lenp = 0;

	active = ops->active;

	rc = proc_douintvec_minmax(&ctl_entry, write, buffer, lenp, ppos);

	if (rc < 0 || !write) {

		module_put(ops->owner);

		return 0;

	}

	if (!write) {

		strncpy(buf, ops->active ? "1\n" : "0\n", ARRAY_SIZE(buf));

		len = strnlen(buf, ARRAY_SIZE(buf));

		if (len > *lenp)

			len = *lenp;

		if (copy_to_user(buffer, buf, len)) {

			module_put(ops->owner);

			return -EFAULT;

		}

		goto out;

	}

	len = *lenp;

	if (copy_from_user(buf, buffer,

			   len > sizeof(buf) ? sizeof(buf) : len)) {

		module_put(ops->owner);

		return -EFAULT;

		return rc;

	}



	mutex_lock(&appldata_ops_mutex);

	if ((buf[0] == '1') && (ops->active == 0)) {

	if (active && (ops->active == 0)) {

		// protect work queue callback

		if (!try_module_get(ops->owner)) {

			mutex_unlock(&appldata_ops_mutex);
@@ -359,7 +330,7 @@ appldata_generic_handler(struct ctl_table *ctl, int write, 
			module_put(ops->owner);

		} else

			ops->active = 1;

	} else if ((buf[0] == '0') && (ops->active == 1)) {

	} else if (!active && (ops->active == 1)) {

		ops->active = 0;

		rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,

				(unsigned long) ops->data, ops->size,
@@ -370,9 +341,6 @@ appldata_generic_handler(struct ctl_table *ctl, int write, 
		module_put(ops->owner);

	}

	mutex_unlock(&appldata_ops_mutex);

out:

	*lenp = len;

	*ppos += len;

	module_put(ops->owner);

	return 0;

}