From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Christoph Hellwig <hch@lst.de>,
Christian Koenig <Christian.Koenig@amd.com>,
Jason Gunthorpe <jgg@mellanox.com>,
Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
Jens Axboe <axboe@fb.com>,
Dan Williams <dan.j.williams@intel.com>,
Eric Pilmore <epilmore@gigaio.com>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH 04/14] PCI/P2PDMA: Cache the result of upstream_bridge_distance()
Date: Mon, 22 Jul 2019 17:08:49 -0600 [thread overview]
Message-ID: <20190722230859.5436-5-logang@deltatee.com> (raw)
In-Reply-To: <20190722230859.5436-1-logang@deltatee.com>
The result of upstream_bridge_distance() will be needed every time
we map the dma address so cache it in an xarray stored in the
provider's p2pdma struct.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/pci/p2pdma.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index d5034e28d1e1..25663c1d8bc9 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -19,10 +19,12 @@
#include <linux/random.h>
#include <linux/seq_buf.h>
#include <linux/iommu.h>
+#include <linux/xarray.h>
struct pci_p2pdma {
struct gen_pool *pool;
bool p2pmem_published;
+ struct xarray dist_cache;
};
static ssize_t size_show(struct device *dev, struct device_attribute *attr,
@@ -98,6 +100,8 @@ static int pci_p2pdma_setup(struct pci_dev *pdev)
if (!p2p)
return -ENOMEM;
+ xa_init(&p2p->dist_cache);
+
p2p->pool = gen_pool_create(PAGE_SHIFT, dev_to_node(&pdev->dev));
if (!p2p->pool)
goto out;
@@ -390,17 +394,34 @@ static int upstream_bridge_distance(struct pci_dev *provider,
struct pci_dev *client,
struct seq_buf *acs_list)
{
+ void *entry;
int dist;
+ int idx;
+
+ idx = (pci_domain_nr(client->bus) << 16) |
+ (client->bus->number << 8) | client->devfn;
+
+ if (provider->p2pdma) {
+ entry = xa_load(&provider->p2pdma->dist_cache, idx);
+ if (entry)
+ return xa_to_value(entry);
+ }
dist = __upstream_bridge_distance(provider, client, acs_list);
if (!(dist & P2PDMA_THRU_HOST_BRIDGE))
- return dist;
+ goto store_and_return;
+
+ if (!root_complex_whitelist(provider) ||
+ !root_complex_whitelist(client))
+ dist |= P2PDMA_NOT_SUPPORTED;
- if (root_complex_whitelist(provider) && root_complex_whitelist(client))
- return dist;
+store_and_return:
+ if (provider->p2pdma)
+ xa_store(&provider->p2pdma->dist_cache, idx,
+ xa_mk_value(dist), GFP_KERNEL);
- return dist | P2PDMA_NOT_SUPPORTED;
+ return dist;
}
static int upstream_bridge_distance_warn(struct pci_dev *provider,
--
2.20.1
next prev parent reply other threads:[~2019-07-22 23:10 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 23:08 [PATCH 00/14] PCI/P2PDMA: Support transactions that hit the host bridge Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 01/14] PCI/P2PDMA: Add constants for not-supported result upstream_bridge_distance() Logan Gunthorpe
2019-07-23 16:20 ` Koenig, Christian
2019-07-22 23:08 ` [PATCH 02/14] PCI/P2PDMA: Factor out __upstream_bridge_distance() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 03/14] PCI/P2PDMA: Apply host bridge white list for ACS Logan Gunthorpe
2019-07-23 16:23 ` Koenig, Christian
2019-07-22 23:08 ` Logan Gunthorpe [this message]
2019-07-22 23:08 ` [PATCH 05/14] PCI/P2PDMA: Factor out host_bridge_whitelist() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 06/14] PCI/P2PDMA: Add whitelist support for Intel Host Bridges Logan Gunthorpe
2019-07-25 18:52 ` Jason Gunthorpe
2019-07-25 19:14 ` Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 07/14] PCI/P2PDMA: Add the provider's pci_dev to the dev_pgmap struct Logan Gunthorpe
2019-07-24 6:32 ` Christoph Hellwig
2019-07-24 15:50 ` Logan Gunthorpe
2019-07-25 6:02 ` Christoph Hellwig
2019-07-22 23:08 ` [PATCH 08/14] PCI/P2PDMA: Add attrs argument to pci_p2pdma_map_sg() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 09/14] PCI/P2PDMA: Introduce pci_p2pdma_unmap_sg() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 10/14] PCI/P2PDMA: Factor out __pci_p2pdma_map_sg() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 11/14] PCI/P2PDMA: dma_map P2PDMA map requests that traverse the host bridge Logan Gunthorpe
2019-07-24 6:32 ` Christoph Hellwig
2019-07-24 15:58 ` Logan Gunthorpe
2019-07-25 6:10 ` Christoph Hellwig
2019-07-25 16:00 ` Logan Gunthorpe
2019-07-25 16:34 ` Jason Gunthorpe
2019-07-25 17:22 ` Logan Gunthorpe
2019-07-25 18:58 ` Jason Gunthorpe
2019-07-25 19:17 ` Logan Gunthorpe
2019-07-25 19:29 ` Jason Gunthorpe
2019-07-25 19:36 ` Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 12/14] PCI/P2PDMA: No longer require no-mmu for host bridge whitelist Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 13/14] PCI/P2PDMA: Update documentation for pci_p2pdma_distance_many() Logan Gunthorpe
2019-07-22 23:08 ` [PATCH 14/14] PCI/P2PDMA: Introduce pci_p2pdma_[un]map_resource() Logan Gunthorpe
2019-07-23 16:28 ` Koenig, Christian
2019-07-23 16:58 ` Logan Gunthorpe
2019-07-24 6:32 ` Christoph Hellwig
2019-07-24 16:06 ` Logan Gunthorpe
2019-07-25 11:50 ` Christoph Hellwig
2019-07-25 16:00 ` Logan Gunthorpe
2019-07-23 16:30 ` [PATCH 00/14] PCI/P2PDMA: Support transactions that hit the host bridge Koenig, Christian
2019-07-23 16:58 ` Logan Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190722230859.5436-5-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Christian.Koenig@amd.com \
--cc=axboe@fb.com \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=epilmore@gigaio.com \
--cc=hch@lst.de \
--cc=jgg@mellanox.com \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).