Commit 14bc84ce 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 Martin Schwidefsky:
 "One additional new feature for 4.1, a new PRNG based on SHA-512 for
  the zcrypt driver.

  Two memory management related changes, the page table reallocation for
  KVM is removed, and with file ptes gone the encoding of page table
  entries is improved.

  And three bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.
  s390/mm: change swap pte encoding and pgtable cleanup
  s390/mm: correct transfer of dirty & young bits in __pmd_to_pte
  s390/bpf: add dependency to z196 features
  s390/3215: free memory in error path
  s390/kvm: remove delayed reallocation of page tables for KVM
  kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP
parents 2decb268 57127645

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ config S390 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_BPF_JIT if PACK_STACK && HAVE_MARCH_Z9_109_FEATURES

	select HAVE_BPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_DEBUG_KMEMLEAK

arch/s390/crypto/crypt_s390.h

+91 −31
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
 *

 * Support for s390 cryptographic instructions.

 *

 *   Copyright IBM Corp. 2003, 2007

 *   Copyright IBM Corp. 2003, 2015

 *   Author(s): Thomas Spatzier

 *		Jan Glauber (jan.glauber@de.ibm.com)

 *		Harald Freudenberger (freude@de.ibm.com)

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free
@@ -28,6 +29,7 @@ 
#define CRYPT_S390_MSA	0x1

#define CRYPT_S390_MSA3	0x2

#define CRYPT_S390_MSA4	0x4

#define CRYPT_S390_MSA5	0x8



/* s390 cryptographic operations */

enum crypt_s390_operations {
@@ -36,7 +38,8 @@ enum crypt_s390_operations { 
	CRYPT_S390_KIMD  = 0x0300,

	CRYPT_S390_KLMD  = 0x0400,

	CRYPT_S390_KMAC  = 0x0500,

	CRYPT_S390_KMCTR = 0x0600

	CRYPT_S390_KMCTR = 0x0600,

	CRYPT_S390_PPNO  = 0x0700

};



/*
@@ -138,6 +141,16 @@ enum crypt_s390_kmac_func { 
	KMAC_TDEA_192 = CRYPT_S390_KMAC | 3

};



/*

 * function codes for PPNO (PERFORM PSEUDORANDOM NUMBER

 * OPERATION) instruction

 */

enum crypt_s390_ppno_func {

	PPNO_QUERY	      = CRYPT_S390_PPNO | 0,

	PPNO_SHA512_DRNG_GEN  = CRYPT_S390_PPNO | 3,

	PPNO_SHA512_DRNG_SEED = CRYPT_S390_PPNO | 0x83

};



/**

 * crypt_s390_km:

 * @func: the function code passed to KM; see crypt_s390_km_func
@@ -353,6 +366,47 @@ static inline int crypt_s390_kmctr(long func, void *param, u8 *dest, 
	return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;

}



/**

 * crypt_s390_ppno:

 * @func: the function code passed to PPNO; see crypt_s390_ppno_func

 * @param: address of parameter block; see POP for details on each func

 * @dest: address of destination memory area

 * @dest_len: size of destination memory area in bytes

 * @seed: address of seed data

 * @seed_len: size of seed data in bytes

 *

 * Executes the PPNO (PERFORM PSEUDORANDOM NUMBER OPERATION)

 * operation of the CPU.

 *

 * Returns -1 for failure, 0 for the query func, number of random

 * bytes stored in dest buffer for generate function

 */

static inline int crypt_s390_ppno(long func, void *param,

				  u8 *dest, long dest_len,

				  const u8 *seed, long seed_len)

{

	register long  __func	  asm("0") = func & CRYPT_S390_FUNC_MASK;

	register void *__param	  asm("1") = param;    /* param block (240 bytes) */

	register u8   *__dest	  asm("2") = dest;     /* buf for recv random bytes */

	register long  __dest_len asm("3") = dest_len; /* requested random bytes */

	register const u8 *__seed asm("4") = seed;     /* buf with seed data */

	register long  __seed_len asm("5") = seed_len; /* bytes in seed buf */

	int ret = -1;



	asm volatile (

		"0:	.insn	rre,0xb93c0000,%1,%5\n"	/* PPNO opcode */

		"1:	brc	1,0b\n"	  /* handle partial completion */

		"	la	%0,0\n"

		"2:\n"

		EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)

		: "+d" (ret), "+a"(__dest), "+d"(__dest_len)

		: "d"(__func), "a"(__param), "a"(__seed), "d"(__seed_len)

		: "cc", "memory");

	if (ret < 0)

		return ret;

	return (func & CRYPT_S390_FUNC_MASK) ? dest_len - __dest_len : 0;

}



/**

 * crypt_s390_func_available:

 * @func: the function code of the specific function; 0 if op in general
@@ -373,6 +427,9 @@ static inline int crypt_s390_func_available(int func, 
		return 0;

	if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))

		return 0;

	if (facility_mask & CRYPT_S390_MSA5 && !test_facility(57))

		return 0;



	switch (func & CRYPT_S390_OP_MASK) {

	case CRYPT_S390_KM:

		ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
@@ -390,8 +447,12 @@ static inline int crypt_s390_func_available(int func, 
		ret = crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);

		break;

	case CRYPT_S390_KMCTR:

		ret = crypt_s390_kmctr(KMCTR_QUERY, &status, NULL, NULL, 0,

				       NULL);

		ret = crypt_s390_kmctr(KMCTR_QUERY, &status,

				       NULL, NULL, 0, NULL);

		break;

	case CRYPT_S390_PPNO:

		ret = crypt_s390_ppno(PPNO_QUERY, &status,

				      NULL, 0, NULL, 0);

		break;

	default:

		return 0;
@@ -429,5 +490,4 @@ static inline int crypt_s390_pcc(long func, void *param) 
	return ret;

}





#endif	/* _CRYPTO_ARCH_S390_CRYPT_S390_H */

arch/s390/crypto/prng.c

+779 −71

File changed.

Preview size limit exceeded, changes collapsed.

arch/s390/include/asm/kexec.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
/* Not more than 2GB */

#define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)



/* Allocate control page with GFP_DMA */

#define KEXEC_CONTROL_MEMORY_GFP GFP_DMA



/* Maximum address we can use for the crash control pages */

#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)

arch/s390/include/asm/mmu.h

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ typedef struct { 
	unsigned long asce_bits;

	unsigned long asce_limit;

	unsigned long vdso_base;

	/* The mmu context has extended page tables. */

	/* The mmu context allocates 4K page tables. */

	unsigned int alloc_pgste:1;

	/* The mmu context uses extended page tables. */

	unsigned int has_pgste:1;

	/* The mmu context uses storage keys. */

	unsigned int use_skey:1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE