pNFS/flexfiles: Fix array overflow when flexfiles mirroring is enabled
Subsystems (2)
[email protected]
maintainerPATCH 1/1 pNFS/flexfiles: Fix array overflow when flexfiles mirroring is enabled
From: Trond Myklebust <[email protected]>
If the flexfiles mirroring is enabled, then the read code expects to be able to set pgio->pg_mirror_idx to point to the data server that is being used for this particular read. However it does not change the pg_mirror_count because we only need to send a single read.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/flexfilelayout/flexfilelayout.c | 27 ++++++++++++++----- fs/nfs/pagelist.c | 36 +++++++++++++++++++------- include/linux/nfs_page.h | 4 +++ 3 files changed, 52 insertions(+), 15 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +21 -6
@@ -838,7 +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; -u32 ds_idx, i; +u32 ds_idx; retry:ff_layout_pg_check_layout (pgio, req);
@@ -864,11 +864,9 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, goto retry; } -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; - } + mirror =FF_LAYOUT_COMP (pgio->pg_lseg, ds_idx); + pgm = &pgio->pg_mirrors[0 ]; + pgm->pg_bsize = mirror->mirror_ds->ds_versions[0 ].rsize; pgio->pg_mirror_idx = ds_idx;
@@ -985,6 +983,21 @@ ff_layout_pg_get_mirror_count_write(struct nfs_pageio_descriptor *pgio,return 1 ; } +static u32 +ff_layout_pg_set_mirror_write (struct nfs_pageio_descriptor *desc,u32 idx) +{ +u32 old = desc->pg_mirror_idx; + + desc->pg_mirror_idx = idx; +return old; +} + +static struct nfs_pgio_mirror * +ff_layout_pg_get_mirror_write (struct nfs_pageio_descriptor *desc,u32 idx) +{ +return &desc->pg_mirrors[idx]; +} +static const struct nfs_pageio_ops ff_layout_pg_read_ops = { .pg_init = ff_layout_pg_init_read, .pg_test = pnfs_generic_pg_test,
@@ -998,6 +1011,8 @@ static const struct nfs_pageio_ops ff_layout_pg_write_ops = { .pg_doio = pnfs_generic_pg_writepages, .pg_get_mirror_count = ff_layout_pg_get_mirror_count_write, .pg_cleanup = pnfs_generic_pg_cleanup, + .pg_get_mirror = ff_layout_pg_get_mirror_write, + .pg_set_mirror = ff_layout_pg_set_mirror_write, };static void ff_layout_reset_write (struct nfs_pgio_header *hdr,bool retry_pnfs)
fs/nfs/pagelist.c +27 -9
@@ -31,13 +31,29 @@static struct kmem_cache *nfs_page_cachep;static const struct rpc_call_ops nfs_pgio_common_ops; +static struct nfs_pgio_mirror * +nfs_pgio_get_mirror (struct nfs_pageio_descriptor *desc,u32 idx) +{ +if (desc->pg_ops->pg_get_mirror) +return desc->pg_ops->pg_get_mirror (desc, idx); +return &desc->pg_mirrors[0 ]; +} +struct nfs_pgio_mirror *nfs_pgio_current_mirror (struct nfs_pageio_descriptor *desc) { -return &desc->pg_mirrors[desc->pg_mirror_idx]; +return nfs_pgio_get_mirror (desc, desc->pg_mirror_idx); }EXPORT_SYMBOL_GPL (nfs_pgio_current_mirror); +static u32 +nfs_pgio_set_current_mirror (struct nfs_pageio_descriptor *desc,u32 idx) +{ +if (desc->pg_ops->pg_set_mirror) +return desc->pg_ops->pg_set_mirror (desc, idx); +return desc->pg_mirror_idx; +} +void nfs_pgheader_init (struct nfs_pageio_descriptor *desc,struct nfs_pgio_header *hdr,void (*release)(struct nfs_pgio_header *hdr))
@@ -1259,7 +1275,7 @@ static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)return ;for (midx =0 ; midx < desc->pg_mirror_count; midx++) { - mirror = &desc->pg_mirrors[midx]; + mirror =nfs_pgio_get_mirror (desc, midx); desc->pg_completion_ops->error_cleanup (&mirror->pg_list, desc->pg_error); }
@@ -1293,12 +1309,12 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, goto out_failed; } - desc->pg_mirror_idx = midx; +nfs_pgio_set_current_mirror (desc, midx);if (!nfs_pageio_add_request_mirror (desc, dupreq)) goto out_cleanup_subreq; } - desc->pg_mirror_idx =0 ; +nfs_pgio_set_current_mirror (desc,0 );if (!nfs_pageio_add_request_mirror (desc, req)) goto out_failed;
@@ -1320,10 +1336,12 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,static void nfs_pageio_complete_mirror (struct nfs_pageio_descriptor *desc,u32 mirror_idx) { -struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[mirror_idx]; -u32 restore_idx = desc->pg_mirror_idx; +struct nfs_pgio_mirror *mirror; +u32 restore_idx; + + restore_idx =nfs_pgio_set_current_mirror (desc, mirror_idx); + mirror =nfs_pgio_current_mirror (desc); - desc->pg_mirror_idx = mirror_idx;for (;;) {nfs_pageio_doio (desc);if (desc->pg_error <0 || !mirror->pg_recoalesce)
@@ -1331,7 +1349,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,if (!nfs_do_recoalesce (desc))break ; } - desc->pg_mirror_idx = restore_idx; +nfs_pgio_set_current_mirror (desc, restore_idx); }/*
@@ -1405,7 +1423,7 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index)u32 midx;for (midx =0 ; midx < desc->pg_mirror_count; midx++) { - mirror = &desc->pg_mirrors[midx]; + mirror =nfs_pgio_get_mirror (desc, midx);if (!list_empty (&mirror->pg_list)) { prev =nfs_list_entry (mirror->pg_list.prev);if (index != prev->wb_index +1 ) {
include/linux/nfs_page.h +4 -0
@@ -55,6 +55,7 @@ struct nfs_page {unsigned short wb_nio;/* Number of I/O attempts */ }; +struct nfs_pgio_mirror ;struct nfs_pageio_descriptor ;struct nfs_pageio_ops {void (*pg_init)(struct nfs_pageio_descriptor *,struct nfs_page *);
@@ -64,6 +65,9 @@ struct nfs_pageio_ops {unsigned int (*pg_get_mirror_count)(struct nfs_pageio_descriptor *,struct nfs_page *);void (*pg_cleanup)(struct nfs_pageio_descriptor *); +struct nfs_pgio_mirror * + (*pg_get_mirror)(struct nfs_pageio_descriptor *,u32 ); +u32 (*pg_set_mirror)(struct nfs_pageio_descriptor *,u32 ); };struct nfs_rw_ops {
Signature · 1 line
2.28.0