From patchwork Sat Jan 28 08:36:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9543177 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 A62DB60429 for ; Sat, 28 Jan 2017 10:58:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87327281C3 for ; Sat, 28 Jan 2017 10:58:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7939F28319; Sat, 28 Jan 2017 10:58:27 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFED8281C3 for ; Sat, 28 Jan 2017 10:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbdA1K60 (ORCPT ); Sat, 28 Jan 2017 05:58:26 -0500 Received: from mga04.intel.com ([192.55.52.120]:19230 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837AbdA1K6Z (ORCPT ); Sat, 28 Jan 2017 05:58:25 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP; 28 Jan 2017 00:40:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,300,1477983600"; d="scan'208";a="927605352" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.14]) by orsmga003.jf.intel.com with ESMTP; 28 Jan 2017 00:40:31 -0800 Subject: [RFC PATCH 04/17] dax: introduce dax_operations From: Dan Williams To: linux-nvdimm@lists.01.org Cc: snitzer@redhat.com, toshi.kani@hpe.com, mawilcox@microsoft.com, linux-block@vger.kernel.org, jmoyer@redhat.com, linux-fsdevel@vger.kernel.org, ross.zwisler@linux.intel.com, hch@lst.de Date: Sat, 28 Jan 2017 00:36:26 -0800 Message-ID: <148559258599.11180.15865082041593158216.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <148559256378.11180.8957776806175202312.stgit@dwillia2-desk3.amr.corp.intel.com> References: <148559256378.11180.8957776806175202312.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Track a set of dax_operations per dax_inode that can be set at alloc_dax_inode() time. These operations will be used to stop the abuse of block_device_operations for communicating dax capabilities to filesystems. It will also be used to replace the "pmem api" and move pmem-specific cache maintenance, and other dax-driver-specific filesystem-dax operations, to dax inode methods. In particular this allows us to stop abusing __copy_user_nocache(), via memcpy_to_pmem(), with a driver specific replacement. This is a standalone introduction of the operations. Follow on patches convert each dax-driver and teach fs/dax.c to use ->direct_access() from dax_operations instead of block_device_operations. Suggested-by: Christoph Hellwig Signed-off-by: Dan Williams --- drivers/dax/dax.h | 4 +++- drivers/dax/device.c | 6 +++++- drivers/dax/super.c | 6 +++++- include/linux/dax.h | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dax/dax.h b/drivers/dax/dax.h index f33c16ed2ec6..aeb1d49aafb8 100644 --- a/drivers/dax/dax.h +++ b/drivers/dax/dax.h @@ -13,7 +13,9 @@ #ifndef __DAX_H__ #define __DAX_H__ struct dax_inode; -struct dax_inode *alloc_dax_inode(void *private, const char *host); +struct dax_operations; +struct dax_inode *alloc_dax_inode(void *private, const char *host, + const struct dax_operations *ops); void put_dax_inode(struct dax_inode *dax_inode); bool dax_inode_alive(struct dax_inode *dax_inode); void kill_dax_inode(struct dax_inode *dax_inode); diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 6d0a3241a608..c3d9405ec285 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -560,7 +560,11 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, goto err_id; } - dax_inode = alloc_dax_inode(dax_dev, NULL); + /* + * No 'host' or dax_operations since there is no access to this + * device outside of mmap of the resulting character device. + */ + dax_inode = alloc_dax_inode(dax_dev, NULL, NULL); if (!dax_inode) goto err_inode; diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 7ac048f94b2b..eb844ffea3cf 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -17,6 +17,7 @@ #include #include #include +#include #include static int nr_dax = CONFIG_NR_DEV_DAX; @@ -61,6 +62,7 @@ struct dax_inode { const char *host; void *private; bool alive; + const struct dax_operations *ops; }; bool dax_inode_alive(struct dax_inode *dax_inode) @@ -204,7 +206,8 @@ static void dax_add_host(struct dax_inode *dax_inode, const char *host) spin_unlock(&dax_host_lock); } -struct dax_inode *alloc_dax_inode(void *private, const char *__host) +struct dax_inode *alloc_dax_inode(void *private, const char *__host, + const struct dax_operations *ops) { struct dax_inode *dax_inode; const char *host; @@ -225,6 +228,7 @@ struct dax_inode *alloc_dax_inode(void *private, const char *__host) goto err_inode; dax_add_host(dax_inode, host); + dax_inode->ops = ops; dax_inode->private = private; return dax_inode; diff --git a/include/linux/dax.h b/include/linux/dax.h index 8fe19230e118..def9a9d118c9 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -7,6 +7,11 @@ #include struct iomap_ops; +struct dax_inode; +struct dax_operations { + long (*direct_access)(struct dax_inode *, phys_addr_t, void **, + pfn_t *, long); +}; int dax_read_lock(void); void dax_read_unlock(int id);