This patch refactors the code that initializes the crypto configuration for a guest. The crypto configuration is contained in a crypto control block (CRYCB) which is a satellite control block to our main hardware virtualization control block. The CRYCB is attached to the main virtualization control block via a CRYCB designation (CRYCBD) designation field containing the address of the CRYCB as well as its format. Prior to the introduction of AP device virtualization, there was no need to provide access to or specify the format of the CRYCB for a guest unless the MSA extension 3 (MSAX3) facility was installed on the host system. With the introduction of AP device virtualization, the CRYCB and its format must be made accessible to the guest regardless of the presence of the MSAX3 facility. The crypto initialization code is restructured as follows: * A new compilation unit is introduced to contain all interfaces and data structures related to configuring a guest's CRYCB for both the refactoring of crypto initialization as well as all subsequent patches introducing AP virtualization support. * Currently, the asm code for querying the AP configuration is duplicated in the AP bus as well as in KVM. Since the KVM code was introduced, the AP bus has externalized the interface for querying the AP configuration. The KVM interface will be replaced with a call to the AP bus interface. Of course, this will be moved to the new compilation unit mentioned above. * An interface to format the CRYCBD field will be provided via the new compilation unit and called from the KVM vm initialization. Signed-off-by: Tony Krowiak <akrowiak@xxxxxxxxxxxxxxxxxx> --- MAINTAINERS | 10 ++++++ arch/s390/include/asm/kvm-ap.h | 16 ++++++++++ arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/kvm-ap.c | 48 +++++++++++++++++++++++++++++ arch/s390/kvm/kvm-s390.c | 61 ++++--------------------------------- 7 files changed, 84 insertions(+), 55 deletions(-) create mode 100644 arch/s390/include/asm/kvm-ap.h create mode 100644 arch/s390/kvm/kvm-ap.c diff --git a/MAINTAINERS b/MAINTAINERS index 0ec5881..72742d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11875,6 +11875,16 @@ W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: drivers/s390/crypto/ +S390 VFIO AP DRIVER +M: Tony Krowiak <akrowiak@xxxxxxxxxxxxxxxxxx> +M: Christian Borntraeger <borntraeger@xxxxxxxxxx> +M: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> +L: linux-s390@xxxxxxxxxxxxxxx +W: http://www.ibm.com/developerworks/linux/linux390/ +S: Supported +F: arch/s390/include/asm/kvm/kvm-ap.h +F: arch/s390/kvm/kvm-ap.c + S390 ZFCP DRIVER M: Steffen Maier <maier@xxxxxxxxxxxxxxxxxx> M: Benjamin Block <bblock@xxxxxxxxxxxxxxxxxx> diff --git a/arch/s390/include/asm/kvm-ap.h b/arch/s390/include/asm/kvm-ap.h new file mode 100644 index 0000000..362846c --- /dev/null +++ b/arch/s390/include/asm/kvm-ap.h @@ -0,0 +1,16 @@ +/* + * Adjunct Processor (AP) configuration management for KVM guests + * + * Copyright IBM Corp. 2017 + * + * Author(s): Tony Krowiak <akrowia@xxxxxxxxxxxxxxxxxx> + */ + +#ifndef _ASM_KVM_AP +#define _ASM_KVM_AP +#include <linux/types.h> +#include <linux/kvm_host.h> + +void kvm_ap_build_crycbd(struct kvm *kvm); + +#endif /* _ASM_KVM_AP */ diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 34c9b5b..65a944e 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -257,6 +257,7 @@ struct kvm_s390_sie_block { __u8 reservedf0[12]; /* 0x00f0 */ #define CRYCB_FORMAT1 0x00000001 #define CRYCB_FORMAT2 0x00000003 +#define CRYCB_FORMAT_MASK 0x00000003 __u32 crycbd; /* 0x00fc */ __u64 gcr[16]; /* 0x0100 */ __u64 gbea; /* 0x0180 */ diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index a3dbd45..4ca9077 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -33,6 +33,7 @@ config KVM select HAVE_KVM_INVALID_WAKEUPS select SRCU select KVM_VFIO + select ZCRYPT ---help--- Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index 05ee90a..1876bfe 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -9,6 +9,6 @@ common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqch ccflags-y := -Ivirt/kvm -Iarch/s390/kvm kvm-objs := $(common-objs) kvm-s390.o intercept.o interrupt.o priv.o sigp.o -kvm-objs += diag.o gaccess.o guestdbg.o vsie.o +kvm-objs += diag.o gaccess.o guestdbg.o vsie.o kvm-ap.o obj-$(CONFIG_KVM) += kvm.o diff --git a/arch/s390/kvm/kvm-ap.c b/arch/s390/kvm/kvm-ap.c new file mode 100644 index 0000000..a2c6ad2 --- /dev/null +++ b/arch/s390/kvm/kvm-ap.c @@ -0,0 +1,48 @@ +/* + * Adjunct Processor (AP) configuration management for KVM guests + * + * Copyright IBM Corp. 2017 + * + * Author(s): Tony Krowiak <akrowia@xxxxxxxxxxxxxxxxxx> + */ + +#include <asm/kvm-ap.h> +#include <asm/ap.h> + +#include "kvm-s390.h" + +static int kvm_ap_apxa_installed(void) +{ + int ret; + struct ap_config_info config; + + ret = ap_query_configuration(&config); + if (ret) + return 0; + + return (config.apxa == 1); +} + +/** + * kvm_ap_build_crycbd + * + * The crypto control block designation (CRYCBD) is a 32-bit field that + * designates both the host real address and format of the CRYCB. This function + * builds the CRYCBD field for use by the KVM guest. + * + * @kvm: the KVM guest + * @crycbd: reference to the CRYCBD + */ +void kvm_ap_build_crycbd(struct kvm *kvm) +{ + kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb; + kvm->arch.crypto.crycbd &= ~(CRYCB_FORMAT_MASK); + + /* check whether MSAX3 is installed */ + if (test_kvm_facility(kvm, 76)) { + if (kvm_ap_apxa_installed()) + kvm->arch.crypto.crycbd |= CRYCB_FORMAT2; + else + kvm->arch.crypto.crycbd |= CRYCB_FORMAT1; + } +} diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 23c4767..c47731d 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -40,6 +40,8 @@ #include <asm/sclp.h> #include <asm/cpacf.h> #include <asm/timex.h> +#include <asm/ap.h> +#include <asm/kvm-ap.h> #include "kvm-s390.h" #include "gaccess.h" @@ -1856,55 +1858,6 @@ long kvm_arch_vm_ioctl(struct file *filp, return r; } -static int kvm_s390_query_ap_config(u8 *config) -{ - u32 fcn_code = 0x04000000UL; - u32 cc = 0; - - memset(config, 0, 128); - asm volatile( - "lgr 0,%1\n" - "lgr 2,%2\n" - ".long 0xb2af0000\n" /* PQAP(QCI) */ - "0: ipm %0\n" - "srl %0,28\n" - "1:\n" - EX_TABLE(0b, 1b) - : "+r" (cc) - : "r" (fcn_code), "r" (config) - : "cc", "0", "2", "memory" - ); - - return cc; -} - -static int kvm_s390_apxa_installed(void) -{ - u8 config[128]; - int cc; - - if (test_facility(12)) { - cc = kvm_s390_query_ap_config(config); - - if (cc) - pr_err("PQAP(QCI) failed with cc=%d", cc); - else - return config[0] & 0x40; - } - - return 0; -} - -static void kvm_s390_set_crycb_format(struct kvm *kvm) -{ - kvm->arch.crypto.crycbd = (__u32)(unsigned long) kvm->arch.crypto.crycb; - - if (kvm_s390_apxa_installed()) - kvm->arch.crypto.crycbd |= CRYCB_FORMAT2; - else - kvm->arch.crypto.crycbd |= CRYCB_FORMAT1; -} - static u64 kvm_s390_get_initial_cpuid(void) { struct cpuid cpuid; @@ -1916,12 +1869,12 @@ static u64 kvm_s390_get_initial_cpuid(void) static void kvm_s390_crypto_init(struct kvm *kvm) { + kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb; + kvm_ap_build_crycbd(kvm); + if (!test_kvm_facility(kvm, 76)) return; - kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb; - kvm_s390_set_crycb_format(kvm); - /* Enable AES/DEA protected key functions by default */ kvm->arch.crypto.aes_kw = 1; kvm->arch.crypto.dea_kw = 1; @@ -2450,6 +2403,8 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu) { + vcpu->arch.sie_block->crycbd = vcpu->kvm->arch.crypto.crycbd; + if (!test_kvm_facility(vcpu->kvm, 76)) return; @@ -2459,8 +2414,6 @@ static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->ecb3 |= ECB3_AES; if (vcpu->kvm->arch.crypto.dea_kw) vcpu->arch.sie_block->ecb3 |= ECB3_DEA; - - vcpu->arch.sie_block->crycbd = vcpu->kvm->arch.crypto.crycbd; } void kvm_s390_vcpu_unsetup_cmma(struct kvm_vcpu *vcpu) -- 1.7.1
