From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753028AbeDOVWk (ORCPT ); Sun, 15 Apr 2018 17:22:40 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57310 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752944AbeDOVWh (ORCPT ); Sun, 15 Apr 2018 17:22:37 -0400 From: Tony Krowiak To: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: freude@de.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, borntraeger@de.ibm.com, cohuck@redhat.com, kwankhede@nvidia.com, bjsdjshi@linux.vnet.ibm.com, pbonzini@redhat.com, alex.williamson@redhat.com, pmorel@linux.vnet.ibm.com, alifm@linux.vnet.ibm.com, mjrosato@linux.vnet.ibm.com, jjherne@linux.vnet.ibm.com, thuth@redhat.com, pasic@linux.vnet.ibm.com, berrange@redhat.com, fiuczy@linux.vnet.ibm.com, buendgen@de.ibm.com, akrowiak@linux.vnet.ibm.com Subject: [PATCH v4 01/15] s390: zcrypt: externalize AP instructions available function Date: Sun, 15 Apr 2018 17:22:11 -0400 X-Mailer: git-send-email 1.7.1 In-Reply-To: <1523827345-11600-1-git-send-email-akrowiak@linux.vnet.ibm.com> References: <1523827345-11600-1-git-send-email-akrowiak@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18041521-2213-0000-0000-000002920E50 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008862; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000257; SDB=6.01018429; UDB=6.00519481; IPR=6.00797666; MB=3.00020592; MTD=3.00000008; XFM=3.00000015; UTC=2018-04-15 21:22:35 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041521-2214-0000-0000-000059C49247 Message-Id: <1523827345-11600-2-git-send-email-akrowiak@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-15_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804150214 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the AP instructions are not available on the linux host, then AP devices can not be interpreted by the SIE. The AP bus has a function it uses to determine if the AP instructions are available. This patch provides a new function that wraps the AP bus's function to externalize it for use by KVM. Signed-off-by: Tony Krowiak Reviewed-by: Pierre Morel Reviewed-by: Harald Freudenberger --- arch/s390/include/asm/ap.h | 7 +++++++ arch/s390/include/asm/kvm-ap.h | 23 +++++++++++++++++++++++ arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/kvm-ap.c | 21 +++++++++++++++++++++ drivers/s390/crypto/ap_bus.c | 6 ++++++ 5 files changed, 58 insertions(+), 1 deletions(-) create mode 100644 arch/s390/include/asm/kvm-ap.h create mode 100644 arch/s390/kvm/kvm-ap.c diff --git a/arch/s390/include/asm/ap.h b/arch/s390/include/asm/ap.h index c1bedb4..7773bfd 100644 --- a/arch/s390/include/asm/ap.h +++ b/arch/s390/include/asm/ap.h @@ -120,4 +120,11 @@ struct ap_queue_status ap_queue_irq_ctrl(ap_qid_t qid, struct ap_qirq_ctrl qirqctrl, void *ind); +/** + * ap_instructions_installed() - Tests whether AP instructions are installed + * + * Returns 1 if the AP instructions are installed, otherwise; returns 0 + */ +int ap_instructions_installed(void); + #endif /* _ASM_S390_AP_H_ */ diff --git a/arch/s390/include/asm/kvm-ap.h b/arch/s390/include/asm/kvm-ap.h new file mode 100644 index 0000000..84412a9 --- /dev/null +++ b/arch/s390/include/asm/kvm-ap.h @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Adjunct Processor (AP) configuration management for KVM guests + * + * Copyright IBM Corp. 2018 + * + * Author(s): Tony Krowiak + */ + +#ifndef _ASM_KVM_AP +#define _ASM_KVM_AP + +/** + * kvm_ap_instructions_installed() + * + * Tests whether AP instructions are installed on the linux host + * + * Returns 1 if the AP instructions are installed on the host, otherwise; + * returns 0 + */ +int kvm_ap_instructions_installed(void); + +#endif /* _ASM_KVM_AP */ 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..1267588 --- /dev/null +++ b/arch/s390/kvm/kvm-ap.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Adjunct Processor (AP) configuration management for KVM guests + * + * Copyright IBM Corp. 2018 + * + * Author(s): Tony Krowiak + */ +#include +#include +#include + +int kvm_ap_instructions_installed(void) +{ +#ifdef CONFIG_ZCRYPT + return ap_instructions_installed(); +#else + return 0; +#endif +} +EXPORT_SYMBOL(kvm_ap_instructions_installed); diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 35a0c2b..9d108b6 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -210,6 +210,12 @@ int ap_query_configuration(struct ap_config_info *info) } EXPORT_SYMBOL(ap_query_configuration); +int ap_instructions_installed(void) +{ + return (ap_instructions_available() == 0); +} +EXPORT_SYMBOL(ap_instructions_installed); + /** * ap_init_configuration(): Allocate and query configuration array. */ -- 1.7.1