Commit 89b6b8cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v5.15-rc1' of git://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:

 - Fix dma-valid return WAITED implementation (Anthony Yznaga)

 - SPDX license cleanups (Cai Huoqing)

 - Split vfio-pci-core from vfio-pci and enhance PCI driver matching to
   support future vendor provided vfio-pci variants (Yishai Hadas, Max
   Gurtovoy, Jason Gunthorpe)

 - Replace duplicated reflck with core support for managing first open,
   last close, and device sets (Jason Gunthorpe, Max Gurtovoy, Yishai
   Hadas)

 - Fix non-modular mdev support and don't nag about request callback
   support (Christoph Hellwig)

 - Add semaphore to protect instruction intercept handler and replace
   open-coded locks in vfio-ap driver (Tony Krowiak)

 - Convert vfio-ap to vfio_register_group_dev() API (Jason Gunthorpe)

* tag 'vfio-v5.15-rc1' of git://github.com/awilliam/linux-vfio: (37 commits)
  vfio/pci: Introduce vfio_pci_core.ko
  vfio: Use kconfig if XX/endif blocks instead of repeating 'depends on'
  vfio: Use select for eventfd
  PCI / VFIO: Add 'override_only' support for VFIO PCI sub system
  PCI: Add 'override_only' field to struct pci_device_id
  vfio/pci: Move module parameters to vfio_pci.c
  vfio/pci: Move igd initialization to vfio_pci.c
  vfio/pci: Split the pci_driver code out of vfio_pci_core.c
  vfio/pci: Include vfio header in vfio_pci_core.h
  vfio/pci: Rename ops functions to fit core namings
  vfio/pci: Rename vfio_pci_device to vfio_pci_core_device
  vfio/pci: Rename vfio_pci_private.h to vfio_pci_core.h
  vfio/pci: Rename vfio_pci.c to vfio_pci_core.c
  vfio/ap_ops: Convert to use vfio_register_group_dev()
  s390/vfio-ap: replace open coded locks for VFIO_GROUP_NOTIFY_SET_KVM notification
  s390/vfio-ap: r/w lock for PQAP interception handler function pointer
  vfio/type1: Fix vfio_find_dma_valid return
  vfio-pci/zdev: Remove repeated verbose license text
  vfio: platform: reset: Convert to SPDX identifier
  vfio: Remove struct vfio_device_ops open/release
  ...
parents 9ae5fceb ea870730

Documentation/PCI/pci.rst

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ need pass only as many optional fields as necessary: 
  - subvendor and subdevice fields default to PCI_ANY_ID (FFFFFFFF)

  - class and classmask fields default to 0

  - driver_data defaults to 0UL.

  - override_only field defaults to 0.



Note that driver_data must match the value used by any of the pci_device_id

entries defined in the driver. This makes the driver_data field mandatory

Documentation/driver-api/vfio.rst

+3 −1
Original line number Diff line number Diff line
@@ -255,11 +255,13 @@ vfio_unregister_group_dev() respectively:: 
	void vfio_init_group_dev(struct vfio_device *device,

				struct device *dev,

				const struct vfio_device_ops *ops);

	void vfio_uninit_group_dev(struct vfio_device *device);

	int vfio_register_group_dev(struct vfio_device *device);

	void vfio_unregister_group_dev(struct vfio_device *device);



The driver should embed the vfio_device in its own structure and call

vfio_init_group_dev() to pre-configure it before going to registration.

vfio_init_group_dev() to pre-configure it before going to registration

and call vfio_uninit_group_dev() after completing the un-registration.

vfio_register_group_dev() indicates to the core to begin tracking the

iommu_group of the specified dev and register the dev as owned by a VFIO bus

driver. Once vfio_register_group_dev() returns it is possible for userspace to

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -19607,6 +19607,7 @@ T: git git://github.com/awilliam/linux-vfio.git 
F:	Documentation/driver-api/vfio.rst

F:	drivers/vfio/

F:	include/linux/vfio.h

F:	include/linux/vfio_pci_core.h

F:	include/uapi/linux/vfio.h









