pnfsblock: add blocklayout Kconfig option, Makefile, and stubs

Define a configuration variable to enable/disable compilation of the block driver code. Add the minimal structure for a pnfs block layout driver, and empty list-heads that will hold the extent data [pnfsblock: make NFS_V4_1 select PNFS_BLOCK] Signed-off-by: Peng Tao <peng_tao@emc.com> Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [pnfs-block: fix CONFIG_PNFS_BLOCK dependencies] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: SQUASHME: adjust to API change] Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> [pnfs: move pnfs_layout_type inline in nfs_inode] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [blocklayout: encode_layoutcommit implementation] Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: layout alloc and free] Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> [pnfs: move pnfs_layout_type inline in nfs_inode] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: define module alias] Signed-off-by: Peng Tao <peng_tao@emc.com> [rm inode and pnfs_layout_hdr args from cleanup_layoutcommit()] Signed-off-by: Jim Rees <rees@umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

pnfsblock: add blocklayout Kconfig option, Makefile, and stubs
Define a configuration variable to enable/disable compilation of the block driver code. Add the minimal structure for a pnfs block layout driver, and empty list-heads that will hold the extent data [pnfsblock: make NFS_V4_1 select PNFS_BLOCK] Signed-off-by: Peng Tao <peng_tao@emc.com> Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [pnfs-block: fix CONFIG_PNFS_BLOCK dependencies] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: SQUASHME: adjust to API change] Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> [pnfs: move pnfs_layout_type inline in nfs_inode] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [blocklayout: encode_layoutcommit implementation] Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: layout alloc and free] Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> [pnfs: move pnfs_layout_type inline in nfs_inode] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Benny Halevy <bhalevy@tonian.com> [pnfsblock: define module alias] Signed-off-by: Peng Tao <peng_tao@emc.com> [rm inode and pnfs_layout_hdr args from cleanup_layoutcommit()] Signed-off-by: Jim Rees <rees@umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Fred Isaman · Trond Myklebust
1 parent db29c08909
Showing 5 changed files with 278 additions and 1 deletions Side-by-side Diff
fs/nfs/Kconfig
fs/nfs/Makefile
fs/nfs/blocklayout/Makefile
fs/nfs/blocklayout/blocklayout.c
fs/nfs/blocklayout/blocklayout.h
@@ -79,13 +79,19 @@
 	depends on NFS_FS && NFS_V4 && EXPERIMENTAL
 	select SUNRPC_BACKCHANNEL
 	select PNFS_FILE_LAYOUT
+	select PNFS_BLOCK
+	select MD
+	select BLK_DEV_DM
 	help
 	  This option enables support for minor version 1 of the NFSv4 protocol
-	  (RFC 5661) in the kernel's NFS client.
+	  (RFC 5661 and RFC 5663) in the kernel's NFS client.
  
 	  If unsure, say N.
  
 config PNFS_FILE_LAYOUT
+	tristate
+
+config PNFS_BLOCK
 	tristate
  
 config PNFS_OBJLAYOUT
@@ -23,4 +23,5 @@
 nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o
  
 obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/
