From patchwork Tue Apr 3 20:36:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10321745 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E7CCC60390 for ; Tue, 3 Apr 2018 20:47:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D14BF28CD3 for ; Tue, 3 Apr 2018 20:47:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C616828CCC; Tue, 3 Apr 2018 20:47:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E77A928CC6 for ; Tue, 3 Apr 2018 20:47:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B13CD4E33B; Tue, 3 Apr 2018 20:47:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 357107F6C3; Tue, 3 Apr 2018 20:47:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A28B21800BB5; Tue, 3 Apr 2018 20:47:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w33Kl0Ye004811 for ; Tue, 3 Apr 2018 16:47:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5378081888; Tue, 3 Apr 2018 20:47:00 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D60C960240; Tue, 3 Apr 2018 20:46:53 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1DF9549028; Tue, 3 Apr 2018 20:46:52 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2018 13:46:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,402,1517904000"; d="scan'208";a="217360717" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga005.fm.intel.com with ESMTP; 03 Apr 2018 13:46:51 -0700 From: Dan Williams To: snitzer@redhat.com Date: Tue, 03 Apr 2018 13:36:55 -0700 Message-ID: <152278769715.7139.9560094354006725491.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: References: User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 03 Apr 2018 20:46:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 03 Apr 2018 20:46:52 +0000 (UTC) for IP:'192.55.52.88' DOMAIN:'mga01.intel.com' HELO:'mga01.intel.com' FROM:'dan.j.williams@intel.com' RCPT:'' X-RedHat-Spam-Score: -5.011 (RCVD_IN_DNSWL_HI, SPF_PASS, T_RP_MATCHES_RCVD) 192.55.52.88 mga01.intel.com 192.55.52.88 mga01.intel.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: Jan Kara , Matthew Wilcox , linux-nvdimm@lists.01.org, dm-devel@redhat.com, =?utf-8?b?SsOpcsO0bWU=?= Glisse , linux-fsdevel@vger.kernel.org, Ross Zwisler , Christoph Hellwig , Alasdair Kergon Subject: [dm-devel] [PATCH v9] dax, dm: introduce ->fs_{claim, release}() dax_device infrastructure X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 03 Apr 2018 20:47:04 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP In preparation for allowing filesystems to augment the dev_pagemap associated with a dax_device, add an ->fs_claim() callback. The ->fs_claim() callback is leveraged by the device-mapper dax implementation to iterate all member devices in the map and repeat the claim operation across the array. In order to resolve collisions between filesystem operations and DMA to DAX mapped pages we need a callback when DMA completes. With a callback we can hold off filesystem operations while DMA is in-flight and then resume those operations when the last put_page() occurs on a DMA page. The ->fs_claim() operation arranges for this callback to be registered, although that implementation is saved for a later patch. Cc: Alasdair Kergon Cc: Mike Snitzer Cc: Matthew Wilcox Cc: Ross Zwisler Cc: "Jérôme Glisse" Cc: Christoph Hellwig Cc: Jan Kara Signed-off-by: Dan Williams Acked-by: Mike Snitzer --- Changes since v8: * make __fs_dax_claim and __fs_dax_release private to drivers/dax/super.c * rename dm_dax_iterate to dm_dax_interate_devices (Mike) * drop the return value from dm_dax_interate_devices since nothing uses it (Mike) drivers/dax/super.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/md/dm.c | 57 +++++++++++++++++++++++++++++++++++ include/linux/dax.h | 48 ++++++++++++++++++++++++++++++ include/linux/memremap.h | 8 +++++ 4 files changed, 187 insertions(+) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 2b2332b605e4..c45ded5e93e7 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -29,6 +29,7 @@ static struct vfsmount *dax_mnt; static DEFINE_IDA(dax_minor_ida); static struct kmem_cache *dax_cache __read_mostly; static struct super_block *dax_superblock __read_mostly; +static DEFINE_MUTEX(devmap_lock); #define DAX_HASH_SIZE (PAGE_SIZE / sizeof(struct hlist_head)) static struct hlist_head dax_host_list[DAX_HASH_SIZE]; @@ -169,9 +170,82 @@ struct dax_device { const char *host; void *private; unsigned long flags; + struct dev_pagemap *pgmap; const struct dax_operations *ops; }; +#if IS_ENABLED(CONFIG_FS_DAX) +static void generic_dax_pagefree(struct page *page, void *data) +{ + /* TODO: wakeup page-idle waiters */ +} + +static struct dax_device *__fs_dax_claim(struct dax_device *dax_dev, + void *owner) +{ + struct dev_pagemap *pgmap; + + if (!dax_dev->pgmap) + return dax_dev; + pgmap = dax_dev->pgmap; + + mutex_lock(&devmap_lock); + if (pgmap->data && pgmap->data == owner) { + /* dm might try to claim the same device more than once... */ + mutex_unlock(&devmap_lock); + return dax_dev; + } else if (pgmap->page_free || pgmap->page_fault + || pgmap->type != MEMORY_DEVICE_HOST) { + put_dax(dax_dev); + mutex_unlock(&devmap_lock); + return NULL; + } + + pgmap->type = MEMORY_DEVICE_FS_DAX; + pgmap->page_free = generic_dax_pagefree; + pgmap->data = owner; + mutex_unlock(&devmap_lock); + + return dax_dev; +} + +struct dax_device *fs_dax_claim(struct dax_device *dax_dev, void *owner) +{ + if (dax_dev->ops->fs_claim) + return dax_dev->ops->fs_claim(dax_dev, owner); + else + return __fs_dax_claim(dax_dev, owner); +} +EXPORT_SYMBOL_GPL(fs_dax_claim); + +static void __fs_dax_release(struct dax_device *dax_dev, void *owner) +{ + struct dev_pagemap *pgmap = dax_dev ? dax_dev->pgmap : NULL; + + put_dax(dax_dev); + if (!pgmap) + return; + if (!pgmap->data) + return; + + mutex_lock(&devmap_lock); + WARN_ON(pgmap->data != owner); + pgmap->type = MEMORY_DEVICE_HOST; + pgmap->page_free = NULL; + pgmap->data = NULL; + mutex_unlock(&devmap_lock); +} + +void fs_dax_release(struct dax_device *dax_dev, void *owner) +{ + if (dax_dev->ops->fs_release) + dax_dev->ops->fs_release(dax_dev, owner); + else + __fs_dax_release(dax_dev, owner); +} +EXPORT_SYMBOL_GPL(fs_dax_release); +#endif + static ssize_t write_cache_show(struct device *dev, struct device_attribute *attr, char *buf) { diff --git a/drivers/md/dm.c b/drivers/md/dm.c index ffc93aecc02a..cb8ddeb3373f 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1090,6 +1090,61 @@ static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, return ret; } +static int dm_dax_dev_claim(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *owner) +{ + if (fs_dax_claim(dev->dax_dev, owner)) + return 0; + /* + * Outside of a kernel bug there is no reason a dax_dev should + * fail a claim attempt. Device-mapper should have exclusive + * ownership of the dm_dev and the filesystem should have + * exclusive ownership of the dm_target. + */ + WARN_ON_ONCE(1); + return -ENXIO; +} + +static int dm_dax_dev_release(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *owner) +{ + fs_dax_release(dev->dax_dev, owner); + return 0; +} + +static void dm_dax_iterate_devices(struct dax_device *dax_dev, + iterate_devices_callout_fn fn, void *arg) +{ + struct mapped_device *md = dax_get_private(dax_dev); + struct dm_table *map; + struct dm_target *ti; + int i, srcu_idx; + + map = dm_get_live_table(md, &srcu_idx); + + for (i = 0; i < dm_table_get_num_targets(map); i++) { + ti = dm_table_get_target(map, i); + + if (ti->type->iterate_devices) + ti->type->iterate_devices(ti, fn, arg); + } + + dm_put_live_table(md, srcu_idx); +} + +static struct dax_device *dm_dax_fs_claim(struct dax_device *dax_dev, + void *owner) +{ + dm_dax_iterate_devices(dax_dev, dm_dax_dev_claim, owner); + /* see comment in dm_dax_dev_claim about this unconditional return */ + return dax_dev; +} + +static void dm_dax_fs_release(struct dax_device *dax_dev, void *owner) +{ + dm_dax_iterate_devices(dax_dev, dm_dax_dev_release, owner); +} + /* * A target may call dm_accept_partial_bio only from the map routine. It is * allowed for all bio types except REQ_PREFLUSH and REQ_OP_ZONE_RESET. @@ -3111,6 +3166,8 @@ static const struct block_device_operations dm_blk_dops = { static const struct dax_operations dm_dax_ops = { .direct_access = dm_dax_direct_access, .copy_from_iter = dm_dax_copy_from_iter, + .fs_claim = dm_dax_fs_claim, + .fs_release = dm_dax_fs_release, }; /* diff --git a/include/linux/dax.h b/include/linux/dax.h index f9eb22ad341e..af02f93c943a 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -20,6 +21,10 @@ struct dax_operations { /* copy_from_iter: required operation for fs-dax direct-i/o */ size_t (*copy_from_iter)(struct dax_device *, pgoff_t, void *, size_t, struct iov_iter *); + /* fs_claim: setup filesytem parameters for the device's dev_pagemap */ + struct dax_device *(*fs_claim)(struct dax_device *, void *); + /* fs_release: restore device's dev_pagemap to its default state */ + void (*fs_release)(struct dax_device *, void *); }; extern struct attribute_group dax_attribute_group; @@ -83,6 +88,26 @@ static inline void fs_put_dax(struct dax_device *dax_dev) struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev); int dax_writeback_mapping_range(struct address_space *mapping, struct block_device *bdev, struct writeback_control *wbc); +struct dax_device *fs_dax_claim(struct dax_device *dax_dev, void *owner); +#ifdef CONFIG_BLOCK +static inline struct dax_device *fs_dax_claim_bdev(struct block_device *bdev, + void *owner) +{ + struct dax_device *dax_dev; + + if (!blk_queue_dax(bdev->bd_queue)) + return NULL; + dax_dev = fs_dax_get_by_host(bdev->bd_disk->disk_name); + return fs_dax_claim(dax_dev, owner); +} +#else +static inline struct dax_device *fs_dax_claim_bdev(struct block_device *bdev, + void *owner) +{ + return NULL; +} +#endif +void fs_dax_release(struct dax_device *dax_dev, void *owner); #else static inline int bdev_dax_supported(struct super_block *sb, int blocksize) { @@ -108,6 +133,29 @@ static inline int dax_writeback_mapping_range(struct address_space *mapping, { return -EOPNOTSUPP; } + +static inline struct dax_device *fs_dax_claim(struct dax_device *dax_dev, + void *owner) +{ + return NULL; +} + +#ifdef CONFIG_BLOCK +static inline struct dax_device *fs_dax_claim_bdev(struct block_device *bdev, + void *owner) +{ + return fs_dax_get_by_host(bdev->bd_disk->disk_name); +} +#else +static inline struct dax_device *fs_dax_claim_bdev(struct block_device *bdev, + void *owner) +{ + return NULL; +} +#endif +static inline void fs_dax_release(struct dax_device *dax_dev, void *owner) +{ +} #endif int dax_read_lock(void); diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7b4899c06f49..02d6d042ee7f 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -53,11 +53,19 @@ struct vmem_altmap { * driver can hotplug the device memory using ZONE_DEVICE and with that memory * type. Any page of a process can be migrated to such memory. However no one * should be allow to pin such memory so that it can always be evicted. + * + * MEMORY_DEVICE_FS_DAX: + * When MEMORY_DEVICE_HOST memory is represented by a device that can + * host a filesystem, for example /dev/pmem0, that filesystem can + * register for a callback when a page is idled. For the filesystem-dax + * case page idle callbacks are used to coordinate DMA vs + * hole-punch/truncate. */ enum memory_type { MEMORY_DEVICE_HOST = 0, MEMORY_DEVICE_PRIVATE, MEMORY_DEVICE_PUBLIC, + MEMORY_DEVICE_FS_DAX, }; /*