forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pnfs: filelayout: support non page aligned layouts

Browse source 
Use the new pg_test interface to adjust requests to fit in the current
stripe / segment.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Weston Andros Adamson 2014-05-15 11:56:56 -04:00 • committed by Trond Myklebust
commit c6194271f9
1 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

52
fs/nfs/nfs4filelayout.c
View file

@ -639,7 +639,6 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,
struct nfs4_deviceid_node *d; struct nfs4_deviceid_node *d;
struct nfs4_file_layout_dsaddr *dsaddr; struct nfs4_file_layout_dsaddr *dsaddr;
int status = -EINVAL; int status = -EINVAL;
struct nfs_server *nfss = NFS_SERVER(lo->plh_inode);
dprintk("--> %s\n", __func__); dprintk("--> %s\n", __func__);
@ -657,7 +656,7 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,
goto out; goto out;
} }
if (!fl->stripe_unit || fl->stripe_unit % PAGE_SIZE) { if (!fl->stripe_unit) {
dprintk("%s Invalid stripe unit (%u)\n", dprintk("%s Invalid stripe unit (%u)\n",
__func__, fl->stripe_unit); __func__, fl->stripe_unit);
goto out; goto out;
@ -694,12 +693,6 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,
goto out_put; goto out_put;
} }
if (fl->stripe_unit % nfss->rsize || fl->stripe_unit % nfss->wsize) {
dprintk("%s Stripe unit (%u) not aligned with rsize %u "
"wsize %u\n", __func__, fl->stripe_unit, nfss->rsize,
nfss->wsize);
}
status = 0; status = 0;
out: out:
dprintk("--> %s returns %d\n", __func__, status); dprintk("--> %s returns %d\n", __func__, status);
@ -936,44 +929,42 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
{ {
unsigned int size; unsigned int size;
u64 p_stripe, r_stripe; u64 p_stripe, r_stripe;
u32 stripe_unit; u32 stripe_offset;
u64 segment_offset = pgio->pg_lseg->pls_range.offset;
u32 stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit;
/* calls nfs_generic_pg_test */ /* calls nfs_generic_pg_test */
size = pnfs_generic_pg_test(pgio, prev, req); size = pnfs_generic_pg_test(pgio, prev, req);
if (!size) if (!size)
return 0; return 0;
/* see if req and prev are in the same stripe */
if (prev) { if (prev) {
p_stripe = (u64)req_offset(prev); p_stripe = (u64)req_offset(prev) - segment_offset;
r_stripe = (u64)req_offset(req); r_stripe = (u64)req_offset(req) - segment_offset;
stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit;
do_div(p_stripe, stripe_unit); do_div(p_stripe, stripe_unit);
do_div(r_stripe, stripe_unit); do_div(r_stripe, stripe_unit);
if (p_stripe != r_stripe) if (p_stripe != r_stripe)
return 0; return 0;
} }
return min(size, req->wb_bytes);
/* calculate remaining bytes in the current stripe */
div_u64_rem((u64)req_offset(req) - segment_offset,
stripe_unit,
&stripe_offset);
WARN_ON_ONCE(stripe_offset > stripe_unit);
if (stripe_offset >= stripe_unit)
return 0;
return min(stripe_unit - (unsigned int)stripe_offset, size);
} }
static void static void
filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,
struct nfs_page *req) struct nfs_page *req)
{ {
WARN_ON_ONCE(pgio->pg_lseg != NULL); if (!pgio->pg_lseg)
pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
if (req->wb_offset != req->wb_pgbase) {
/*
* Handling unaligned pages is difficult, because have to
* somehow split a req in two in certain cases in the
* pg.test code. Avoid this by just not using pnfs
* in this case.
*/
nfs_pageio_reset_read_mds(pgio);
return;
}
pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
req->wb_context, req->wb_context,
0, 0,
NFS4_MAX_UINT64, NFS4_MAX_UINT64,
@ -991,11 +982,8 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
struct nfs_commit_info cinfo; struct nfs_commit_info cinfo;
int status; int status;
WARN_ON_ONCE(pgio->pg_lseg != NULL); if (!pgio->pg_lseg)
pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
if (req->wb_offset != req->wb_pgbase)
goto out_mds;
pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,
req->wb_context, req->wb_context,
0, 0,
NFS4_MAX_UINT64, NFS4_MAX_UINT64,