Commit 1751c363 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Cleanup of the nfs_pageio code in preparation for a pnfs bugfix 



We need to ensure that the layouts are set up before we can decide to
coalesce requests. To do so, we want to further split up the struct
nfs_pageio_descriptor operations into an initialisation callback, a
coalescing test callback, and a 'do i/o' callback.

This patch cleans up the existing callback methods before adding the
'initialisation' callback.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f062eb6c

fs/nfs/nfs4filelayout.c

+13 −2
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, 
 * return true  : coalesce page

 * return false : don't coalesce page

 */

bool

static bool

filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		   struct nfs_page *req)

{
@@ -681,6 +681,16 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 
	return (p_stripe == r_stripe);

}



static const struct nfs_pageio_ops filelayout_pg_read_ops = {

	.pg_test = filelayout_pg_test,

	.pg_doio = nfs_generic_pg_readpages,

};



static const struct nfs_pageio_ops filelayout_pg_write_ops = {

	.pg_test = filelayout_pg_test,

	.pg_doio = nfs_generic_pg_writepages,

};



static bool filelayout_mark_pnfs_commit(struct pnfs_layout_segment *lseg)

{

	return !FILELAYOUT_LSEG(lseg)->commit_through_mds;
@@ -878,7 +888,8 @@ static struct pnfs_layoutdriver_type filelayout_type = { 
	.owner			= THIS_MODULE,

	.alloc_lseg		= filelayout_alloc_lseg,

	.free_lseg		= filelayout_free_lseg,

	.pg_test		= filelayout_pg_test,

	.pg_read_ops		= &filelayout_pg_read_ops,

	.pg_write_ops		= &filelayout_pg_write_ops,

	.mark_pnfs_commit	= filelayout_mark_pnfs_commit,

	.choose_commit_list	= filelayout_choose_commit_list,

	.commit_pagelist	= filelayout_commit_pagelist,

fs/nfs/objlayout/objio_osd.c

+12 −1
Original line number Diff line number Diff line
@@ -1007,6 +1007,16 @@ static bool objio_pg_test(struct nfs_pageio_descriptor *pgio, 
			OBJIO_LSEG(pgio->pg_lseg)->max_io_size;

}



static const struct nfs_pageio_ops objio_pg_read_ops = {

	.pg_test = objio_pg_test,

	.pg_doio = nfs_generic_pg_readpages,

};



static const struct nfs_pageio_ops objio_pg_write_ops = {

	.pg_test = objio_pg_test,

	.pg_doio = nfs_generic_pg_writepages,

};



static struct pnfs_layoutdriver_type objlayout_type = {

	.id = LAYOUT_OSD2_OBJECTS,

	.name = "LAYOUT_OSD2_OBJECTS",
@@ -1020,7 +1030,8 @@ static struct pnfs_layoutdriver_type objlayout_type = { 


	.read_pagelist           = objlayout_read_pagelist,

	.write_pagelist          = objlayout_write_pagelist,

	.pg_test                 = objio_pg_test,

	.pg_read_ops             = &objio_pg_read_ops,

	.pg_write_ops            = &objio_pg_write_ops,



	.free_deviceid_node	 = objio_free_deviceid_node,

fs/nfs/pagelist.c

+4 −6
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ EXPORT_SYMBOL_GPL(nfs_generic_pg_test); 
 */

void nfs_pageio_init(struct nfs_pageio_descriptor *desc,

		     struct inode *inode,

		     int (*doio)(struct nfs_pageio_descriptor *),

		     const struct nfs_pageio_ops *pg_ops,

		     size_t bsize,

		     int io_flags)

{
@@ -241,12 +241,10 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
	desc->pg_base = 0;

	desc->pg_moreio = 0;

	desc->pg_inode = inode;

	desc->pg_doio = doio;

	desc->pg_ops = pg_ops;

	desc->pg_ioflags = io_flags;

	desc->pg_error = 0;

	desc->pg_lseg = NULL;

	desc->pg_test = nfs_generic_pg_test;

	pnfs_pageio_init(desc, inode);

}



/**
@@ -276,7 +274,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, 
		return false;

	if (prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)

		return false;

	return pgio->pg_test(pgio, prev, req);

	return pgio->pg_ops->pg_test(pgio, prev, req);

}



/**
@@ -311,7 +309,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc, 
static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)

{

	if (!list_empty(&desc->pg_list)) {

		int error = desc->pg_doio(desc);

		int error = desc->pg_ops->pg_doio(desc);

		if (error < 0)

			desc->pg_error = error;

		else

fs/nfs/pnfs.c

+24 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,30 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	goto out;

}



bool

pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct pnfs_layoutdriver_type *ld = server->pnfs_curr_ld;



	if (ld == NULL)

		return false;

	nfs_pageio_init(pgio, inode, ld->pg_read_ops, server->rsize, 0);

	return true;

}



bool

pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct pnfs_layoutdriver_type *ld = server->pnfs_curr_ld;



	if (ld == NULL)

		return false;

	nfs_pageio_init(pgio, inode, ld->pg_write_ops, server->wsize, ioflags);

	return true;

}



bool

pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		     struct nfs_page *req)

fs/nfs/pnfs.h

+13 −12
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ struct pnfs_layoutdriver_type { 
	void (*free_lseg) (struct pnfs_layout_segment *lseg);



	/* test for nfs page cache coalescing */

	bool (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);

	const struct nfs_pageio_ops *pg_read_ops;

	const struct nfs_pageio_ops *pg_write_ops;



	/* Returns true if layoutdriver wants to divert this request to

	 * driver's commit routine.
@@ -152,6 +153,10 @@ struct pnfs_layout_segment * 
pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx,

		   loff_t pos, u64 count, enum pnfs_iomode access_type,

		   gfp_t gfp_flags);



bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *);

bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *, int);



void set_pnfs_layoutdriver(struct nfs_server *, u32 id);

void unset_pnfs_layoutdriver(struct nfs_server *);

enum pnfs_try_status pnfs_try_to_write_data(struct nfs_write_data *,
@@ -293,15 +298,6 @@ static inline int pnfs_return_layout(struct inode *ino) 
	return 0;

}



static inline void pnfs_pageio_init(struct nfs_pageio_descriptor *pgio,

				    struct inode *inode)

{

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



	if (ld)

		pgio->pg_test = ld->pg_test;

}



#else  /* CONFIG_NFS_V4_1 */



static inline void pnfs_destroy_all_layouts(struct nfs_client *clp)
@@ -385,9 +381,14 @@ static inline void unset_pnfs_layoutdriver(struct nfs_server *s) 
{

}



static inline void pnfs_pageio_init(struct nfs_pageio_descriptor *pgio,

				    struct inode *inode)

static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode)

{

	return false;

}



static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags)

{

	return false;

}



static inline void