+obj-$(CONFIG_PNFS_BLOCK) += blocklayout/
+#
+# Makefile for the pNFS block layout driver kernel module
+#
+obj-$(CONFIG_PNFS_BLOCK) += blocklayoutdriver.o
+blocklayoutdriver-objs := blocklayout.o
+/*
+ *  linux/fs/nfs/blocklayout/blocklayout.c
+ *
+ *  Module for the NFSv4.1 pNFS block layout driver.
+ *
+ *  Copyright (c) 2006 The Regents of the University of Michigan.
+ *  All rights reserved.
+ *
+ *  Andy Adamson <andros@citi.umich.edu>
+ *  Fred Isaman <iisaman@umich.edu>
+ *
+ * permission is granted to use, copy, create derivative works and
+ * redistribute this software and such derivative works for any purpose,
+ * so long as the name of the university of michigan is not used in
+ * any advertising or publicity pertaining to the use or distribution
+ * of this software without specific, written prior authorization.  if
+ * the above copyright notice or any other identification of the
+ * university of michigan is included in any copy of any portion of
+ * this software, then the disclaimer below must also be included.
+ *
+ * this software is provided as is, without representation from the
+ * university of michigan as to its fitness for any purpose, and without
+ * warranty by the university of michigan of any kind, either express
+ * or implied, including without limitation the implied warranties of
+ * merchantability and fitness for a particular purpose.  the regents
+ * of the university of michigan shall not be liable for any damages,
+ * including special, indirect, incidental, or consequential damages,
+ * with respect to any claim arising out or in connection with the use
+ * of the software, even if it has been or is hereafter advised of the
+ * possibility of such damages.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+
+#include "blocklayout.h"
+
+#define NFSDBG_FACILITY	NFSDBG_PNFS_LD
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andy Adamson <andros@citi.umich.edu>");
+MODULE_DESCRIPTION("The NFSv4.1 pNFS Block layout driver");
+
+static enum pnfs_try_status
+bl_read_pagelist(struct nfs_read_data *rdata)
+{
+	return PNFS_NOT_ATTEMPTED;
+}
+
+static enum pnfs_try_status
+bl_write_pagelist(struct nfs_write_data *wdata,
+		  int sync)
+{
+	return PNFS_NOT_ATTEMPTED;
+}
+
+/* STUB */
+static void
+release_extents(struct pnfs_block_layout *bl,
+		struct pnfs_layout_range *range)
+{
+	return;
+}
+
+/* STUB */
+static void
+release_inval_marks(struct pnfs_inval_markings *marks)
+{
+	return;
+}
+
+static void bl_free_layout_hdr(struct pnfs_layout_hdr *lo)
+{
+	struct pnfs_block_layout *bl = BLK_LO2EXT(lo);
+
+	dprintk("%s enter\n", __func__);
+	release_extents(bl, NULL);
+	release_inval_marks(&bl->bl_inval);
+	kfree(bl);
+}
+
+static struct pnfs_layout_hdr *bl_alloc_layout_hdr(struct inode *inode,
+						   gfp_t gfp_flags)
+{
+	struct pnfs_block_layout *bl;
+
+	dprintk("%s enter\n", __func__);
+	bl = kzalloc(sizeof(*bl), gfp_flags);
+	if (!bl)
+		return NULL;
+	spin_lock_init(&bl->bl_ext_lock);
+	INIT_LIST_HEAD(&bl->bl_extents[0]);
+	INIT_LIST_HEAD(&bl->bl_extents[1]);
+	INIT_LIST_HEAD(&bl->bl_commit);
+	INIT_LIST_HEAD(&bl->bl_committing);
+	bl->bl_count = 0;
+	bl->bl_blocksize = NFS_SERVER(inode)->pnfs_blksize >> SECTOR_SHIFT;
+	BL_INIT_INVAL_MARKS(&bl->bl_inval, bl->bl_blocksize);
+	return &bl->bl_layout;
+}
+
+static void
+bl_free_lseg(struct pnfs_layout_segment *lseg)
+{
+}
+
+static struct pnfs_layout_segment *
+bl_alloc_lseg(struct pnfs_layout_hdr *lo,
+	      struct nfs4_layoutget_res *lgr, gfp_t gfp_flags)
+{
+	return NULL;
+}
+
+static void
+bl_encode_layoutcommit(struct pnfs_layout_hdr *lo, struct xdr_stream *xdr,
+		       const struct nfs4_layoutcommit_args *arg)
+{
+}
+
+static void
+bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata)
+{
+}
+
+static int
+bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh)
+{
+	dprintk("%s enter\n", __func__);
+	return 0;
+}
+
+static int
+bl_clear_layoutdriver(struct nfs_server *server)
+{
+	dprintk("%s enter\n", __func__);
+	return 0;
+}
+
+static struct pnfs_layoutdriver_type blocklayout_type = {
+	.id				= LAYOUT_BLOCK_VOLUME,
+	.name				= "LAYOUT_BLOCK_VOLUME",
+	.read_pagelist			= bl_read_pagelist,
+	.write_pagelist			= bl_write_pagelist,
+	.alloc_layout_hdr		= bl_alloc_layout_hdr,
+	.free_layout_hdr		= bl_free_layout_hdr,
+	.alloc_lseg			= bl_alloc_lseg,
+	.free_lseg			= bl_free_lseg,
+	.encode_layoutcommit		= bl_encode_layoutcommit,
+	.cleanup_layoutcommit		= bl_cleanup_layoutcommit,
+	.set_layoutdriver		= bl_set_layoutdriver,
+	.clear_layoutdriver		= bl_clear_layoutdriver,
+};
+
+static int __init nfs4blocklayout_init(void)
+{
+	int ret;
+
+	dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
+
+	ret = pnfs_register_layoutdriver(&blocklayout_type);
+	return ret;
+}
+
+static void __exit nfs4blocklayout_exit(void)
+{
+	dprintk("%s: NFSv4 Block Layout Driver Unregistering...\n",
+	       __func__);
+
+	pnfs_unregister_layoutdriver(&blocklayout_type);
+}
+
+MODULE_ALIAS("nfs-layouttype4-3");
+
+module_init(nfs4blocklayout_init);
+module_exit(nfs4blocklayout_exit);
+/*
+ *  linux/fs/nfs/blocklayout/blocklayout.h
+ *
+ *  Module for the NFSv4.1 pNFS block layout driver.
+ *
+ *  Copyright (c) 2006 The Regents of the University of Michigan.
+ *  All rights reserved.
+ *
+ *  Andy Adamson <andros@citi.umich.edu>
+ *  Fred Isaman <iisaman@umich.edu>
+ *
+ * permission is granted to use, copy, create derivative works and
+ * redistribute this software and such derivative works for any purpose,
+ * so long as the name of the university of michigan is not used in
+ * any advertising or publicity pertaining to the use or distribution
+ * of this software without specific, written prior authorization.  if
+ * the above copyright notice or any other identification of the
+ * university of michigan is included in any copy of any portion of
+ * this software, then the disclaimer below must also be included.
+ *
+ * this software is provided as is, without representation from the
+ * university of michigan as to its fitness for any purpose, and without
+ * warranty by the university of michigan of any kind, either express
+ * or implied, including without limitation the implied warranties of
+ * merchantability and fitness for a particular purpose.  the regents
+ * of the university of michigan shall not be liable for any damages,
+ * including special, indirect, incidental, or consequential damages,
+ * with respect to any claim arising out or in connection with the use
+ * of the software, even if it has been or is hereafter advised of the
+ * possibility of such damages.
+ */
+#ifndef FS_NFS_NFS4BLOCKLAYOUT_H
+#define FS_NFS_NFS4BLOCKLAYOUT_H
+
+#include <linux/device-mapper.h>
+#include <linux/nfs_fs.h>
+#include "../pnfs.h"
+
+enum exstate4 {
+	PNFS_BLOCK_READWRITE_DATA	= 0,
+	PNFS_BLOCK_READ_DATA		= 1,
+	PNFS_BLOCK_INVALID_DATA		= 2, /* mapped, but data is invalid */
+	PNFS_BLOCK_NONE_DATA		= 3  /* unmapped, it's a hole */
+};
+
+struct pnfs_inval_markings {
+	/* STUB */
+};
+
+/* sector_t fields are all in 512-byte sectors */
+struct pnfs_block_extent {
+	struct kref	be_refcnt;
+	struct list_head be_node;	/* link into lseg list */
+	struct nfs4_deviceid be_devid;  /* FIXME: could use device cache instead */
+	struct block_device *be_mdev;
+	sector_t	be_f_offset;	/* the starting offset in the file */
+	sector_t	be_length;	/* the size of the extent */
+	sector_t	be_v_offset;	/* the starting offset in the volume */
+	enum exstate4	be_state;	/* the state of this extent */
+	struct pnfs_inval_markings *be_inval; /* tracks INVAL->RW transition */
+};
+
+static inline void
+BL_INIT_INVAL_MARKS(struct pnfs_inval_markings *marks, sector_t blocksize)
+{
+	/* STUB */
+}
+
+enum extentclass4 {
+	RW_EXTENT       = 0, /* READWRTE and INVAL */
+	RO_EXTENT       = 1, /* READ and NONE */
+	EXTENT_LISTS    = 2,
+};
+
+struct pnfs_block_layout {
+	struct pnfs_layout_hdr bl_layout;
+	struct pnfs_inval_markings bl_inval; /* tracks INVAL->RW transition */
+	spinlock_t		bl_ext_lock;   /* Protects list manipulation */
+	struct list_head	bl_extents[EXTENT_LISTS]; /* R and RW extents */
+	struct list_head	bl_commit;	/* Needs layout commit */
+	struct list_head	bl_committing;	/* Layout committing */
+	unsigned int		bl_count;	/* entries in bl_commit */
+	sector_t		bl_blocksize;  /* Server blocksize in sectors */
+};
+
+static inline struct pnfs_block_layout *BLK_LO2EXT(struct pnfs_layout_hdr *lo)
+{
+	return container_of(lo, struct pnfs_block_layout, bl_layout);
+}
+
+#endif /* FS_NFS_NFS4BLOCKLAYOUT_H */
...	...	@@ -79,13 +79,19 @@
79	79	depends on NFS_FS && NFS_V4 && EXPERIMENTAL
80	80	select SUNRPC_BACKCHANNEL
81	81	select PNFS_FILE_LAYOUT
	82	+ select PNFS_BLOCK
	83	+ select MD
	84	+ select BLK_DEV_DM