VFIO FSL-MC DRIVER

























arch/s390/include/asm/kvm_host.h



+3
−5






























Original line number
Diff line number
Diff line







@@ -798,14 +798,12 @@ struct kvm_s390_cpu_model {







	unsigned short ibc;









};



















struct kvm_s390_module_hook {









	int (*hook)(struct kvm_vcpu *vcpu);









	struct module *owner;









};









typedef int (*crypto_hook)(struct kvm_vcpu *vcpu);



















struct kvm_s390_crypto {









	struct kvm_s390_crypto_cb *crycb;









	struct kvm_s390_module_hook *pqap_hook;









	struct rw_semaphore pqap_hook_rwsem;









	crypto_hook *pqap_hook;









	__u32 crycbd;









	__u8 aes_kw;









	__u8 dea_kw;
































arch/s390/kvm/kvm-s390.c



+28
−4






























Original line number
Diff line number
Diff line







@@ -2559,12 +2559,26 @@ static void kvm_s390_set_crycb_format(struct kvm *kvm)







		kvm->arch.crypto.crycbd |= CRYCB_FORMAT1;









}



















/*









 * kvm_arch_crypto_set_masks









 *









 * @kvm: pointer to the target guest's KVM struct containing the crypto masks









 *	 to be set.









 * @apm: the mask identifying the accessible AP adapters









 * @aqm: the mask identifying the accessible AP domains









 * @adm: the mask identifying the accessible AP control domains









 *









 * Set the masks that identify the adapters, domains and control domains to









 * which the KVM guest is granted access.









 *









 * Note: The kvm->lock mutex must be locked by the caller before invoking this









 *	 function.









 */









void kvm_arch_crypto_set_masks(struct kvm *kvm, unsigned long *apm,









			       unsigned long *aqm, unsigned long *adm)









{









	struct kvm_s390_crypto_cb *crycb = kvm->arch.crypto.crycb;



















	mutex_lock(&kvm->lock);









	kvm_s390_vcpu_block_all(kvm);



















	switch (kvm->arch.crypto.crycbd & CRYCB_FORMAT_MASK) {








@@ -2595,13 +2609,23 @@ void kvm_arch_crypto_set_masks(struct kvm *kvm, unsigned long *apm,







	/* recreate the shadow crycb for each vcpu */









	kvm_s390_sync_request_broadcast(kvm, KVM_REQ_VSIE_RESTART);









	kvm_s390_vcpu_unblock_all(kvm);









	mutex_unlock(&kvm->lock);









}









EXPORT_SYMBOL_GPL(kvm_arch_crypto_set_masks);



















/*









 * kvm_arch_crypto_clear_masks









 *









 * @kvm: pointer to the target guest's KVM struct containing the crypto masks









 *	 to be cleared.









 *









 * Clear the masks that identify the adapters, domains and control domains to









 * which the KVM guest is granted access.









 *









 * Note: The kvm->lock mutex must be locked by the caller before invoking this









 *	 function.









 */









void kvm_arch_crypto_clear_masks(struct kvm *kvm)









{









	mutex_lock(&kvm->lock);









	kvm_s390_vcpu_block_all(kvm);



















	memset(&kvm->arch.crypto.crycb->apcb0, 0,








@@ -2613,7 +2637,6 @@ void kvm_arch_crypto_clear_masks(struct kvm *kvm)







	/* recreate the shadow crycb for each vcpu */









	kvm_s390_sync_request_broadcast(kvm, KVM_REQ_VSIE_RESTART);









	kvm_s390_vcpu_unblock_all(kvm);









	mutex_unlock(&kvm->lock);









}









EXPORT_SYMBOL_GPL(kvm_arch_crypto_clear_masks);


















@@ -2630,6 +2653,7 @@ static void kvm_s390_crypto_init(struct kvm *kvm)







{









	kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb;









	kvm_s390_set_crycb_format(kvm);









	init_rwsem(&kvm->arch.crypto.pqap_hook_rwsem);



















	if (!test_kvm_facility(kvm, 76))









		return;