pNFS/flexfiles: Ensure we initialise the mirror bsizes correctly on read
Subsystems (2)
[email protected]
maintainerPATCH 1/2 pNFS/flexfiles: Ensure we initialise the mirror bsizes correctly on read
From: Trond Myklebust <[email protected]>
While it is true that reading from an unmirrored source always uses index 0, that is no longer true for mirrored sources when we fail over.
Fixes 563c53e73b8b ("NFS: Fix flexfiles read failover")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/flexfilelayout/flexfilelayout.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +6 -5
@@ -838,6 +838,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio,struct nfs4_ff_layout_mirror *mirror;struct nfs4_pnfs_ds *ds;int ds_idx; +u32 i; retry:ff_layout_pg_check_layout (pgio, req);
@@ -863,14 +864,14 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, goto retry; } - mirror =FF_LAYOUT_COMP (pgio->pg_lseg, ds_idx); +for (i =0 ; i < pgio->pg_mirror_count; i++) { + mirror =FF_LAYOUT_COMP (pgio->pg_lseg, i); + pgm = &pgio->pg_mirrors[i]; + pgm->pg_bsize = mirror->mirror_ds->ds_versions[0 ].rsize; + } pgio->pg_mirror_idx = ds_idx; -/* read always uses only one mirror - idx 0 for pgio layer */ - pgm = &pgio->pg_mirrors[0 ]; - pgm->pg_bsize = mirror->mirror_ds->ds_versions[0 ].rsize; -if (NFS_SERVER (pgio->pg_inode)->flags & (NFS_MOUNT_SOFT |NFS_MOUNT_SOFTERR )) pgio->pg_maxretrans = io_maxretrans;
Signature · 1 line
2.26.2
[email protected]
maintainerPATCH 2/2 pNFS/flexfiles: Be consistent about mirror index types
From: Trond Myklebust <[email protected]>
A mirror index is always of type u32.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/flexfilelayout/flexfilelayout.c | 34 +++++++++++++------------- include/linux/nfs_xdr.h | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +17 -17
@@ -715,7 +715,7 @@ nfs4_ff_layout_stat_io_end_write(struct rpc_task *task, }static void -ff_layout_mark_ds_unreachable (struct pnfs_layout_segment *lseg,int idx) +ff_layout_mark_ds_unreachable (struct pnfs_layout_segment *lseg,u32 idx) {struct nfs4_deviceid_node *devid =FF_LAYOUT_DEVID_NODE (lseg, idx);
@@ -724,7 +724,7 @@ ff_layout_mark_ds_unreachable(struct pnfs_layout_segment *lseg, int idx) }static void -ff_layout_mark_ds_reachable (struct pnfs_layout_segment *lseg,int idx) +ff_layout_mark_ds_reachable (struct pnfs_layout_segment *lseg,u32 idx) {struct nfs4_deviceid_node *devid =FF_LAYOUT_DEVID_NODE (lseg, idx);
@@ -734,14 +734,14 @@ ff_layout_mark_ds_reachable(struct pnfs_layout_segment *lseg, int idx)static struct nfs4_pnfs_ds *ff_layout_choose_ds_for_read (struct pnfs_layout_segment *lseg, -int start_idx,int *best_idx, +u32 start_idx,u32 *best_idx,bool check_device) {struct nfs4_ff_layout_segment *fls =FF_LAYOUT_LSEG (lseg);struct nfs4_ff_layout_mirror *mirror;struct nfs4_pnfs_ds *ds;bool fail_return = false; -int idx; +u32 idx;/* mirrors are initially sorted by efficiency */ for (idx = start_idx; idx < fls->mirror_array_cnt; idx++) {
@@ -766,21 +766,21 @@ ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg,static struct nfs4_pnfs_ds *ff_layout_choose_any_ds_for_read (struct pnfs_layout_segment *lseg, -int start_idx,int *best_idx) +u32 start_idx,u32 *best_idx) {return ff_layout_choose_ds_for_read (lseg, start_idx, best_idx, false); }static struct nfs4_pnfs_ds *ff_layout_choose_valid_ds_for_read (struct pnfs_layout_segment *lseg, -int start_idx,int *best_idx) +u32 start_idx,u32 *best_idx) {return ff_layout_choose_ds_for_read (lseg, start_idx, best_idx, true); }static struct nfs4_pnfs_ds *ff_layout_choose_best_ds_for_read (struct pnfs_layout_segment *lseg, -int start_idx,int *best_idx) +u32 start_idx,u32 *best_idx) {struct nfs4_pnfs_ds *ds;
@@ -791,7 +791,8 @@ ff_layout_choose_best_ds_for_read(struct pnfs_layout_segment *lseg, }static struct nfs4_pnfs_ds * -ff_layout_get_ds_for_read (struct nfs_pageio_descriptor *pgio,int *best_idx) +ff_layout_get_ds_for_read (struct nfs_pageio_descriptor *pgio, +u32 *best_idx) {struct pnfs_layout_segment *lseg = pgio->pg_lseg;struct nfs4_pnfs_ds *ds;
@@ -837,8 +838,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio,struct nfs_pgio_mirror *pgm;struct nfs4_ff_layout_mirror *mirror;struct nfs4_pnfs_ds *ds; -int ds_idx; -u32 i; +u32 ds_idx, i; retry:ff_layout_pg_check_layout (pgio, req);
@@ -895,7 +895,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio,struct nfs4_ff_layout_mirror *mirror;struct nfs_pgio_mirror *pgm;struct nfs4_pnfs_ds *ds; -int i; +u32 i; retry:ff_layout_pg_check_layout (pgio, req);
@@ -1039,7 +1039,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)static void ff_layout_resend_pnfs_read (struct nfs_pgio_header *hdr) {u32 idx = hdr->pgio_mirror_idx +1 ; -int new_idx =0 ; +u32 new_idx =0 ;if (ff_layout_choose_any_ds_for_read (hdr->lseg, idx +1 , &new_idx))ff_layout_send_layouterror (hdr->lseg);
@@ -1076,7 +1076,7 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,struct nfs4_state *state, struct nfs_client *clp, struct pnfs_layout_segment *lseg, - int idx) + u32 idx) { struct pnfs_layout_hdr *lo = lseg->pls_layout;struct inode *inode = lo->plh_inode;
@@ -1150,7 +1150,7 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,/* Retry all errors through either pNFS or MDS except for -EJUKEBOX */ static int ff_layout_async_handle_error_v3 (struct rpc_task *task,struct pnfs_layout_segment *lseg, -int idx) +u32 idx) {struct nfs4_deviceid_node *devid =FF_LAYOUT_DEVID_NODE (lseg, idx);
@@ -1185,7 +1185,7 @@ static int ff_layout_async_handle_error(struct rpc_task *task,struct nfs4_state *state, struct nfs_client *clp, struct pnfs_layout_segment *lseg, - int idx) + u32 idx) { int vers = clp->cl_nfs_mod->rpc_vers->number;
@@ -1212,7 +1212,7 @@ static int ff_layout_async_handle_error(struct rpc_task *task, }static void ff_layout_io_track_ds_error (struct pnfs_layout_segment *lseg, -int idx,u64 offset,u64 length, +u32 idx,u64 offset,u64 length,u32 *op_status,int opnum,int error) {struct nfs4_ff_layout_mirror *mirror;
@@ -1810,7 +1810,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)loff_t offset = hdr->args.offset;int vers;struct nfs_fh *fh; -int idx = hdr->pgio_mirror_idx; +u32 idx = hdr->pgio_mirror_idx; mirror =FF_LAYOUT_COMP (lseg, idx); ds =nfs4_ff_layout_prepare_ds (lseg, mirror, true);
include/linux/nfs_xdr.h +2 -2
@@ -1611,8 +1611,8 @@ struct nfs_pgio_header {__u64 mds_offset;/* Filelayout dense stripe */ struct nfs_page_array page_array;struct nfs_client *ds_clp;/* pNFS data server */ -int ds_commit_idx;/* ds index if ds_clp is set */ -int pgio_mirror_idx;/* mirror index in pgio layer */ +u32 ds_commit_idx;/* ds index if ds_clp is set */ +u32 pgio_mirror_idx;/* mirror index in pgio layer */ };struct nfs_mds_commit_info {
Signature · 1 line
2.26.2