Commit de927f6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Alexander Gordeev:

 - Add machine variable capacity information to /proc/sysinfo.

 - Limit the waste of page tables and always align vmalloc area size and
   base address on segment boundary.

 - Fix a memory leak when an attempt to register interruption sub class
   (ISC) for the adjunct-processor (AP) guest failed.

 - Reset response code AP_RESPONSE_INVALID_GISA to understandable by
   guest AP_RESPONSE_INVALID_ADDRESS in response to a failed
   interruption sub class (ISC) registration attempt.

 - Improve reaction to adjunct-processor (AP)
   AP_RESPONSE_OTHERWISE_CHANGED response code when enabling interrupts
   on behalf of a guest.

 - Fix incorrect sysfs 'status' attribute of adjunct-processor (AP)
   queue device bound to the vfio_ap device driver when the mediated
   device is attached to a guest, but the queue device is not passed
   through.

 - Rework struct ap_card to hold the whole adjunct-processor (AP) card
   hardware information. As result, all the ugly bit checks are replaced
   by simple evaluations of the required bit fields.

 - Improve handling of some weird scenarios between service element (SE)
   host and SE guest with adjunct-processor (AP) pass-through support.

 - Change local_ctl_set_bit() and local_ctl_clear_bit() so they return
   the previous value of the to be changed control register. This is
   useful if a bit is only changed temporarily and the previous content
   needs to be restored.

 - The kernel starts with machine checks disabled and is expected to
   enable it once trap_init() is called. However the implementation
   allows machine checks early. Consistently enable it in trap_init()
   only.

 - local_mcck_disable() and local_mcck_enable() assume that machine
   checks are always enabled. Instead implement and use
   local_mcck_save() and local_mcck_restore() to disable machine checks
   and restore the previous state.

 - Modification of floating point control (FPC) register of a traced
   process using ptrace interface may lead to corruption of the FPC
   register of the tracing process. Fix this.

 - kvm_arch_vcpu_ioctl_set_fpu() allows to set the floating point
   control (FPC) register in vCPU, but may lead to corruption of the FPC
   register of the host process. Fix this.

 - Use READ_ONCE() to read a vCPU floating point register value from the
   memory mapped area. This avoids that, depending on code generation, a
   different value is tested for validity than the one that is used.

 - Get rid of test_fp_ctl(), since it is quite subtle to use it
   correctly. Instead copy a new floating point control register value
   into its save area and test the validity of the new value when
   loading it.

 - Remove superfluous save_fpu_regs() call.

 - Remove s390 support for ARCH_WANTS_DYNAMIC_TASK_STRUCT. All machines
   provide the vector facility since many years and the need to make the
   task structure size dependent on the vector facility does not exist.

 - Remove the "novx" kernel command line option, as the vector code runs
   without any problems since many years.

 - Add the vector facility to the z13 architecture level set (ALS). All
   hypervisors support the vector facility since many years. This allows
   compile time optimizations of the kernel.

 - Get rid of MACHINE_HAS_VX and replace it with cpu_has_vx(). As
   result, the compiled code will have less runtime checks and less
   code.

 - Convert pgste_get_lock() and pgste_set_unlock() ASM inlines to C.

 - Convert the struct subchannel spinlock from pointer to member.

* tag 's390-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (24 commits)
  Revert "s390: update defconfigs"
  s390/cio: make sch->lock spinlock pointer a member
  s390: update defconfigs
  s390/mm: convert pgste locking functions to C
  s390/fpu: get rid of MACHINE_HAS_VX
  s390/als: add vector facility to z13 architecture level set
  s390/fpu: remove "novx" option
  s390/fpu: remove ARCH_WANTS_DYNAMIC_TASK_STRUCT support
  KVM: s390: remove superfluous save_fpu_regs() call
  s390/fpu: get rid of test_fp_ctl()
  KVM: s390: use READ_ONCE() to read fpc register value
  KVM: s390: fix setting of fpc register
  s390/ptrace: handle setting of fpc register correctly
  s390/nmi: implement and use local_mcck_save() / local_mcck_restore()
  s390/nmi: consistently enable machine checks in trap_init()
  s390/ctlreg: return old register contents when changing bits
  s390/ap: handle outband SE bind state change
  s390/ap: store TAPQ hwinfo in struct ap_card
  s390/vfio-ap: fix sysfs status attribute for AP queue devices
  s390/vfio-ap: improve reaction to response code 07 from PQAP(AQIC) command
  ...
