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 v2 11/14] PCI/P2PDMA: Store mapping method in an xarray Date: Tue, 30 Jul 2019 10:35:42 -0600 [thread overview] Message-ID: <20190730163545.4915-12-logang@deltatee.com> (raw) In-Reply-To: <20190730163545.4915-1-logang@deltatee.com> When upstream_bridge_distance() is called store the method required to map the DMA transfers in an xarray so that it can be looked up efficiently on the hot path in pci_p2pdma_map_sg(). Signed-off-by: Logan Gunthorpe <logang@deltatee.com> --- drivers/pci/p2pdma.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index fe647bd8f947..010aa8742bec 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -19,10 +19,19 @@ #include <linux/random.h> #include <linux/seq_buf.h> #include <linux/iommu.h> +#include <linux/xarray.h> + +enum pci_p2pdma_map_type { + PCI_P2PDMA_MAP_UNKNOWN = 0, + PCI_P2PDMA_MAP_NOT_SUPPORTED, + PCI_P2PDMA_MAP_BUS_ADDR, + PCI_P2PDMA_MAP_THRU_IOMMU, +}; struct pci_p2pdma { struct gen_pool *pool; bool p2pmem_published; + struct xarray map_types; }; struct pci_p2pdma_pagemap { @@ -98,6 +107,7 @@ static void pci_p2pdma_release(void *data) gen_pool_destroy(p2pdma->pool); sysfs_remove_group(&pdev->dev.kobj, &p2pmem_group); + xa_destroy(&p2pdma->map_types); } static int pci_p2pdma_setup(struct pci_dev *pdev) @@ -109,6 +119,8 @@ static int pci_p2pdma_setup(struct pci_dev *pdev) if (!p2p) return -ENOMEM; + xa_init(&p2p->map_types); + p2p->pool = gen_pool_create(PAGE_SHIFT, dev_to_node(&pdev->dev)); if (!p2p->pool) goto out; @@ -404,6 +416,12 @@ static int __upstream_bridge_distance(struct pci_dev *provider, return dist_a + dist_b; } +static int map_types_idx(struct pci_dev *client) +{ + return (pci_domain_nr(client->bus) << 16) | + (client->bus->number << 8) | client->devfn; +} + /* * Find the distance through the nearest common upstream bridge between * two PCI devices. @@ -446,17 +464,29 @@ static int upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client, struct seq_buf *acs_list) { + enum pci_p2pdma_map_type map_type; int dist; dist = __upstream_bridge_distance(provider, client, acs_list); - if (!(dist & P2PDMA_THRU_HOST_BRIDGE)) - return dist; + if (!(dist & P2PDMA_THRU_HOST_BRIDGE)) { + map_type = PCI_P2PDMA_MAP_BUS_ADDR; + goto store_map_type_and_return; + } + + if (host_bridge_whitelist(provider, client)) { + map_type = PCI_P2PDMA_MAP_THRU_IOMMU; + } else { + dist |= P2PDMA_NOT_SUPPORTED; + map_type = PCI_P2PDMA_MAP_NOT_SUPPORTED; + } - if (host_bridge_whitelist(provider, client)) - return dist; +store_map_type_and_return: + if (provider->p2pdma) + xa_store(&provider->p2pdma->map_types, map_types_idx(client), + xa_mk_value(map_type), GFP_KERNEL); - return dist | P2PDMA_NOT_SUPPORTED; + return dist; } static int upstream_bridge_distance_warn(struct pci_dev *provider, -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: logang@deltatee.com (Logan Gunthorpe) Subject: [PATCH v2 11/14] PCI/P2PDMA: Store mapping method in an xarray Date: Tue, 30 Jul 2019 10:35:42 -0600 [thread overview] Message-ID: <20190730163545.4915-12-logang@deltatee.com> (raw) In-Reply-To: <20190730163545.4915-1-logang@deltatee.com> When upstream_bridge_distance() is called store the method required to map the DMA transfers in an xarray so that it can be looked up efficiently on the hot path in pci_p2pdma_map_sg(). Signed-off-by: Logan Gunthorpe <logang at deltatee.com> --- drivers/pci/p2pdma.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index fe647bd8f947..010aa8742bec 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -19,10 +19,19 @@ #include <linux/random.h> #include <linux/seq_buf.h> #include <linux/iommu.h> +#include <linux/xarray.h> + +enum pci_p2pdma_map_type { + PCI_P2PDMA_MAP_UNKNOWN = 0, + PCI_P2PDMA_MAP_NOT_SUPPORTED, + PCI_P2PDMA_MAP_BUS_ADDR, + PCI_P2PDMA_MAP_THRU_IOMMU, +}; struct pci_p2pdma { struct gen_pool *pool; bool p2pmem_published; + struct xarray map_types; }; struct pci_p2pdma_pagemap { @@ -98,6 +107,7 @@ static void pci_p2pdma_release(void *data) gen_pool_destroy(p2pdma->pool); sysfs_remove_group(&pdev->dev.kobj, &p2pmem_group); + xa_destroy(&p2pdma->map_types); } static int pci_p2pdma_setup(struct pci_dev *pdev) @@ -109,6 +119,8 @@ static int pci_p2pdma_setup(struct pci_dev *pdev) if (!p2p) return -ENOMEM; + xa_init(&p2p->map_types); + p2p->pool = gen_pool_create(PAGE_SHIFT, dev_to_node(&pdev->dev)); if (!p2p->pool) goto out; @@ -404,6 +416,12 @@ static int __upstream_bridge_distance(struct pci_dev *provider, return dist_a + dist_b; } +static int map_types_idx(struct pci_dev *client) +{ + return (pci_domain_nr(client->bus) << 16) | + (client->bus->number << 8) | client->devfn; +} + /* * Find the distance through the nearest common upstream bridge between * two PCI devices. @@ -446,17 +464,29 @@ static int upstream_bridge_distance(struct pci_dev *provider, struct pci_dev *client, struct seq_buf *acs_list) { + enum pci_p2pdma_map_type map_type; int dist; dist = __upstream_bridge_distance(provider, client, acs_list); - if (!(dist & P2PDMA_THRU_HOST_BRIDGE)) - return dist; + if (!(dist & P2PDMA_THRU_HOST_BRIDGE)) { + map_type = PCI_P2PDMA_MAP_BUS_ADDR; + goto store_map_type_and_return; + } + + if (host_bridge_whitelist(provider, client)) { + map_type = PCI_P2PDMA_MAP_THRU_IOMMU; + } else { + dist |= P2PDMA_NOT_SUPPORTED; + map_type = PCI_P2PDMA_MAP_NOT_SUPPORTED; + } - if (host_bridge_whitelist(provider, client)) - return dist; +store_map_type_and_return: + if (provider->p2pdma) + xa_store(&provider->p2pdma->map_types, map_types_idx(client), + xa_mk_value(map_type), 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-30 16:36 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-30 16:35 [PATCH v2 00/14] PCI/P2PDMA: Support transactions that hit the host bridge Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 01/14] PCI/P2PDMA: Introduce private pagemap structure Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 02/14] PCI/P2PDMA: Add the provider's pci_dev to the pci_p2pdma_pagemap struct Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 03/14] PCI/P2PDMA: Add constants for not-supported result upstream_bridge_distance() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-08-07 5:54 ` Christoph Hellwig 2019-08-07 5:54 ` Christoph Hellwig 2019-08-07 15:58 ` Logan Gunthorpe 2019-08-07 15:58 ` Logan Gunthorpe 2019-08-08 7:31 ` Christoph Hellwig 2019-08-08 7:31 ` Christoph Hellwig 2019-08-08 15:58 ` Logan Gunthorpe 2019-08-08 15:58 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 04/14] PCI/P2PDMA: Factor out __upstream_bridge_distance() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 05/14] PCI/P2PDMA: Apply host bridge white list for ACS Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 06/14] PCI/P2PDMA: Factor out host_bridge_whitelist() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 07/14] PCI/P2PDMA: Add whitelist support for Intel Host Bridges Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 08/14] PCI/P2PDMA: Add attrs argument to pci_p2pdma_map_sg() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 09/14] PCI/P2PDMA: Introduce pci_p2pdma_unmap_sg() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 10/14] PCI/P2PDMA: Factor out __pci_p2pdma_map_sg() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe [this message] 2019-07-30 16:35 ` [PATCH v2 11/14] PCI/P2PDMA: Store mapping method in an xarray Logan Gunthorpe 2019-08-07 5:59 ` Christoph Hellwig 2019-08-07 5:59 ` Christoph Hellwig 2019-07-30 16:35 ` [PATCH v2 12/14] PCI/P2PDMA: dma_map P2PDMA map requests that traverse the host bridge Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-07-30 16:35 ` [PATCH v2 13/14] PCI/P2PDMA: No longer require no-mmu for host bridge whitelist Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-08-07 5:59 ` Christoph Hellwig 2019-08-07 5:59 ` Christoph Hellwig 2019-08-07 12:43 ` Bjorn Helgaas 2019-08-07 12:43 ` Bjorn Helgaas 2019-08-08 7:29 ` Christoph Hellwig 2019-08-08 7:29 ` Christoph Hellwig 2019-07-30 16:35 ` [PATCH v2 14/14] PCI/P2PDMA: Update documentation for pci_p2pdma_distance_many() Logan Gunthorpe 2019-07-30 16:35 ` Logan Gunthorpe 2019-08-06 23:44 ` [PATCH v2 00/14] PCI/P2PDMA: Support transactions that hit the host bridge Bjorn Helgaas 2019-08-06 23:44 ` Bjorn Helgaas 2019-08-07 0:31 ` Logan Gunthorpe 2019-08-07 0:31 ` Logan Gunthorpe 2019-08-07 19:29 ` Bjorn Helgaas 2019-08-07 19:29 ` Bjorn Helgaas
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=20190730163545.4915-12-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.