Commit 6a466769 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Alexander Gordeev:

 - Fix the style of protected key API driver source: use x-mas tree for
   all local variable declarations

 - Rework protected key API driver to not use the struct pkey_protkey
   and pkey_clrkey anymore. Both structures have a fixed size buffer,
   but with the support of ECC protected key these buffers are not big
   enough. Use dynamic buffers internally and transparently for
   userspace

 - Add support for a new 'non CCA clear key token' with ECC clear keys
   supported: ECC P256, ECC P384, ECC P521, ECC ED25519 and ECC ED448.
   This makes it possible to derive a protected key from the ECC clear
   key input via PKEY_KBLOB2PROTK3 ioctl, while currently the only way
   to derive is via PCKMO instruction

 - The s390 PMU of PAI crypto and extension 1 NNPA counters use atomic_t
   for reference counting. Replace this with the proper data type
   refcount_t

 - Select ARCH_SUPPORTS_INT128, but limit this to clang for now, since
   gcc generates inefficient code, which may lead to stack overflows

 - Replace one-element array with flexible-array member in struct
   vfio_ccw_parent and refactor the rest of the code accordingly. Also,
   prefer struct_size() over sizeof() open- coded versions

 - Introduce OS_INFO_FLAGS_ENTRY pointing to a flags field and
   OS_INFO_FLAG_REIPL_CLEAR flag that informs a dumper whether the
   system memory should be cleared or not once dumped

 - Fix a hang when a user attempts to remove a VFIO-AP mediated device
   attached to a guest: add VFIO_DEVICE_GET_IRQ_INFO and
   VFIO_DEVICE_SET_IRQS IOCTLs and wire up the VFIO bus driver callback
   to request a release of the device

 - Fix calculation for R_390_GOTENT relocations for modules

 - Allow any user space process with CAP_PERFMON capability read and
   display the CPU Measurement facility counter sets

 - Rework large statically-defined per-CPU cpu_cf_events data structure
   and replace it with dynamically allocated structures created when a
   perf_event_open() system call is invoked or /dev/hwctr device is
   accessed

* tag 's390-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cpum_cf: rework PER_CPU_DEFINE of struct cpu_cf_events
  s390/cpum_cf: open access to hwctr device for CAP_PERFMON privileged process
  s390/module: fix rela calculation for R_390_GOTENT
  s390/vfio-ap: wire in the vfio_device_ops request callback
  s390/vfio-ap: realize the VFIO_DEVICE_SET_IRQS ioctl
  s390/vfio-ap: realize the VFIO_DEVICE_GET_IRQ_INFO ioctl
  s390/pkey: add support for ecc clear key
  s390/pkey: do not use struct pkey_protkey
  s390/pkey: introduce reverse x-mas trees
  s390/zcore: conditionally clear memory on reipl
  s390/ipl: add REIPL_CLEAR flag to os_info
  vfio/ccw: use struct_size() helper
  vfio/ccw: replace one-element array with flexible-array member
  s390: select ARCH_SUPPORTS_INT128
  s390/pai_ext: replace atomic_t with refcount_t
  s390/pai_crypto: replace atomic_t with refcount_t
parents 8d8026f3 9b9cf3c7

arch/s390/Kconfig

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

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC

	select ARCH_SUPPORTS_HUGETLBFS

	select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && CC_IS_CLANG

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_SUPPORTS_PER_VMA_LOCK

	select ARCH_USE_BUILTIN_BSWAP

arch/s390/crypto/paes_s390.c

+7 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * s390 implementation of the AES Cipher Algorithm with protected keys.

 *

 * s390 Version:

 *   Copyright IBM Corp. 2017,2020

 *   Copyright IBM Corp. 2017, 2023

 *   Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 *		Harald Freudenberger <freude@de.ibm.com>

 */
@@ -132,7 +132,8 @@ static inline int __paes_keyblob2pkey(struct key_blob *kb, 
		if (i > 0 && ret == -EAGAIN && in_task())

			if (msleep_interruptible(1000))

				return -EINTR;

		ret = pkey_keyblob2pkey(kb->key, kb->keylen, pk);

		ret = pkey_keyblob2pkey(kb->key, kb->keylen,

					pk->protkey, &pk->len, &pk->type);

		if (ret == 0)

			break;

	}
@@ -145,6 +146,7 @@ static inline int __paes_convert_key(struct s390_paes_ctx *ctx) 
	int ret;

	struct pkey_protkey pkey;



	pkey.len = sizeof(pkey.protkey);

	ret = __paes_keyblob2pkey(&ctx->kb, &pkey);

	if (ret)

		return ret;
@@ -414,6 +416,9 @@ static inline int __xts_paes_convert_key(struct s390_pxts_ctx *ctx) 
{

	struct pkey_protkey pkey0, pkey1;



	pkey0.len = sizeof(pkey0.protkey);

	pkey1.len = sizeof(pkey1.protkey);



	if (__paes_keyblob2pkey(&ctx->kb[0], &pkey0) ||

	    __paes_keyblob2pkey(&ctx->kb[1], &pkey1))

		return -EINVAL;

arch/s390/include/asm/asm-prototypes.h

+4 −0
Original line number Diff line number Diff line
@@ -6,4 +6,8 @@ 
#include <asm/fpu/api.h>

#include <asm-generic/asm-prototypes.h>



__int128_t __ashlti3(__int128_t a, int b);

__int128_t __ashrti3(__int128_t a, int b);

__int128_t __lshrti3(__int128_t a, int b);



#endif /* _ASM_S390_PROTOTYPES_H */

arch/s390/include/asm/cpacf.h

+6 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * CP Assist for Cryptographic Functions (CPACF)

 *

 * Copyright IBM Corp. 2003, 2017

 * Copyright IBM Corp. 2003, 2023

 * Author(s): Thomas Spatzier

 *	      Jan Glauber

 *	      Harald Freudenberger (freude@de.ibm.com)
@@ -132,6 +132,11 @@ 
#define CPACF_PCKMO_ENC_AES_128_KEY	0x12

#define CPACF_PCKMO_ENC_AES_192_KEY	0x13

#define CPACF_PCKMO_ENC_AES_256_KEY	0x14

#define CPACF_PCKMO_ENC_ECC_P256_KEY	0x20

#define CPACF_PCKMO_ENC_ECC_P384_KEY	0x21

#define CPACF_PCKMO_ENC_ECC_P521_KEY	0x22

#define CPACF_PCKMO_ENC_ECC_ED25519_KEY	0x28

#define CPACF_PCKMO_ENC_ECC_ED448_KEY	0x29



/*

 * Function codes for the PRNO (PERFORM RANDOM NUMBER OPERATION)

arch/s390/include/asm/os_info.h

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


#define OS_INFO_VMCOREINFO	0

#define OS_INFO_REIPL_BLOCK	1

#define OS_INFO_FLAGS_ENTRY	2



#define OS_INFO_FLAG_REIPL_CLEAR	(1UL << 0)



struct os_info_entry {

	u64	addr;
@@ -30,8 +33,8 @@ struct os_info { 
	u16	version_minor;

	u64	crashkernel_addr;

	u64	crashkernel_size;

	struct os_info_entry entry[2];

	u8	reserved[4024];

	struct os_info_entry entry[3];

	u8	reserved[4004];

} __packed;



void os_info_init(void);