From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <linux-kernel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,
<nvdimm@lists.linux.dev>, <linux-mm@kvack.org>,
<linux-fsdevel@vger.kernel.org>
Cc: <djwong@kernel.org>, <dan.j.williams@intel.com>,
<david@fromorbit.com>, <hch@infradead.org>, <jane.chu@oracle.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v11 5/8] mm: move pgoff_address() to vma_pgoff_address()
Date: Sun, 27 Feb 2022 20:07:44 +0800 [thread overview]
Message-ID: <20220227120747.711169-6-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20220227120747.711169-1-ruansy.fnst@fujitsu.com>
Since it is not a DAX-specific function, move it into mm and rename it
to be a generic helper.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
---
fs/dax.c | 12 +-----------
include/linux/mm.h | 13 +++++++++++++
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index 653a2f390b72..f164cf64c611 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -853,16 +853,6 @@ static void *dax_insert_entry(struct xa_state *xas,
return entry;
}
-static inline
-unsigned long pgoff_address(pgoff_t pgoff, struct vm_area_struct *vma)
-{
- unsigned long address;
-
- address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
- VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma);
- return address;
-}
-
/* Walk all mappings of a given index of a file and writeprotect them */
static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
unsigned long pfn)
@@ -882,7 +872,7 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
if (!(vma->vm_flags & VM_SHARED))
continue;
- address = pgoff_address(index, vma);
+ address = vma_pgoff_address(vma, index);
/*
* follow_invalidate_pte() will use the range to call
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e1a84b1e6787..9b1d56c5c224 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2816,6 +2816,19 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
}
+/*
+ * Get user virtual address at the specific offset within a vma.
+ */
+static inline unsigned long vma_pgoff_address(struct vm_area_struct *vma,
+ pgoff_t pgoff)
+{
+ unsigned long address;
+
+ address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
+ VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma);
+ return address;
+}
+
/* Look up the first VMA which exactly match the interval vm_start ... vm_end */
static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
unsigned long vm_start, unsigned long vm_end)
--
2.35.1
next prev parent reply other threads:[~2022-02-27 12:08 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-27 12:07 [PATCH v11 0/8] fsdax: introduce fs query to support reflink Shiyang Ruan
2022-02-27 12:07 ` [PATCH v11 1/8] dax: Introduce holder for dax_device Shiyang Ruan
2022-03-11 23:35 ` Dan Williams
2022-03-16 13:46 ` Shiyang Ruan
2022-03-30 5:41 ` Christoph Hellwig
2022-03-30 10:03 ` Shiyang Ruan
2022-03-30 10:13 ` Christoph Hellwig
2022-03-30 10:58 ` Shiyang Ruan
2022-03-30 15:49 ` Christoph Hellwig
2022-03-30 16:18 ` Darrick J. Wong
2022-04-06 0:55 ` Jane Chu
2022-04-06 1:22 ` Dan Williams
2022-04-06 20:39 ` Darrick J. Wong
2022-04-08 1:38 ` Dan Williams
2022-04-08 5:59 ` Shiyang Ruan
2022-03-30 5:41 ` Christoph Hellwig
2022-02-27 12:07 ` [PATCH v11 2/8] mm: factor helpers for memory_failure_dev_pagemap Shiyang Ruan
2022-02-27 12:07 ` [PATCH v11 3/8] pagemap,pmem: Introduce ->memory_failure() Shiyang Ruan
2022-02-27 12:07 ` [PATCH v11 4/8] fsdax: Introduce dax_lock_mapping_entry() Shiyang Ruan
2022-02-27 12:07 ` Shiyang Ruan [this message]
2022-03-30 5:46 ` [PATCH v11 5/8] mm: move pgoff_address() to vma_pgoff_address() Christoph Hellwig
2022-03-30 6:49 ` Shiyang Ruan
2022-02-27 12:07 ` [PATCH v11 6/8] mm: Introduce mf_dax_kill_procs() for fsdax case Shiyang Ruan
2022-03-30 5:51 ` Christoph Hellwig
2022-02-27 12:07 ` [PATCH v11 7/8] xfs: Implement ->notify_failure() for XFS Shiyang Ruan
2022-02-27 14:05 ` kernel test robot
2022-02-27 15:36 ` kernel test robot
2022-02-27 15:46 ` kernel test robot
2022-03-30 6:00 ` Christoph Hellwig
2022-03-30 15:16 ` Shiyang Ruan
2022-03-30 15:52 ` Christoph Hellwig
2022-04-08 6:04 ` Shiyang Ruan
2022-04-08 6:26 ` Dan Williams
2022-04-08 6:25 ` Dan Williams
2022-02-27 12:07 ` [PATCH v11 8/8] fsdax: set a CoW flag when associate reflink mappings Shiyang Ruan
2022-02-27 15:57 ` kernel test robot
2022-03-10 13:08 ` [PATCH v11 0/8] fsdax: introduce fs query to support reflink Shiyang Ruan
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=20220227120747.711169-6-ruansy.fnst@fujitsu.com \
--to=ruansy.fnst@fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jane.chu@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
/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).