Commit ba827c9a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Enable per-layout segment commit structures 



Enable adding and lookup of per-layout segment commits in filelayout
and flexfilelayout.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent a9901899

fs/nfs/filelayout/filelayout.c

+21 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,26 @@ filelayout_get_ds_info(struct inode *inode) 
		return &FILELAYOUT_FROM_HDR(layout)->commit_info;

}



static void

filelayout_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg)

{

	struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg);

	struct inode *inode = lseg->pls_layout->plh_inode;

	struct pnfs_commit_array *array, *new;

	unsigned int size = (fl->stripe_type == STRIPE_SPARSE) ?

		fl->dsaddr->ds_num : fl->dsaddr->stripe_count;



	new = pnfs_alloc_commit_array(size, GFP_NOIO);

	if (new) {

		spin_lock(&inode->i_lock);

		array = pnfs_add_commit_array(fl_cinfo, new, lseg);

		spin_unlock(&inode->i_lock);

		if (array != new)

			pnfs_free_commit_array(new);

	}

}



static void

filelayout_release_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct inode *inode)
@@ -1191,6 +1211,7 @@ static struct pnfs_layoutdriver_type filelayout_type = { 
	.pg_read_ops		= &filelayout_pg_read_ops,

	.pg_write_ops		= &filelayout_pg_write_ops,

	.get_ds_info		= &filelayout_get_ds_info,

	.setup_ds_info		= filelayout_setup_ds_info,

	.release_ds_info	= filelayout_release_ds_info,

	.mark_request_commit	= filelayout_mark_request_commit,

	.clear_request_commit	= pnfs_generic_clear_request_commit,

fs/nfs/flexfilelayout/flexfilelayout.c

+19 −0
Original line number Diff line number Diff line
@@ -2004,6 +2004,24 @@ ff_layout_get_ds_info(struct inode *inode) 
	return &FF_LAYOUT_FROM_HDR(layout)->commit_info;

}



static void

ff_layout_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg)

{

	struct nfs4_ff_layout_segment *flseg = FF_LAYOUT_LSEG(lseg);

	struct inode *inode = lseg->pls_layout->plh_inode;

	struct pnfs_commit_array *array, *new;



	new = pnfs_alloc_commit_array(flseg->mirror_array_cnt, GFP_NOIO);

	if (new) {

		spin_lock(&inode->i_lock);

		array = pnfs_add_commit_array(fl_cinfo, new, lseg);

		spin_unlock(&inode->i_lock);

		if (array != new)

			pnfs_free_commit_array(new);

	}

}



static void

