From: Dan Williams <dan.j.williams@intel.com> To: linux-nvdimm@lists.01.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 16/33] block, dax: convert bdev_dax_supported() to dax_direct_access() Date: Fri, 14 Apr 2017 19:34:32 -0700 [thread overview] Message-ID: <149222367263.32363.14488170568085010560.stgit@dwillia2-desk3.amr.corp.intel.com> (raw) In-Reply-To: <149222358726.32363.15876405696577002849.stgit@dwillia2-desk3.amr.corp.intel.com> Kill of the final user of bdev_direct_access() and struct blk_dax_ctl. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- fs/block_dev.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index 2f7885712575..ecbdc8f9f718 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -788,35 +788,43 @@ EXPORT_SYMBOL(bdev_dax_pgoff); */ int bdev_dax_supported(struct super_block *sb, int blocksize) { - struct blk_dax_ctl dax = { - .sector = 0, - .size = PAGE_SIZE, - }; - int err; + struct block_device *bdev = sb->s_bdev; + struct dax_device *dax_dev; + pgoff_t pgoff; + int err, id; + void *kaddr; + pfn_t pfn; + long len; if (blocksize != PAGE_SIZE) { vfs_msg(sb, KERN_ERR, "error: unsupported blocksize for dax"); return -EINVAL; } - err = bdev_direct_access(sb->s_bdev, &dax); - if (err < 0) { - switch (err) { - case -EOPNOTSUPP: - vfs_msg(sb, KERN_ERR, - "error: device does not support dax"); - break; - case -EINVAL: - vfs_msg(sb, KERN_ERR, - "error: unaligned partition for dax"); - break; - default: - vfs_msg(sb, KERN_ERR, - "error: dax access failed (%d)", err); - } + err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff); + if (err) { + vfs_msg(sb, KERN_ERR, "error: unaligned partition for dax"); return err; } + dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); + if (!dax_dev) { + vfs_msg(sb, KERN_ERR, "error: device does not support dax"); + return -EOPNOTSUPP; + } + + id = dax_read_lock(); + len = dax_direct_access(dax_dev, pgoff, 1, &kaddr, &pfn); + dax_read_unlock(id); + + put_dax(dax_dev); + + if (len < 1) { + vfs_msg(sb, KERN_ERR, + "error: dax access failed (%d)", len); + return len < 0 ? len : -EIO; + } + return 0; } EXPORT_SYMBOL_GPL(bdev_dax_supported); _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Dan Williams <dan.j.williams@intel.com> To: linux-nvdimm@ml01.01.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 16/33] block, dax: convert bdev_dax_supported() to dax_direct_access() Date: Fri, 14 Apr 2017 19:34:32 -0700 [thread overview] Message-ID: <149222367263.32363.14488170568085010560.stgit@dwillia2-desk3.amr.corp.intel.com> (raw) In-Reply-To: <149222358726.32363.15876405696577002849.stgit@dwillia2-desk3.amr.corp.intel.com> Kill of the final user of bdev_direct_access() and struct blk_dax_ctl. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- fs/block_dev.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index 2f7885712575..ecbdc8f9f718 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -788,35 +788,43 @@ EXPORT_SYMBOL(bdev_dax_pgoff); */ int bdev_dax_supported(struct super_block *sb, int blocksize) { - struct blk_dax_ctl dax = { - .sector = 0, - .size = PAGE_SIZE, - }; - int err; + struct block_device *bdev = sb->s_bdev; + struct dax_device *dax_dev; + pgoff_t pgoff; + int err, id; + void *kaddr; + pfn_t pfn; + long len; if (blocksize != PAGE_SIZE) { vfs_msg(sb, KERN_ERR, "error: unsupported blocksize for dax"); return -EINVAL; } - err = bdev_direct_access(sb->s_bdev, &dax); - if (err < 0) { - switch (err) { - case -EOPNOTSUPP: - vfs_msg(sb, KERN_ERR, - "error: device does not support dax"); - break; - case -EINVAL: - vfs_msg(sb, KERN_ERR, - "error: unaligned partition for dax"); - break; - default: - vfs_msg(sb, KERN_ERR, - "error: dax access failed (%d)", err); - } + err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff); + if (err) { + vfs_msg(sb, KERN_ERR, "error: unaligned partition for dax"); return err; } + dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); + if (!dax_dev) { + vfs_msg(sb, KERN_ERR, "error: device does not support dax"); + return -EOPNOTSUPP; + } + + id = dax_read_lock(); + len = dax_direct_access(dax_dev, pgoff, 1, &kaddr, &pfn); + dax_read_unlock(id); + + put_dax(dax_dev); + + if (len < 1) { + vfs_msg(sb, KERN_ERR, + "error: dax access failed (%d)", len); + return len < 0 ? len : -EIO; + } + return 0; } EXPORT_SYMBOL_GPL(bdev_dax_supported);
next prev parent reply other threads:[~2017-04-15 2:40 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-15 2:33 [PATCH v2 00/33] dax: introduce dax_operations Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 01/33] device-dax: rename 'dax_dev' to 'dev_dax' Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 02/33] dax: refactor dax-fs into a generic provider of 'struct dax_device' instances Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 03/33] dax: add a facility to lookup a dax device by 'host' device name Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 04/33] dax: introduce dax_operations Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 05/33] pmem: add dax_operations support Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 06/33] axon_ram: " Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 07/33] brd: " Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 08/33] dcssblk: " Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:33 ` [PATCH v2 09/33] block: kill bdev_dax_capable() Dan Williams 2017-04-15 2:33 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 10/33] dax: introduce dax_direct_access() Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 11/33] dm: add dax_device and dax_operations support Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 15:17 ` Dan Williams 2017-04-15 15:17 ` Dan Williams 2017-04-15 15:17 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 12/33] dm: teach dm-targets to use a dax_device + dax_operations Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 13/33] ext2, ext4, xfs: retrieve dax_device for iomap operations Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 14/33] Revert "block: use DAX for partition table reads" Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 15/33] filesystem-dax: convert to dax_direct_access() Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` Dan Williams [this message] 2017-04-15 2:34 ` [PATCH v2 16/33] block, dax: convert bdev_dax_supported() " Dan Williams 2017-04-15 2:34 ` [PATCH v2 17/33] block: remove block_device_operations ->direct_access() Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 18/33] x86, dax, pmem: remove indirection around memcpy_from_pmem() Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 19/33] dax, pmem: introduce 'copy_from_iter' dax operation Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 20/33] dm: add ->copy_from_iter() dax operation support Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:34 ` [PATCH v2 21/33] filesystem-dax: convert to dax_copy_from_iter() Dan Williams 2017-04-15 2:34 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 22/33] dax, pmem: introduce an optional 'flush' dax_operation Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 23/33] dm: add ->flush() dax operation support Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 24/33] filesystem-dax: convert to dax_flush() Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 25/33] x86, dax: replace clear_pmem() with open coded memset + dax_ops->flush Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 26/33] x86, dax, libnvdimm: move wb_cache_pmem() to libnvdimm Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 27/33] x86, libnvdimm, pmem: move arch_invalidate_pmem() " Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 28/33] x86, libnvdimm, dax: stop abusing __copy_user_nocache Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 29/33] uio, libnvdimm, pmem: implement cache bypass for all copy_from_iter() operations Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-24 15:04 ` Jan Kara 2017-04-24 15:04 ` Jan Kara 2017-04-15 2:35 ` [PATCH v2 30/33] libnvdimm, pmem: fix persistence warning Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 31/33] libnvdimm, nfit: enable support for volatile ranges Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:35 ` [PATCH v2 32/33] filesystem-dax: gate calls to dax_flush() on QUEUE_FLAG_WC Dan Williams 2017-04-15 2:35 ` Dan Williams 2017-04-15 2:36 ` [PATCH v2 33/33] libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region Dan Williams 2017-04-15 2:36 ` 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=149222367263.32363.14488170568085010560.stgit@dwillia2-desk3.amr.corp.intel.com \ --to=dan.j.williams@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.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.