Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2cbfbf7 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Bjorn Helgaas
Browse files

PCI/P2PDMA: Apply host bridge whitelist for ACS 

When a P2PDMA transfer is rejected due to ACS being set, we can also check
the whitelist and allow the transactions.

Do this by pushing the whitelist check into the upstream_bridge_distance()
function.

Link: https://lore.kernel.org/r/20190730163545.4915-6-logang@deltatee.com
Link: https://lore.kernel.org/r/20190812173048.9186-6-logang@deltatee.com


Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent c6bfaeb5

drivers/pci/p2pdma.c

+14 −12
Original line number Diff line number Diff line
@@ -339,16 +339,8 @@ __upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client, 
	if (dist)

		*dist = dist_a + dist_b;



	/*

	 * Allow the connection if both devices are on a whitelisted root

	 * complex, but add an arbitrary large value to the distance.

	 */

	if (root_complex_whitelist(provider) &&

	    root_complex_whitelist(client))

	return PCI_P2PDMA_MAP_THRU_HOST_BRIDGE;



	return PCI_P2PDMA_MAP_NOT_SUPPORTED;



check_b_path_acs:

	bb = b;
@@ -371,7 +363,7 @@ __upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client, 
		if (acs_redirects)

			*acs_redirects = true;



		return PCI_P2PDMA_MAP_NOT_SUPPORTED;

		return PCI_P2PDMA_MAP_THRU_HOST_BRIDGE;

	}



	return PCI_P2PDMA_MAP_BUS_ADDR;
@@ -420,8 +412,18 @@ static enum pci_p2pdma_map_type 
upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client,

		int *dist, bool *acs_redirects, struct seq_buf *acs_list)

{

	return __upstream_bridge_distance(provider, client, dist,

	enum pci_p2pdma_map_type map_type;



	map_type = __upstream_bridge_distance(provider, client, dist,

					      acs_redirects, acs_list);



	if (map_type == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE) {

		if (!root_complex_whitelist(provider) ||

		    !root_complex_whitelist(client))

			return PCI_P2PDMA_MAP_NOT_SUPPORTED;

	}



	return map_type;

}



static enum pci_p2pdma_map_type