From: Christoph Hellwig <hch@lst.de>
To: Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>
Cc: Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>,
Ira Weiny <ira.weiny@intel.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Vivek Goyal <vgoyal@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Miklos Szeredi <miklos@szeredi.hu>,
Matthew Wilcox <willy@infradead.org>,
dm-devel@redhat.com, nvdimm@lists.linux.dev,
linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH 5/5] dax: always use _copy_mc_to_iter in dax_copy_to_iter
Date: Thu, 9 Dec 2021 07:38:28 +0100 [thread overview]
Message-ID: <20211209063828.18944-6-hch@lst.de> (raw)
In-Reply-To: <20211209063828.18944-1-hch@lst.de>
While using the MC-safe copy routines is rather pointless on a virtual device
like virtiofs, it also isn't harmful at all. So just use _copy_mc_to_iter
unconditionally to simplify the code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/dax/super.c | 10 ----------
fs/fuse/virtio_fs.c | 1 -
include/linux/dax.h | 1 -
3 files changed, 12 deletions(-)
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index ff676a07480c8..fe783234ca669 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -107,8 +107,6 @@ enum dax_device_flags {
DAXDEV_SYNC,
/* do not use uncached operations to write data */
DAXDEV_CACHED,
- /* do not use mcsafe operations to read data */
- DAXDEV_NOMCSAFE,
};
/**
@@ -171,8 +169,6 @@ size_t dax_copy_to_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,
* via access_ok() in vfs_red, so use the 'no check' version to bypass
* the HARDENED_USERCOPY overhead.
*/
- if (test_bit(DAXDEV_NOMCSAFE, &dax_dev->flags))
- return _copy_to_iter(addr, bytes, i);
return _copy_mc_to_iter(addr, bytes, i);
}
@@ -242,12 +238,6 @@ void set_dax_cached(struct dax_device *dax_dev)
}
EXPORT_SYMBOL_GPL(set_dax_cached);
-void set_dax_nomcsafe(struct dax_device *dax_dev)
-{
- set_bit(DAXDEV_NOMCSAFE, &dax_dev->flags);
-}
-EXPORT_SYMBOL_GPL(set_dax_nomcsafe);
-
bool dax_alive(struct dax_device *dax_dev)
{
lockdep_assert_held(&dax_srcu);
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 754319ce2a29b..d9c20b148ac19 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -838,7 +838,6 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
if (IS_ERR(fs->dax_dev))
return PTR_ERR(fs->dax_dev);
set_dax_cached(fs->dax_dev);
- set_dax_nomcsafe(fs->dax_dev);
return devm_add_action_or_reset(&vdev->dev, virtio_fs_cleanup_dax,
fs->dax_dev);
}
diff --git a/include/linux/dax.h b/include/linux/dax.h
index d22cbf03d37d2..d267331bc37e7 100644
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -90,7 +90,6 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
#endif
void set_dax_cached(struct dax_device *dax_dev);
-void set_dax_nomcsafe(struct dax_device *dax_dev);
struct writeback_control;
#if defined(CONFIG_BLOCK) && defined(CONFIG_FS_DAX)
--
2.30.2
next prev parent reply other threads:[~2021-12-09 6:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 6:38 devirtualize kernel access to DAX Christoph Hellwig
2021-12-09 6:38 ` [PATCH 1/5] uio: remove copy_from_iter_flushcache() and copy_mc_to_iter() Christoph Hellwig
2021-12-12 14:22 ` Dan Williams
2021-12-13 8:27 ` Christoph Hellwig
2021-12-09 6:38 ` [PATCH 2/5] dax: simplify dax_synchronous and set_dax_synchronous Christoph Hellwig
2021-12-09 21:03 ` Pankaj Gupta
2021-12-12 14:23 ` Dan Williams
2021-12-09 6:38 ` [PATCH 3/5] dax: remove the DAXDEV_F_SYNC flag Christoph Hellwig
2021-12-12 14:24 ` Dan Williams
2021-12-13 8:40 ` Pankaj Gupta
2021-12-09 6:38 ` [PATCH 4/5] dax: remove the copy_from_iter and copy_to_iter methods Christoph Hellwig
2021-12-10 14:16 ` Vivek Goyal
2021-12-12 14:44 ` Dan Williams
2021-12-13 8:23 ` Christoph Hellwig
2021-12-14 14:22 ` Vivek Goyal
2021-12-14 16:41 ` Dan Williams
2021-12-14 20:32 ` Vivek Goyal
2021-12-14 23:43 ` Dan Williams
2021-12-15 15:52 ` Vivek Goyal
2021-12-15 16:46 ` Dan Williams
2021-12-15 10:30 ` Stefan Hajnoczi
2021-12-15 15:43 ` Vivek Goyal
2021-12-15 17:27 ` Stefan Hajnoczi
2021-12-13 16:17 ` Vivek Goyal
2021-12-12 14:39 ` Dan Williams
2021-12-13 8:24 ` Christoph Hellwig
2021-12-09 6:38 ` Christoph Hellwig [this message]
2021-12-10 14:05 ` [PATCH 5/5] dax: always use _copy_mc_to_iter in dax_copy_to_iter Vivek Goyal
2021-12-12 14:48 ` Dan Williams
2021-12-13 8:20 ` Christoph Hellwig
2021-12-13 16:43 ` Dan Williams
2021-12-14 13:59 ` Vivek Goyal
2021-12-12 15:03 ` Dan Williams
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=20211209063828.18944-6-hch@lst.de \
--to=hch@lst.de \
--cc=agk@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dm-devel@redhat.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=ira.weiny@intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=nvdimm@lists.linux.dev \
--cc=snitzer@redhat.com \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vishal.l.verma@intel.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: 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).