ff_layout_release_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct inode *inode)
@@ -2513,6 +2531,7 @@ static struct pnfs_layoutdriver_type flexfilelayout_type = { 
	.pg_read_ops		= &ff_layout_pg_read_ops,

	.pg_write_ops		= &ff_layout_pg_write_ops,

	.get_ds_info		= ff_layout_get_ds_info,

	.setup_ds_info		= ff_layout_setup_ds_info,

	.release_ds_info	= ff_layout_release_ds_info,

	.free_deviceid_node	= ff_layout_free_deviceid_node,

	.mark_request_commit	= pnfs_layout_mark_request_commit,

fs/nfs/pnfs.h

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ struct pnfs_layoutdriver_type { 
	const struct nfs_pageio_ops *pg_write_ops;



	struct pnfs_ds_commit_info *(*get_ds_info) (struct inode *inode);

	void (*setup_ds_info)(struct pnfs_ds_commit_info *,

			      struct pnfs_layout_segment *);

	void (*release_ds_info)(struct pnfs_ds_commit_info *,

				struct inode *inode);

	void (*mark_request_commit) (struct nfs_page *req,
@@ -371,6 +373,10 @@ void nfs4_deviceid_purge_client(const struct nfs_client *); 
/* pnfs_nfs.c */

struct pnfs_commit_array *pnfs_alloc_commit_array(size_t n, gfp_t gfp_flags);

void pnfs_free_commit_array(struct pnfs_commit_array *p);

struct pnfs_commit_array *pnfs_add_commit_array(struct pnfs_ds_commit_info *,

						struct pnfs_commit_array *,

						struct pnfs_layout_segment *);



void pnfs_generic_ds_cinfo_release_lseg(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg);

void pnfs_generic_ds_cinfo_destroy(struct pnfs_ds_commit_info *fl_cinfo);

fs/nfs/pnfs_nfs.c

+71 −6
Original line number Diff line number Diff line
@@ -118,6 +118,66 @@ pnfs_free_commit_array(struct pnfs_commit_array *p) 
}

EXPORT_SYMBOL_GPL(pnfs_free_commit_array);



static struct pnfs_commit_array *

pnfs_find_commit_array_by_lseg(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg)

{

	struct pnfs_commit_array *array;



	list_for_each_entry_rcu(array, &fl_cinfo->commits, cinfo_list) {

		if (array->lseg == lseg)

			return array;

	}

	return NULL;

}



struct pnfs_commit_array *

pnfs_add_commit_array(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_commit_array *new,

		struct pnfs_layout_segment *lseg)

{

	struct pnfs_commit_array *array;



	array = pnfs_find_commit_array_by_lseg(fl_cinfo, lseg);

	if (array)

		return array;

	new->lseg = lseg;

	refcount_set(&new->refcount, 1);

	list_add_rcu(&new->cinfo_list, &fl_cinfo->commits);

	list_add(&new->lseg_list, &lseg->pls_commits);

	return new;

}

EXPORT_SYMBOL_GPL(pnfs_add_commit_array);



static void

pnfs_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg)

{

	struct inode *inode = lseg->pls_layout->plh_inode;

	struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld;



	if (ld->setup_ds_info != NULL)

		ld->setup_ds_info(fl_cinfo, lseg);

}



static struct pnfs_commit_array *

pnfs_lookup_commit_array(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg)

{

	struct pnfs_commit_array *array;



	rcu_read_lock();

	array = pnfs_find_commit_array_by_lseg(fl_cinfo, lseg);

	if (!array) {

		rcu_read_unlock();

		pnfs_setup_ds_info(fl_cinfo, lseg);

		rcu_read_lock();

		array = pnfs_find_commit_array_by_lseg(fl_cinfo, lseg);

	}

	rcu_read_unlock();

	return array;

}



static void

pnfs_release_commit_array_locked(struct pnfs_commit_array *array)

{
@@ -1082,17 +1142,18 @@ pnfs_layout_mark_request_commit(struct nfs_page *req, 
				u32 ds_commit_idx)

{

	struct list_head *list;

	struct pnfs_commit_array *array;

	struct pnfs_commit_bucket *buckets;



	mutex_lock(&NFS_I(cinfo->inode)->commit_mutex);

	buckets = cinfo->ds->buckets;

	array = pnfs_lookup_commit_array(cinfo->ds, lseg);

	if (!array)

		goto out_resched;

	buckets = array->buckets;

	list = &buckets[ds_commit_idx].written;

	if (list_empty(list)) {

		if (!pnfs_is_valid_lseg(lseg)) {

			mutex_unlock(&NFS_I(cinfo->inode)->commit_mutex);

			cinfo->completion_ops->resched_write(cinfo, req);

			return;

		}

		if (!pnfs_is_valid_lseg(lseg))

			goto out_resched;

		/* Non-empty buckets hold a reference on the lseg.  That ref

		 * is normally transferred to the COMMIT call and released

		 * there.  It could also be released if the last req is pulled
@@ -1108,6 +1169,10 @@ pnfs_layout_mark_request_commit(struct nfs_page *req, 
	nfs_request_add_commit_list_locked(req, list, cinfo);

	mutex_unlock(&NFS_I(cinfo->inode)->commit_mutex);

	nfs_mark_page_unstable(req->wb_page, cinfo);

	return;

out_resched:

	mutex_unlock(&NFS_I(cinfo->inode)->commit_mutex);

	cinfo->completion_ops->resched_write(cinfo, req);

}

EXPORT_SYMBOL_GPL(pnfs_layout_mark_request_commit);