82	85	help
83	86	This option enables support for minor version 1 of the NFSv4 protocol
84		- (RFC 5661) in the kernel's NFS client.
	87	+ (RFC 5661 and RFC 5663) in the kernel's NFS client.
85	88
86	89	If unsure, say N.
87	90
88	91	config PNFS_FILE_LAYOUT
	92	+ tristate
	93	+
	94	+config PNFS_BLOCK
89	95	tristate
90	96
91	97	config PNFS_OBJLAYOUT
...	...	@@ -23,4 +23,5 @@
23	23	nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o
24	24
25	25	obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/
	26	+obj-$(CONFIG_PNFS_BLOCK) += blocklayout/
	1	+#
	2	+# Makefile for the pNFS block layout driver kernel module
	3	+#
	4	+obj-$(CONFIG_PNFS_BLOCK) += blocklayoutdriver.o
	5	+blocklayoutdriver-objs := blocklayout.o
	1	+/*
	2	+ * linux/fs/nfs/blocklayout/blocklayout.c
	3	+ *
	4	+ * Module for the NFSv4.1 pNFS block layout driver.
	5	+ *
	6	+ * Copyright (c) 2006 The Regents of the University of Michigan.
	7	+ * All rights reserved.
	8	+ *
	9	+ * Andy Adamson <andros@citi.umich.edu>
	10	+ * Fred Isaman <iisaman@umich.edu>
	11	+ *
	12	+ * permission is granted to use, copy, create derivative works and
	13	+ * redistribute this software and such derivative works for any purpose,
	14	+ * so long as the name of the university of michigan is not used in
	15	+ * any advertising or publicity pertaining to the use or distribution
	16	+ * of this software without specific, written prior authorization. if
	17	+ * the above copyright notice or any other identification of the
	18	+ * university of michigan is included in any copy of any portion of
	19	+ * this software, then the disclaimer below must also be included.
	20	+ *
	21	+ * this software is provided as is, without representation from the
	22	+ * university of michigan as to its fitness for any purpose, and without
	23	+ * warranty by the university of michigan of any kind, either express
	24	+ * or implied, including without limitation the implied warranties of
	25	+ * merchantability and fitness for a particular purpose. the regents
	26	+ * of the university of michigan shall not be liable for any damages,
	27	+ * including special, indirect, incidental, or consequential damages,
	28	+ * with respect to any claim arising out or in connection with the use
	29	+ * of the software, even if it has been or is hereafter advised of the
	30	+ * possibility of such damages.
	31	+ */
	32	+#include <linux/module.h>
	33	+#include <linux/init.h>
	34	+
	35	+#include "blocklayout.h"
	36	+
	37	+#define NFSDBG_FACILITY NFSDBG_PNFS_LD
	38	+
	39	+MODULE_LICENSE("GPL");
	40	+MODULE_AUTHOR("Andy Adamson <andros@citi.umich.edu>");
	41	+MODULE_DESCRIPTION("The NFSv4.1 pNFS Block layout driver");
	42	+
	43	+static enum pnfs_try_status
	44	+bl_read_pagelist(struct nfs_read_data *rdata)
	45	+{
	46	+ return PNFS_NOT_ATTEMPTED;
	47	+}
	48	+
	49	+static enum pnfs_try_status
	50	+bl_write_pagelist(struct nfs_write_data *wdata,
	51	+ int sync)
	52	+{
	53	+ return PNFS_NOT_ATTEMPTED;
	54	+}
	55	+
	56	+/* STUB */
	57	+static void
	58	+release_extents(struct pnfs_block_layout *bl,
	59	+ struct pnfs_layout_range *range)
	60	+{
	61	+ return;
	62	+}
	63	+
	64	+/* STUB */
	65	+static void
	66	+release_inval_marks(struct pnfs_inval_markings *marks)
	67	+{
	68	+ return;
	69	+}
	70	+
	71	+static void bl_free_layout_hdr(struct pnfs_layout_hdr *lo)
	72	+{
	73	+ struct pnfs_block_layout *bl = BLK_LO2EXT(lo);
	74	+
	75	+ dprintk("%s enter\n", __func__);
	76	+ release_extents(bl, NULL);
	77	+ release_inval_marks(&bl->bl_inval);
	78	+ kfree(bl);
	79	+}
	80	+
	81	+static struct pnfs_layout_hdr bl_alloc_layout_hdr(struct inode inode,
	82	+ gfp_t gfp_flags)
	83	+{
	84	+ struct pnfs_block_layout *bl;
	85	+
	86	+ dprintk("%s enter\n", __func__);
	87	+ bl = kzalloc(sizeof(*bl), gfp_flags);
	88	+ if (!bl)
	89	+ return NULL;
	90	+ spin_lock_init(&bl->bl_ext_lock);
	91	+ INIT_LIST_HEAD(&bl->bl_extents[0]);
	92	+ INIT_LIST_HEAD(&bl->bl_extents[1]);
	93	+ INIT_LIST_HEAD(&bl->bl_commit);
	94	+ INIT_LIST_HEAD(&bl->bl_committing);
	95	+ bl->bl_count = 0;
	96	+ bl->bl_blocksize = NFS_SERVER(inode)->pnfs_blksize >> SECTOR_SHIFT;
	97	+ BL_INIT_INVAL_MARKS(&bl->bl_inval, bl->bl_blocksize);
	98	+ return &bl->bl_layout;
	99	+}
	100	+
	101	+static void
	102	+bl_free_lseg(struct pnfs_layout_segment *lseg)
	103	+{
	104	+}
	105	+
	106	+static struct pnfs_layout_segment *
	107	+bl_alloc_lseg(struct pnfs_layout_hdr *lo,
	108	+ struct nfs4_layoutget_res *lgr, gfp_t gfp_flags)
	109	+{
	110	+ return NULL;
	111	+}
	112	+
	113	+static void
	114	+bl_encode_layoutcommit(struct pnfs_layout_hdr lo, struct xdr_stream xdr,
	115	+ const struct nfs4_layoutcommit_args *arg)
	116	+{
	117	+}
	118	+
	119	+static void
	120	+bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata)
	121	+{
	122	+}
	123	+
	124	+static int
	125	+bl_set_layoutdriver(struct nfs_server server, const struct nfs_fh fh)
	126	+{
	127	+ dprintk("%s enter\n", __func__);
	128	+ return 0;
	129	+}
	130	+
	131	+static int
	132	+bl_clear_layoutdriver(struct nfs_server *server)
	133	+{
	134	+ dprintk("%s enter\n", __func__);
	135	+ return 0;
	136	+}
	137	+
	138	+static struct pnfs_layoutdriver_type blocklayout_type = {
	139	+ .id = LAYOUT_BLOCK_VOLUME,
	140	+ .name = "LAYOUT_BLOCK_VOLUME",
	141	+ .read_pagelist = bl_read_pagelist,
	142	+ .write_pagelist = bl_write_pagelist,
	143	+ .alloc_layout_hdr = bl_alloc_layout_hdr,
	144	+ .free_layout_hdr = bl_free_layout_hdr,
	145	+ .alloc_lseg = bl_alloc_lseg,
	146	+ .free_lseg = bl_free_lseg,
	147	+ .encode_layoutcommit = bl_encode_layoutcommit,
	148	+ .cleanup_layoutcommit = bl_cleanup_layoutcommit,
	149	+ .set_layoutdriver = bl_set_layoutdriver,
	150	+ .clear_layoutdriver = bl_clear_layoutdriver,
	151	+};
	152	+
	153	+static int __init nfs4blocklayout_init(void)
	154	+{
	155	+ int ret;
	156	+
	157	+ dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
	158	+
	159	+ ret = pnfs_register_layoutdriver(&blocklayout_type);
	160	+ return ret;
	161	+}
	162	+
	163	+static void __exit nfs4blocklayout_exit(void)
	164	+{
	165	+ dprintk("%s: NFSv4 Block Layout Driver Unregistering...\n",
	166	+ __func__);
	167	+
	168	+ pnfs_unregister_layoutdriver(&blocklayout_type);
	169	+}
	170	+
	171	+MODULE_ALIAS("nfs-layouttype4-3");
	172	+
	173	+module_init(nfs4blocklayout_init);
	174	+module_exit(nfs4blocklayout_exit);