parents c2990100 b2b97a62

arch/s390/Kconfig

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

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_SYM_ANNOTATIONS

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_WANTS_NO_INSTR

	select ARCH_WANT_DEFAULT_BPF_JIT

	select ARCH_WANT_IPC_PARSE_VERSION

arch/s390/boot/ipl_parm.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void parse_boot_command_line(void) 
			memory_limit = round_down(memparse(val, NULL), PAGE_SIZE);



		if (!strcmp(param, "vmalloc") && val) {

			vmalloc_size = round_up(memparse(val, NULL), PAGE_SIZE);

			vmalloc_size = round_up(memparse(val, NULL), _SEGMENT_SIZE);

			vmalloc_size_set = 1;

		}

arch/s390/boot/startup.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ static unsigned long setup_kernel_memory_layout(void) 
	VMALLOC_END = MODULES_VADDR;



	/* allow vmalloc area to occupy up to about 1/2 of the rest virtual space left */

	vmalloc_size = min(vmalloc_size, round_down(VMALLOC_END / 2, _REGION3_SIZE));

	vsize = round_down(VMALLOC_END / 2, _SEGMENT_SIZE);

	vmalloc_size = min(vmalloc_size, vsize);

	VMALLOC_START = VMALLOC_END - vmalloc_size;



	/* split remaining virtual space between 1:1 mapping & vmemmap array */

arch/s390/crypto/chacha-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, 
	 * it cannot handle a block of data or less, but otherwise

	 * it can handle data of arbitrary size

	 */

	if (bytes <= CHACHA_BLOCK_SIZE || nrounds != 20 || !MACHINE_HAS_VX)

	if (bytes <= CHACHA_BLOCK_SIZE || nrounds != 20 || !cpu_has_vx())

		chacha_crypt_generic(state, dst, src, bytes, nrounds);

	else

		chacha20_crypt_s390(state, dst, src, bytes,

arch/s390/include/asm/ap.h

+12 −9
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline bool ap_instructions_available(void) 
}



/* TAPQ register GR2 response struct */

struct ap_tapq_gr2 {

struct ap_tapq_hwinfo {

	union {

		unsigned long value;

		struct {
@@ -96,11 +96,13 @@ struct ap_tapq_gr2 { 
			unsigned int apinfo : 32; /* ap type, ... */

		};

		struct {

			unsigned int s	   :  1; /* APSC */

			unsigned int m	   :  1; /* AP4KM */

			unsigned int c	   :  1; /* AP4KC */

			unsigned int mode  :  3;

			unsigned int n	   :  1; /* APXA */

			unsigned int apsc  :  1; /* APSC */

			unsigned int mex4k :  1; /* AP4KM */

			unsigned int crt4k :  1; /* AP4KC */

			unsigned int cca   :  1; /* D */

			unsigned int accel :  1; /* A */

			unsigned int ep11  :  1; /* X */

			unsigned int apxa  :  1; /* APXA */

			unsigned int	   :  1;

			unsigned int class :  8;

			unsigned int bs	   :  2; /* SE bind/assoc */
@@ -126,11 +128,12 @@ struct ap_tapq_gr2 { 
/**

 * ap_tapq(): Test adjunct processor queue.

 * @qid: The AP queue number

 * @info: Pointer to queue descriptor

 * @info: Pointer to tapq hwinfo struct

 *

 * Returns AP queue status structure.

 */

static inline struct ap_queue_status ap_tapq(ap_qid_t qid, struct ap_tapq_gr2 *info)

static inline struct ap_queue_status ap_tapq(ap_qid_t qid,

					     struct ap_tapq_hwinfo *info)

{

	union ap_queue_status_reg reg1;

	unsigned long reg2;
@@ -158,7 +161,7 @@ static inline struct ap_queue_status ap_tapq(ap_qid_t qid, struct ap_tapq_gr2 *i 
 * Returns AP queue status structure.

 */

static inline struct ap_queue_status ap_test_queue(ap_qid_t qid, int tbit,

						   struct ap_tapq_gr2 *info)

						   struct ap_tapq_hwinfo *info)

{

	if (tbit)

		qid |= 1UL << 23; /* set T bit*/