From: Logan Gunthorpe <logang@deltatee.com> To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: "Stephen Bates" <sbates@raithlin.com>, "Christoph Hellwig" <hch@lst.de>, "Dan Williams" <dan.j.williams@intel.com>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Christian König" <christian.koenig@amd.com>, "John Hubbard" <jhubbard@nvidia.com>, "Don Dutile" <ddutile@redhat.com>, "Matthew Wilcox" <willy@infradead.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Minturn Dave B" <dave.b.minturn@intel.com>, "Jason Ekstrand" <jason@jlekstrand.net>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Xiong Jianxin" <jianxin.xiong@intel.com>, "Bjorn Helgaas" <helgaas@kernel.org>, "Ira Weiny" <ira.weiny@intel.com>, "Robin Murphy" <robin.murphy@arm.com>, "Martin Oliveira" <martin.oliveira@eideticom.com>, "Chaitanya Kulkarni" <ckulkarnilinux@gmail.com>, "Ralph Campbell" <rcampbell@nvidia.com>, "Logan Gunthorpe" <logang@deltatee.com>, "Bjorn Helgaas" <bhelgaas@google.com>, "Chaitanya Kulkarni" <kch@nvidia.com> Subject: [PATCH v7 02/21] PCI/P2PDMA: Attempt to set map_type if it has not been set Date: Wed, 15 Jun 2022 10:12:14 -0600 [thread overview] Message-ID: <20220615161233.17527-3-logang@deltatee.com> (raw) In-Reply-To: <20220615161233.17527-1-logang@deltatee.com> Attempt to find the mapping type for P2PDMA pages on the first DMA map attempt if it has not been done ahead of time. Previously, the mapping type was expected to be calculated ahead of time, but if pages are to come from userspace then there's no way to ensure the path was checked ahead of time. This change will calculate the mapping type if it hasn't pre-calculated so it is no longer invalid to call pci_p2pdma_map_sg() before the mapping type is calculated, so drop the WARN_ON when that is the case. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> --- drivers/pci/p2pdma.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 462b429ad243..4e8bc457e29a 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -854,6 +854,7 @@ static enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, struct pci_dev *provider = to_p2p_pgmap(pgmap)->provider; struct pci_dev *client; struct pci_p2pdma *p2pdma; + int dist; if (!provider->p2pdma) return PCI_P2PDMA_MAP_NOT_SUPPORTED; @@ -870,6 +871,10 @@ static enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, type = xa_to_value(xa_load(&p2pdma->map_types, map_types_idx(client))); rcu_read_unlock(); + + if (type == PCI_P2PDMA_MAP_UNKNOWN) + return calc_map_type_and_dist(provider, client, &dist, true); + return type; } @@ -912,7 +917,7 @@ int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg, case PCI_P2PDMA_MAP_BUS_ADDR: return __pci_p2pdma_map_sg(p2p_pgmap, dev, sg, nents); default: - WARN_ON_ONCE(1); + /* Mapping is not Supported */ return 0; } } -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Logan Gunthorpe <logang@deltatee.com> To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Stephen Bates" <sbates@raithlin.com>, "Jason Ekstrand" <jason@jlekstrand.net>, "Ira Weiny" <ira.weiny@intel.com>, "Christoph Hellwig" <hch@lst.de>, "Minturn Dave B" <dave.b.minturn@intel.com>, "Martin Oliveira" <martin.oliveira@eideticom.com>, "Matthew Wilcox" <willy@infradead.org>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Chaitanya Kulkarni" <ckulkarnilinux@gmail.com>, "Bjorn Helgaas" <helgaas@kernel.org>, "Ralph Campbell" <rcampbell@nvidia.com>, "Chaitanya Kulkarni" <kch@nvidia.com>, "John Hubbard" <jhubbard@nvidia.com>, "Bjorn Helgaas" <bhelgaas@google.com>, "Dan Williams" <dan.j.williams@intel.com>, "Xiong Jianxin" <jianxin.xiong@intel.com>, "Logan Gunthorpe" <logang@deltatee.com>, "Robin Murphy" <robin.murphy@arm.com>, "Christian König" <christian.koenig@amd.com> Subject: [PATCH v7 02/21] PCI/P2PDMA: Attempt to set map_type if it has not been set Date: Wed, 15 Jun 2022 10:12:14 -0600 [thread overview] Message-ID: <20220615161233.17527-3-logang@deltatee.com> (raw) In-Reply-To: <20220615161233.17527-1-logang@deltatee.com> Attempt to find the mapping type for P2PDMA pages on the first DMA map attempt if it has not been done ahead of time. Previously, the mapping type was expected to be calculated ahead of time, but if pages are to come from userspace then there's no way to ensure the path was checked ahead of time. This change will calculate the mapping type if it hasn't pre-calculated so it is no longer invalid to call pci_p2pdma_map_sg() before the mapping type is calculated, so drop the WARN_ON when that is the case. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> --- drivers/pci/p2pdma.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 462b429ad243..4e8bc457e29a 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -854,6 +854,7 @@ static enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, struct pci_dev *provider = to_p2p_pgmap(pgmap)->provider; struct pci_dev *client; struct pci_p2pdma *p2pdma; + int dist; if (!provider->p2pdma) return PCI_P2PDMA_MAP_NOT_SUPPORTED; @@ -870,6 +871,10 @@ static enum pci_p2pdma_map_type pci_p2pdma_map_type(struct dev_pagemap *pgmap, type = xa_to_value(xa_load(&p2pdma->map_types, map_types_idx(client))); rcu_read_unlock(); + + if (type == PCI_P2PDMA_MAP_UNKNOWN) + return calc_map_type_and_dist(provider, client, &dist, true); + return type; } @@ -912,7 +917,7 @@ int pci_p2pdma_map_sg_attrs(struct device *dev, struct scatterlist *sg, case PCI_P2PDMA_MAP_BUS_ADDR: return __pci_p2pdma_map_sg(p2p_pgmap, dev, sg, nents); default: - WARN_ON_ONCE(1); + /* Mapping is not Supported */ return 0; } } -- 2.30.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-06-15 16:12 UTC|newest] Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-15 16:12 [PATCH v7 00/21] Userspace P2PDMA with O_DIRECT NVMe devices Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 01/21] lib/scatterlist: add flag for indicating P2PDMA segments in an SGL Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:33 ` Christoph Hellwig 2022-06-29 6:33 ` Christoph Hellwig 2022-06-29 9:05 ` Robin Murphy 2022-06-29 9:05 ` Robin Murphy 2022-06-29 15:39 ` Logan Gunthorpe 2022-06-29 15:39 ` Logan Gunthorpe 2022-06-29 18:02 ` Robin Murphy 2022-06-29 18:02 ` Robin Murphy 2022-06-29 18:24 ` Logan Gunthorpe 2022-06-29 18:24 ` Logan Gunthorpe 2022-07-04 15:08 ` Robin Murphy 2022-07-04 15:08 ` Robin Murphy 2022-06-15 16:12 ` Logan Gunthorpe [this message] 2022-06-15 16:12 ` [PATCH v7 02/21] PCI/P2PDMA: Attempt to set map_type if it has not been set Logan Gunthorpe 2022-06-29 6:33 ` Christoph Hellwig 2022-06-29 6:33 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 03/21] PCI/P2PDMA: Expose pci_p2pdma_map_type() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:39 ` Christoph Hellwig 2022-06-29 6:39 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 04/21] PCI/P2PDMA: Introduce helpers for dma_map_sg implementations Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:39 ` Christoph Hellwig 2022-06-29 6:39 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 05/21] dma-mapping: allow EREMOTEIO return code for P2PDMA transfers Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:40 ` Christoph Hellwig 2022-06-29 6:40 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 06/21] dma-direct: support PCI P2PDMA pages in dma-direct map_sg Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:40 ` Christoph Hellwig 2022-06-29 6:40 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 07/21] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:41 ` Christoph Hellwig 2022-06-29 6:41 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 08/21] iommu/dma: support PCI P2PDMA pages in dma-iommu map_sg Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 12:07 ` Robin Murphy 2022-06-29 12:07 ` Robin Murphy 2022-06-29 15:57 ` Logan Gunthorpe 2022-06-29 15:57 ` Logan Gunthorpe 2022-06-29 19:15 ` Robin Murphy 2022-06-29 19:15 ` Robin Murphy 2022-06-29 22:41 ` Logan Gunthorpe 2022-06-29 22:41 ` Logan Gunthorpe 2022-06-30 14:56 ` Robin Murphy 2022-06-30 14:56 ` Robin Murphy 2022-06-30 21:21 ` Logan Gunthorpe 2022-06-30 21:21 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 09/21] nvme-pci: check DMA ops when indicating support for PCI P2PDMA Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:41 ` Christoph Hellwig 2022-06-29 6:41 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 10/21] nvme-pci: convert to using dma_map_sgtable() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:42 ` Christoph Hellwig 2022-06-29 6:42 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 11/21] RDMA/core: introduce ib_dma_pci_p2p_dma_supported() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:42 ` Christoph Hellwig 2022-06-29 6:42 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 12/21] RDMA/rw: drop pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:42 ` Christoph Hellwig 2022-06-29 6:42 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 13/21] PCI/P2PDMA: Remove pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:43 ` Christoph Hellwig 2022-06-29 6:43 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 14/21] mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:45 ` Christoph Hellwig 2022-06-29 6:45 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 15/21] iov_iter: introduce iov_iter_get_pages_[alloc_]flags() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:45 ` Christoph Hellwig 2022-06-29 6:45 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 16/21] block: add check when merging zone device pages Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:46 ` Christoph Hellwig 2022-06-29 6:46 ` Christoph Hellwig 2022-06-29 16:06 ` Logan Gunthorpe 2022-06-29 16:06 ` Logan Gunthorpe 2022-06-30 21:50 ` Logan Gunthorpe 2022-06-30 21:50 ` Logan Gunthorpe 2022-07-04 6:07 ` Christoph Hellwig 2022-07-04 6:07 ` Christoph Hellwig 2022-06-15 16:12 ` [PATCH v7 17/21] lib/scatterlist: " Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 18/21] block: set FOLL_PCI_P2PDMA in __bio_iov_iter_get_pages() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 19/21] block: set FOLL_PCI_P2PDMA in bio_map_user_iov() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 20/21] PCI/P2PDMA: Introduce pci_mmap_p2pmem() Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:48 ` Christoph Hellwig 2022-06-29 6:48 ` Christoph Hellwig 2022-06-29 16:00 ` Logan Gunthorpe 2022-06-29 16:00 ` Logan Gunthorpe 2022-06-29 17:59 ` Jason Gunthorpe 2022-06-29 17:59 ` Jason Gunthorpe 2022-07-05 7:51 ` Christoph Hellwig 2022-07-05 7:51 ` Christoph Hellwig 2022-07-05 13:51 ` Jason Gunthorpe 2022-07-05 13:51 ` Jason Gunthorpe 2022-07-05 16:12 ` Christoph Hellwig 2022-07-05 16:12 ` Christoph Hellwig 2022-07-05 16:29 ` Jason Gunthorpe 2022-07-05 16:29 ` Jason Gunthorpe 2022-07-05 16:40 ` Christoph Hellwig 2022-07-05 16:40 ` Christoph Hellwig 2022-07-05 16:41 ` Logan Gunthorpe 2022-07-05 16:41 ` Logan Gunthorpe 2022-07-05 16:43 ` Christoph Hellwig 2022-07-05 16:43 ` Christoph Hellwig 2022-07-05 16:44 ` Logan Gunthorpe 2022-07-05 16:44 ` Logan Gunthorpe 2022-07-05 16:50 ` Christoph Hellwig 2022-07-05 16:50 ` Christoph Hellwig 2022-07-05 17:21 ` Greg Kroah-Hartman 2022-07-05 17:21 ` Greg Kroah-Hartman 2022-07-05 17:32 ` Logan Gunthorpe 2022-07-05 17:32 ` Logan Gunthorpe 2022-07-05 17:42 ` Greg Kroah-Hartman 2022-07-05 17:42 ` Greg Kroah-Hartman 2022-07-05 18:16 ` Logan Gunthorpe 2022-07-05 18:16 ` Logan Gunthorpe 2022-07-06 6:51 ` Christoph Hellwig 2022-07-06 6:51 ` Christoph Hellwig 2022-07-06 7:04 ` Greg Kroah-Hartman 2022-07-06 7:04 ` Greg Kroah-Hartman 2022-07-06 21:30 ` Logan Gunthorpe 2022-06-15 16:12 ` [PATCH v7 21/21] nvme-pci: allow mmaping the CMB in userspace Logan Gunthorpe 2022-06-15 16:12 ` Logan Gunthorpe 2022-06-29 6:49 ` [PATCH v7 00/21] Userspace P2PDMA with O_DIRECT NVMe devices Christoph Hellwig 2022-06-29 6:49 ` Christoph Hellwig
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=20220615161233.17527-3-logang@deltatee.com \ --to=logang@deltatee.com \ --cc=bhelgaas@google.com \ --cc=christian.koenig@amd.com \ --cc=ckulkarnilinux@gmail.com \ --cc=dan.j.williams@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dave.b.minturn@intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=ddutile@redhat.com \ --cc=hch@lst.de \ --cc=helgaas@kernel.org \ --cc=iommu@lists.linux-foundation.org \ --cc=ira.weiny@intel.com \ --cc=jason@jlekstrand.net \ --cc=jgg@ziepe.ca \ --cc=jhubbard@nvidia.com \ --cc=jianxin.xiong@intel.com \ --cc=kch@nvidia.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=martin.oliveira@eideticom.com \ --cc=rcampbell@nvidia.com \ --cc=robin.murphy@arm.com \ --cc=sbates@raithlin.com \ --cc=willy@infradead.org \ /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.