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>, "Jakowski Andrzej" <andrzej.jakowski@intel.com>, "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>, "Alex Sierra" <alex.sierra@amd.com>, "Theodore Ts'o" <tytso@mit.edu>, "Darrick J . Wong" <djwong@kernel.org> Subject: [PATCH v5 01/24] ext4/xfs: add page refcount helper Date: Thu, 27 Jan 2022 17:25:51 -0700 [thread overview] Message-ID: <20220128002614.6136-2-logang@deltatee.com> (raw) In-Reply-To: <20220128002614.6136-1-logang@deltatee.com> From: Ralph Campbell <rcampbell@nvidia.com> There are several places where ZONE_DEVICE struct pages assume a reference count == 1 means the page is idle and free. Instead of open coding this, add a helper function to hide this detail. Signed-off-by: Ralph Campbell <rcampbell@nvidia.com> Signed-off-by: Alex Sierra <alex.sierra@amd.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Acked-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Darrick J. Wong <djwong@kernel.org> --- fs/dax.c | 4 ++-- fs/ext4/inode.c | 5 +---- fs/fuse/dax.c | 4 +--- fs/xfs/xfs_file.c | 4 +--- include/linux/dax.h | 10 ++++++++++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index cd03485867a7..d9b856cf6436 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -369,7 +369,7 @@ static void dax_disassociate_entry(void *entry, struct address_space *mapping, for_each_mapped_pfn(entry, pfn) { struct page *page = pfn_to_page(pfn); - WARN_ON_ONCE(trunc && page_ref_count(page) > 1); + WARN_ON_ONCE(trunc && !dax_page_unused(page)); WARN_ON_ONCE(page->mapping && page->mapping != mapping); page->mapping = NULL; page->index = 0; @@ -383,7 +383,7 @@ static struct page *dax_busy_page(void *entry) for_each_mapped_pfn(entry, pfn) { struct page *page = pfn_to_page(pfn); - if (page_ref_count(page) > 1) + if (!dax_page_unused(page)) return page; } return NULL; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 5f79d265d06a..99e3ed7bcd06 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3899,10 +3899,7 @@ int ext4_break_layouts(struct inode *inode) if (!page) return 0; - error = ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, - TASK_INTERRUPTIBLE, 0, 0, - ext4_wait_dax_page(inode)); + error = dax_wait_page(inode, page, ext4_wait_dax_page); } while (error == 0); return error; diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 182b24a14804..f8b3f30d2303 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -676,9 +676,7 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, fuse_wait_dax_page(inode)); + return dax_wait_page(inode, page, fuse_wait_dax_page); } /* dmap_end == 0 leads to unmapping of whole file */ diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 22ad207bedf4..57a440666935 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -859,9 +859,7 @@ xfs_break_dax_layouts( return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, xfs_wait_dax_page(inode)); + return dax_wait_page(inode, page, xfs_wait_dax_page); } int diff --git a/include/linux/dax.h b/include/linux/dax.h index 9fc5f99a0ae2..479939b3be40 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -201,6 +201,16 @@ static inline bool dax_mapping(struct address_space *mapping) return mapping->host && IS_DAX(mapping->host); } +static inline bool dax_page_unused(struct page *page) +{ + return page_ref_count(page) == 1; +} + +#define dax_wait_page(_inode, _page, _wait_cb) \ + ___wait_var_event(&(_page)->_refcount, \ + dax_page_unused(_page), \ + TASK_INTERRUPTIBLE, 0, 0, _wait_cb(_inode)) + #ifdef CONFIG_DEV_DAX_HMEM_DEVICES void hmem_register_device(int target_nid, struct resource *r); #else -- 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: "Alex Sierra" <alex.sierra@amd.com>, "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>, "Darrick J . Wong" <djwong@kernel.org>, "Ralph Campbell" <rcampbell@nvidia.com>, "John Hubbard" <jhubbard@nvidia.com>, "Dan Williams" <dan.j.williams@intel.com>, "Jakowski Andrzej" <andrzej.jakowski@intel.com>, "Xiong Jianxin" <jianxin.xiong@intel.com>, "Theodore Ts'o" <tytso@mit.edu>, "Robin Murphy" <robin.murphy@arm.com>, "Christian König" <christian.koenig@amd.com> Subject: [PATCH v5 01/24] ext4/xfs: add page refcount helper Date: Thu, 27 Jan 2022 17:25:51 -0700 [thread overview] Message-ID: <20220128002614.6136-2-logang@deltatee.com> (raw) In-Reply-To: <20220128002614.6136-1-logang@deltatee.com> From: Ralph Campbell <rcampbell@nvidia.com> There are several places where ZONE_DEVICE struct pages assume a reference count == 1 means the page is idle and free. Instead of open coding this, add a helper function to hide this detail. Signed-off-by: Ralph Campbell <rcampbell@nvidia.com> Signed-off-by: Alex Sierra <alex.sierra@amd.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Acked-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Darrick J. Wong <djwong@kernel.org> --- fs/dax.c | 4 ++-- fs/ext4/inode.c | 5 +---- fs/fuse/dax.c | 4 +--- fs/xfs/xfs_file.c | 4 +--- include/linux/dax.h | 10 ++++++++++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index cd03485867a7..d9b856cf6436 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -369,7 +369,7 @@ static void dax_disassociate_entry(void *entry, struct address_space *mapping, for_each_mapped_pfn(entry, pfn) { struct page *page = pfn_to_page(pfn); - WARN_ON_ONCE(trunc && page_ref_count(page) > 1); + WARN_ON_ONCE(trunc && !dax_page_unused(page)); WARN_ON_ONCE(page->mapping && page->mapping != mapping); page->mapping = NULL; page->index = 0; @@ -383,7 +383,7 @@ static struct page *dax_busy_page(void *entry) for_each_mapped_pfn(entry, pfn) { struct page *page = pfn_to_page(pfn); - if (page_ref_count(page) > 1) + if (!dax_page_unused(page)) return page; } return NULL; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 5f79d265d06a..99e3ed7bcd06 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3899,10 +3899,7 @@ int ext4_break_layouts(struct inode *inode) if (!page) return 0; - error = ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, - TASK_INTERRUPTIBLE, 0, 0, - ext4_wait_dax_page(inode)); + error = dax_wait_page(inode, page, ext4_wait_dax_page); } while (error == 0); return error; diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 182b24a14804..f8b3f30d2303 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -676,9 +676,7 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, fuse_wait_dax_page(inode)); + return dax_wait_page(inode, page, fuse_wait_dax_page); } /* dmap_end == 0 leads to unmapping of whole file */ diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 22ad207bedf4..57a440666935 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -859,9 +859,7 @@ xfs_break_dax_layouts( return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, xfs_wait_dax_page(inode)); + return dax_wait_page(inode, page, xfs_wait_dax_page); } int diff --git a/include/linux/dax.h b/include/linux/dax.h index 9fc5f99a0ae2..479939b3be40 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -201,6 +201,16 @@ static inline bool dax_mapping(struct address_space *mapping) return mapping->host && IS_DAX(mapping->host); } +static inline bool dax_page_unused(struct page *page) +{ + return page_ref_count(page) == 1; +} + +#define dax_wait_page(_inode, _page, _wait_cb) \ + ___wait_var_event(&(_page)->_refcount, \ + dax_page_unused(_page), \ + TASK_INTERRUPTIBLE, 0, 0, _wait_cb(_inode)) + #ifdef CONFIG_DEV_DAX_HMEM_DEVICES void hmem_register_device(int target_nid, struct resource *r); #else -- 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-01-28 0:26 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-28 0:25 [PATCH v5 00/24] Userspace P2PDMA with O_DIRECT NVMe devices Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe [this message] 2022-01-28 0:25 ` [PATCH v5 01/24] ext4/xfs: add page refcount helper Logan Gunthorpe 2022-01-28 9:26 ` Chaitanya Kulkarni 2022-01-28 9:26 ` Chaitanya Kulkarni via iommu 2022-01-28 0:25 ` [PATCH v5 02/24] mm: remove extra ZONE_DEVICE struct page refcount Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 14:21 ` Jason Gunthorpe 2022-01-28 14:21 ` Jason Gunthorpe 2022-01-28 16:51 ` Logan Gunthorpe 2022-01-28 16:51 ` Logan Gunthorpe 2022-01-28 17:16 ` Ralph Campbell 2022-01-28 17:16 ` Ralph Campbell via iommu 2022-01-28 0:25 ` [PATCH v5 03/24] lib/scatterlist: add flag for indicating P2PDMA segments in an SGL Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 04/24] PCI/P2PDMA: Attempt to set map_type if it has not been set Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 05/24] PCI/P2PDMA: Expose pci_p2pdma_map_type() Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 06/24] PCI/P2PDMA: Introduce helpers for dma_map_sg implementations Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 07/24] dma-mapping: allow EREMOTEIO return code for P2PDMA transfers Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 08/24] dma-direct: support PCI P2PDMA pages in dma-direct map_sg Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-02-01 20:53 ` Jonathan Derrick 2022-02-01 20:53 ` Jonathan Derrick 2022-02-01 20:57 ` Logan Gunthorpe 2022-02-01 20:57 ` Logan Gunthorpe 2022-01-28 0:25 ` [PATCH v5 09/24] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Logan Gunthorpe 2022-01-28 0:25 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 10/24] iommu/dma: support PCI P2PDMA pages in dma-iommu map_sg Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 11/24] nvme-pci: check DMA ops when indicating support for PCI P2PDMA Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 12/24] nvme-pci: convert to using dma_map_sgtable() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 9:13 ` Chaitanya Kulkarni 2022-01-28 9:13 ` Chaitanya Kulkarni via iommu 2022-01-28 0:26 ` [PATCH v5 13/24] RDMA/core: introduce ib_dma_pci_p2p_dma_supported() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 14/24] RDMA/rw: drop pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 15/24] PCI/P2PDMA: Remove pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 16/24] mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 17/24] iov_iter: introduce iov_iter_get_pages_[alloc_]flags() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 18/24] block: add check when merging zone device pages Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 19/24] lib/scatterlist: " Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 20/24] block: set FOLL_PCI_P2PDMA in __bio_iov_iter_get_pages() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 21/24] block: set FOLL_PCI_P2PDMA in bio_map_user_iov() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 22/24] mm: use custom page_free for P2PDMA pages Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 14:22 ` Jason Gunthorpe 2022-01-28 14:22 ` Jason Gunthorpe 2022-01-28 16:52 ` Logan Gunthorpe 2022-01-28 16:52 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 23/24] PCI/P2PDMA: Introduce pci_mmap_p2pmem() Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-28 0:26 ` [PATCH v5 24/24] nvme-pci: allow mmaping the CMB in userspace Logan Gunthorpe 2022-01-28 0:26 ` Logan Gunthorpe 2022-01-31 18:56 ` [PATCH v5 00/24] Userspace P2PDMA with O_DIRECT NVMe devices Jonathan Derrick 2022-01-31 18:56 ` Jonathan Derrick 2022-01-31 19:00 ` Logan Gunthorpe 2022-01-31 19:00 ` 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=20220128002614.6136-2-logang@deltatee.com \ --to=logang@deltatee.com \ --cc=alex.sierra@amd.com \ --cc=andrzej.jakowski@intel.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=djwong@kernel.org \ --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=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=tytso@mit.edu \ --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.