[pnfs] [PATCH 1/3] pnfs-gfs2: initial LAYOUT* work for pNFS/GFS2 integration

[david m. richter]

On Sun, 1 Jun 2008, Benny Halevy wrote:

> On May. 30, 2008, 0:04 +0300, "David M. Richter" <richterd at citi.umich.edu> wrote:
> > Frank Filz's work on the layout_type() and layout_get() export operations,
> > with stubs for layout_commit() and layout_return().  Tested at Connectathon.
> > 
> > Signed-off-by: Frank Filz <ffilzlnx at us.ibm.com>
> > Signed-off-by: David M. Richter <richterd at citi.umich.edu>
> > ---
> >  fs/gfs2/ops_export.c |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 files changed, 109 insertions(+), 0 deletions(-)
> > 
> > diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c
> > index 334c7f8..b62cc66 100644
> > --- a/fs/gfs2/ops_export.c
> > +++ b/fs/gfs2/ops_export.c
> > @@ -27,6 +27,16 @@
> >  #include "rgrp.h"
> >  #include "util.h"
> >  
> > +#if defined(CONFIG_PNFSD)
> > +#include <linux/nfs_fs.h>
> > +#include <linux/sunrpc/svc.h>
> > +#include <linux/nfsd/state.h>
> > +#include <linux/nfsd/nfsfh.h>
> > +#include <linux/nfsd/pnfsd.h>
> > +#include <linux/nfsd/nfs4layoutxdr.h>
> > +#include <linux/nfs4_pnfs.h>
> > +#endif /* CONFIG_PNFSD */
> > +
> >  #define GFS2_SMALL_FH_SIZE 4
> >  #define GFS2_LARGE_FH_SIZE 8
> >  #define GFS2_OLD_FH_SIZE 10
> > @@ -294,11 +304,110 @@ static struct dentry *gfs2_fh_to_parent(struct super_block *sb, struct fid *fid,
> >  	}
> >  }
> >  
> > +#if defined(CONFIG_PNFSD)
> > +static int gfs2_layout_type(void)
> > +{
> > +	return LAYOUT_NFSV4_FILES;
> > +}
> > +
> > +/* like GPFS does, use a multiple of the underlying fs' blocksize */
> > +static int get_stripe_unit(int blocksize)
> > +{
> > +	if (blocksize >= NFSSVC_MAXBLKSIZE)
> > +		return blocksize;
> > +
> > +	return NFSSVC_MAXBLKSIZE - NFSSVC_MAXBLKSIZE % blocksize;
> > +}
> > +
> > +/*
> > + * Retrieve and encode a file layout onto the xdr stream.
> > + * @inode: inode for which to retrieve layout
> > + * @arg->xdr: xdr stream for encoding
> > + * @arg->func: a call into file system to encode the layout on xdr stream.
> > + */
> > +static int gfs2_layout_get(struct inode *inode, struct pnfs_layoutget_arg *arg)
> > +{
> > +	int i, rc = 0;
> > +	int num_dests = 1; /* XXX: revisit */
> > +	struct pnfs_filelayout_layout *layout = NULL;
> > +	struct knfsd_fh *fh_list = NULL;
> > +
> > +	printk(KERN_DEBUG "%s: LAYOUT_GET\n", __func__);
> > +
> > +	/* Set layout indept response args */
> > +	arg->seg.layout_type = LAYOUT_NFSV4_FILES;
> > +	arg->seg.offset = 0;
> > +	arg->seg.length = inode->i_sb->s_maxbytes; /* The maximum file size */
> > +
> > +	layout = kzalloc(sizeof(*layout), GFP_KERNEL);
> > +	if (layout == NULL) {
> > +		rc = -ENOMEM;
> > +		goto error;
> > +	}
> > +
> > +	/* Set file layout response args */
> > +	layout->lg_layout_type = LAYOUT_NFSV4_FILES;
> > +	layout->lg_stripe_type = STRIPE_SPARSE;
> > +	layout->lg_commit_through_mds = true;
> > +	layout->lg_stripe_unit = get_stripe_unit(inode->i_sb->s_blocksize);
> > +	layout->lg_fh_length = num_dests;
> > +	layout->device_id.pnfs_fsid = arg->fsid;
> > +	layout->device_id.pnfs_devid = 1;			/*FSFTEMP*/
> > +	layout->lg_first_stripe_index = 0;			/*FSFTEMP*/
> > +	layout->lg_pattern_offset = 0;
> > +
> > +	fh_list = kmalloc(sizeof(*fh_list) * num_dests, GFP_KERNEL);
> > +	if (fh_list == NULL) {
> > +		rc = -ENOMEM;
> > +		goto error;
> > +	}
> > +
> > +	memcpy(&fh_list[0], arg->fh, sizeof(*fh_list));
> > +	pnfs_fh_mark_ds(&fh_list[0]);
> > +
> > +	if (num_dests > 1)
> 
> This condition is somewhat redundant with the for loop below
> as it optimizes the most uninteresting case for pnfs :-)
> (i = 1; i < num_dests) is equivalent to checking num_dests > 1
> anyway so the preliminary condition doesn't optimize much.
> Although (on x86_64) the if condition's machine code is
> a tiny bit more optimal than the for loop (2 instructions,
> 1 mem reference, vs. 3 instructions, 2 mem references)
> it adds 2 more instructions.  I'm going to remove it
> if that's ok with you, please speak up otherwise...

	righto, thank you; i chopped this after something dean said, just 
waiting for frank to look things over before i repost.  thanks :)


> 
> > +		for (i = 1; i < num_dests; i++)
> > +			memcpy(&fh_list[i], &fh_list[0], sizeof(*fh_list));
> > +	layout->lg_fh_list = fh_list;
> > +
> > +	/* Call nfsd to encode layout */
> > +	rc = arg->func(&arg->xdr, layout);
> > +exit:
> > +	kfree(layout);
> > +	kfree(fh_list);
> > +	return rc;
> > +
> > +error:
> > +	arg->seg.length = 0;
> > +	goto exit;
> > +}
> > +
> > +static int gfs2_layout_commit(struct inode *inode, void *p)
> > +{
> > +	printk(KERN_DEBUG "%s: LAYOUT_COMMIT (unimplemented)\n", __func__);
> > +
> > +	return 0;
> > +}
> > +
> > +static int gfs2_layout_return(struct inode *inode, void *p)
> > +{
> > +	printk(KERN_DEBUG "%s: LAYOUT_RETURN (unimplemented)\n", __func__);
> > +
> > +	return 0;
> > +}
> > +#endif /* CONFIG_PNFSD */
> > +
> >  const struct export_operations gfs2_export_ops = {
> >  	.encode_fh = gfs2_encode_fh,
> >  	.fh_to_dentry = gfs2_fh_to_dentry,
> >  	.fh_to_parent = gfs2_fh_to_parent,
> >  	.get_name = gfs2_get_name,
> >  	.get_parent = gfs2_get_parent,
> > +#if defined(CONFIG_PNFSD)
> > +	.layout_type = gfs2_layout_type,
> > +	.layout_get = gfs2_layout_get,
> > +	.layout_commit = gfs2_layout_commit,
> > +	.layout_return = gfs2_layout_return,
> > +#endif /* CONFIG_PNFSD */
> >  };
> >  
> 
>