From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <linux-kernel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,
<linux-nvdimm@lists.01.org>, <linux-fsdevel@vger.kernel.org>
Cc: jack@suse.cz, darrick.wong@oracle.com, david@fromorbit.com,
ocfs2-devel@oss.oracle.com, viro@zeniv.linux.org.uk,
dan.j.williams@intel.com, linux-btrfs@vger.kernel.org
Subject: [Ocfs2-devel] [PATCH v2 03/10] fsdax: Output address in dax_iomap_pfn() and rename it
Date: Fri, 26 Feb 2021 08:20:23 +0800 [thread overview]
Message-ID: <20210226002030.653855-4-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20210226002030.653855-1-ruansy.fnst@fujitsu.com>
Add address output in dax_iomap_pfn() in order to perform a memcpy() in
CoW case. Since this function both output address and pfn, rename it to
dax_iomap_direct_access().
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/dax.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index 9dea1572868e..1459ef4095fb 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -997,8 +997,8 @@ static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)
return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9;
}
-static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size,
- pfn_t *pfnp)
+static int dax_iomap_direct_access(struct iomap *iomap, loff_t pos, size_t size,
+ void **kaddr, pfn_t *pfnp)
{
const sector_t sector = dax_iomap_sector(iomap, pos);
pgoff_t pgoff;
@@ -1010,11 +1010,13 @@ static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size,
return rc;
id = dax_read_lock();
length = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size),
- NULL, pfnp);
+ kaddr, pfnp);
if (length < 0) {
rc = length;
goto out;
}
+ if (!pfnp)
+ goto out_check_addr;
rc = -EINVAL;
if (PFN_PHYS(length) < size)
goto out;
@@ -1024,6 +1026,12 @@ static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size,
if (length > 1 && !pfn_t_devmap(*pfnp))
goto out;
rc = 0;
+
+out_check_addr:
+ if (!kaddr)
+ goto out;
+ if (!*kaddr)
+ rc = -EFAULT;
out:
dax_read_unlock(id);
return rc;
@@ -1357,7 +1365,7 @@ static vm_fault_t dax_fault_actor(struct vm_fault *vmf, pfn_t *pfnp,
return VM_FAULT_SIGBUS;
}
- err = dax_iomap_pfn(iomap, pos, size, &pfn);
+ err = dax_iomap_direct_access(iomap, pos, size, NULL, &pfn);
if (err)
goto error_fault;
--
2.30.1
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-02-26 16:55 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 0:20 [Ocfs2-devel] [PATCH v2 00/10] fsdax, xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 01/10] fsdax: Factor helpers to simplify dax fault code Shiyang Ruan
2021-03-03 9:13 ` Christoph Hellwig
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 02/10] fsdax: Factor helper: dax_fault_actor() Shiyang Ruan
2021-03-03 9:28 ` Christoph Hellwig
2021-03-12 9:01 ` ruansy.fnst
2021-02-26 0:20 ` Shiyang Ruan [this message]
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 05/10] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-03-03 9:30 ` Christoph Hellwig
2021-03-03 9:41 ` ruansy.fnst
2021-03-03 9:44 ` Christoph Hellwig
2021-03-03 9:48 ` Christoph Hellwig
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 08/10] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-02-26 8:28 ` Shiyang Ruan
2021-03-03 8:20 ` Joe Perches
2021-03-03 8:45 ` ruansy.fnst
2021-03-03 9:04 ` Joe Perches
2021-03-03 9:39 ` hch
2021-03-03 9:46 ` ruansy.fnst
2021-03-04 5:42 ` [Ocfs2-devel] [RESEND PATCH v2.1 " Shiyang Ruan
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 09/10] fs/xfs: Handle CoW for fsdax write() path Shiyang Ruan
2021-03-03 9:43 ` Christoph Hellwig
2021-03-03 9:57 ` ruansy.fnst
2021-03-03 10:43 ` Christoph Hellwig
2021-03-04 1:35 ` ruansy.fnst
2021-02-26 0:20 ` [Ocfs2-devel] [PATCH v2 10/10] fs/xfs: Add dedupe support for fsdax Shiyang Ruan
2021-02-26 9:45 ` [Ocfs2-devel] Question about the "EXPERIMENTAL" tag for dax in XFS ruansy.fnst
2021-02-26 19:04 ` Darrick J. Wong
2021-02-26 19:24 ` Dan Williams
2021-02-26 20:51 ` Dave Chinner
2021-02-26 20:59 ` Dan Williams
2021-02-26 21:27 ` Dave Chinner
2021-02-26 22:41 ` Dan Williams
2021-02-27 22:36 ` Dave Chinner
2021-02-27 23:40 ` Dan Williams
2021-02-28 22:38 ` Dave Chinner
2021-03-01 20:55 ` Dan Williams
2021-03-01 22:46 ` Dave Chinner
2021-03-02 0:32 ` Dan Williams
2021-03-02 2:42 ` Dave Chinner
2021-03-02 3:33 ` Dan Williams
2021-03-02 5:38 ` Dave Chinner
2021-03-02 5:50 ` Dan Williams
2021-03-02 3:28 ` Darrick J. Wong
2021-03-02 5:41 ` Dan Williams
2021-03-02 7:57 ` Dave Chinner
2021-03-02 17:49 ` Dan Williams
2021-03-04 23:40 ` Darrick J. Wong
2021-03-01 7:26 ` Yasunori Goto
2021-03-01 21:34 ` Dan Williams
[not found] ` <20210226002030.653855-5-ruansy.fnst@fujitsu.com>
2021-03-03 9:29 ` [Ocfs2-devel] [PATCH v2 04/10] fsdax: Introduce dax_iomap_cow_copy() Christoph Hellwig
[not found] ` <20210226002030.653855-7-ruansy.fnst@fujitsu.com>
2021-03-03 9:31 ` [Ocfs2-devel] [PATCH v2 06/10] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero Christoph Hellwig
[not found] ` <20210226002030.653855-8-ruansy.fnst@fujitsu.com>
2021-02-26 4:14 ` [Ocfs2-devel] [PATCH v2 07/10] iomap: Introduce iomap_apply2() for operations on two files Darrick J. Wong
2021-02-26 8:11 ` ruansy.fnst
2021-02-26 8:25 ` Shiyang Ruan
2021-03-04 5:41 ` [Ocfs2-devel] [RESEND PATCH v2.1 " Shiyang Ruan
2021-03-11 12:30 ` Christoph Hellwig
2021-03-09 6:36 ` [Ocfs2-devel] [PATCH v2 00/10] fsdax, xfs: Add reflink&dedupe support for fsdax Xiaoguang Wang
2021-03-10 1:32 ` ruansy.fnst
2021-03-09 16:19 ` Goldwyn Rodrigues
2021-03-10 1:26 ` ruansy.fnst
2021-03-10 12:30 ` Neal Gompa
2021-03-10 13:02 ` Matthew Wilcox
2021-03-10 13:36 ` Neal Gompa
2021-03-10 13:55 ` Matthew Wilcox
2021-03-10 14:21 ` Goldwyn Rodrigues
2021-03-10 14:26 ` Matthew Wilcox
2021-03-10 17:04 ` Goldwyn Rodrigues
2021-03-11 0:53 ` Dan Williams
2021-03-11 8:26 ` Neal Gompa
2021-03-13 13:07 ` Adam Borowski
2021-03-13 16:24 ` Neal Gompa
2021-03-13 22:00 ` Adam Borowski
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=20210226002030.653855-4-ruansy.fnst@fujitsu.com \
--to=ruansy.fnst@fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=jack@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=viro@zeniv.linux.org.uk \
/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).