Commit 6daf5a68 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

Merge branch 'vfio-ap' into features 



Tony Krowiak says:

===================
This patch series is for the changes required in the vfio_ap device
driver to facilitate pass-through of crypto devices to a secure
execution guest. In particular, it is critical that no data from the
queues passed through to the SE guest is leaked when the guest is
destroyed. There are also some new response codes returned from the
PQAP(ZAPQ) and PQAP(TAPQ) commands that have been added to the
architecture in support of pass-through of crypto devices to SE guests;
these need to be accounted for when handling the reset of queues.
===================

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parents cfd01210 f88fb133

arch/s390/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,9 @@ static inline int sie64a(struct kvm_s390_sie_block *sie_block, u64 *rsa) 


extern char sie_exit;



bool kvm_s390_pv_is_protected(struct kvm *kvm);

bool kvm_s390_pv_cpu_is_protected(struct kvm_vcpu *vcpu);



extern int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc);

extern int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc);

arch/s390/include/asm/uv.h

+6 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static inline int is_prot_virt_host(void) 
	return prot_virt_host;

}



int uv_pin_shared(unsigned long paddr);

int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb);

int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr);

int uv_destroy_owned_page(unsigned long paddr);
@@ -475,6 +476,11 @@ void setup_uv(void); 
#define is_prot_virt_host() 0

static inline void setup_uv(void) {}



static inline int uv_pin_shared(unsigned long paddr)

{

	return 0;

}



static inline int uv_destroy_owned_page(unsigned long paddr)

{

	return 0;

arch/s390/kernel/uv.c

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void __init setup_uv(void) 
 * Requests the Ultravisor to pin the page in the shared state. This will

 * cause an intercept when the guest attempts to unshare the pinned page.

 */

static int uv_pin_shared(unsigned long paddr)

int uv_pin_shared(unsigned long paddr)

{

	struct uv_cb_cfs uvcb = {

		.header.cmd = UVC_CMD_PIN_PAGE_SHARED,
@@ -100,6 +100,7 @@ static int uv_pin_shared(unsigned long paddr) 
		return -EINVAL;

	return 0;

}

EXPORT_SYMBOL_GPL(uv_pin_shared);



/*

 * Requests the Ultravisor to destroy a guest page and make it

arch/s390/kvm/kvm-s390.h

+0 −12
Original line number Diff line number Diff line
@@ -270,18 +270,6 @@ static inline u64 kvm_s390_pv_cpu_get_handle(struct kvm_vcpu *vcpu) 
	return vcpu->arch.pv.handle;

}



static inline bool kvm_s390_pv_is_protected(struct kvm *kvm)

{

	lockdep_assert_held(&kvm->lock);

	return !!kvm_s390_pv_get_handle(kvm);

}



static inline bool kvm_s390_pv_cpu_is_protected(struct kvm_vcpu *vcpu)

{

	lockdep_assert_held(&vcpu->mutex);

	return !!kvm_s390_pv_cpu_get_handle(vcpu);

}



/* implemented in interrupt.c */

int kvm_s390_handle_wait(struct kvm_vcpu *vcpu);

void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu);

arch/s390/kvm/pv.c

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,20 @@ 
#include <linux/mmu_notifier.h>

#include "kvm-s390.h"



bool kvm_s390_pv_is_protected(struct kvm *kvm)

{

	lockdep_assert_held(&kvm->lock);

	return !!kvm_s390_pv_get_handle(kvm);

}

EXPORT_SYMBOL_GPL(kvm_s390_pv_is_protected);



bool kvm_s390_pv_cpu_is_protected(struct kvm_vcpu *vcpu)

{

	lockdep_assert_held(&vcpu->mutex);

	return !!kvm_s390_pv_cpu_get_handle(vcpu);

}

EXPORT_SYMBOL_GPL(kvm_s390_pv_cpu_is_protected);



/**

 * struct pv_vm_to_be_destroyed - Represents a protected VM that needs to

 * be destroyed