linux-next: manual merge of the vfio tree with the s390 tree

linux-next: manual merge of the vfio tree with the s390 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1347 bytes --]

Hi all,

Today's linux-next merge of the vfio tree got a conflict in:

  arch/s390/pci/pci_bus.c

between commit:

  abb95b7550f8 ("s390/pci: consolidate SR-IOV specific code")

from the s390 tree and commit:

  08b6e22b850c ("s390/pci: Mark all VFs as not implementing PCI_COMMAND_MEMORY")

from the vfio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/s390/pci/pci_bus.c
index 0c0db7c3a404,c93486a9989b..000000000000
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@@ -135,9 -197,10 +135,10 @@@ void pcibios_bus_add_device(struct pci_
  	 * With pdev->no_vf_scan the common PCI probing code does not
  	 * perform PF/VF linking.
  	 */
- 	if (zdev->vfn)
+ 	if (zdev->vfn) {
 -		zpci_bus_setup_virtfn(zdev->zbus, pdev, zdev->vfn);
 +		zpci_iov_setup_virtfn(zdev->zbus, pdev, zdev->vfn);
- 
+ 		pdev->no_command_memory = 1;
+ 	}
  }
  
  static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfio tree with the s390 tree

[Niklas Schnelle]

Hi Stephen,

first thanks for the manual fix it's exactly the same resolution I would
have used. Sorry this conflict ended up on your desk without warning,
I had made Vasily and Heiko aware of this as an upcoming conflict but failed
to alert Alex who finally ended up carrying the change so I this is my fault.

Best regards,
Niklas Schnelle

On 9/24/20 6:26 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfio tree got a conflict in:
> 
>   arch/s390/pci/pci_bus.c
> 
> between commit:
> 
>   abb95b7550f8 ("s390/pci: consolidate SR-IOV specific code")
> 
> from the s390 tree and commit:
> 
>   08b6e22b850c ("s390/pci: Mark all VFs as not implementing PCI_COMMAND_MEMORY")
> 
> from the vfio tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

linux-next: manual merge of the vfio tree with the s390 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the vfio tree got a conflict in:

  drivers/s390/crypto/vfio_ap_private.h

between commit:

  49b0109fb399 ("s390/vfio-ap: introduce shadow APCB")

from the s390 tree and commit:

  ce4b4657ff18 ("vfio: Replace the DMA unmapping notifier with a callback")

from the vfio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/s390/crypto/vfio_ap_private.h
index 2d03871597bf,abb59d59f81b..000000000000
--- a/drivers/s390/crypto/vfio_ap_private.h
+++ b/drivers/s390/crypto/vfio_ap_private.h
@@@ -97,9 -81,6 +97,7 @@@ struct ap_queue_table 
   * @node:	allows the ap_matrix_mdev struct to be added to a list
   * @matrix:	the adapters, usage domains and control domains assigned to the
   *		mediated matrix device.
 + * @shadow_apcb:    the shadow copy of the APCB field of the KVM guest's CRYCB
-  * @iommu_notifier: notifier block used for specifying callback function for
-  *		    handling the VFIO_IOMMU_NOTIFY_DMA_UNMAP even
   * @kvm:	the struct holding guest's state
   * @pqap_hook:	the function pointer to the interception handler for the
   *		PQAP(AQIC) instruction.
@@@ -114,8 -90,6 +112,7 @@@ struct ap_matrix_mdev 
  	struct vfio_device vdev;
  	struct list_head node;
  	struct ap_matrix matrix;
 +	struct ap_matrix shadow_apcb;
- 	struct notifier_block iommu_notifier;
  	struct kvm *kvm;
  	crypto_hook pqap_hook;
  	struct mdev_device *mdev;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]