diff mbox

[1/2] pnfs: set NFS_IOHDR_REDO in pnfs_read_resend_pnfs

Message ID 1459520943-5558-2-git-send-email-dros@primarydata.com (mailing list archive)
State New, archived
Headers show

Commit Message

Weston Andros Adamson April 1, 2016, 2:29 p.m. UTC 
Like other resend paths, mark the (old) hdr as NFS_IOHDR_REDO. This
ensures the hdr completion function will not count the (old) hdr
as good bytes.

Also, vector the error back through the hdr->task.tk_status like other
retry calls.

This fixes a bug with the FlexFiles layout where libaio was reporting more
bytes read than requested.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
---
 fs/nfs/pnfs.c | 13 ++++++++-----
 fs/nfs/pnfs.h |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

Comments

kernel test robot April 1, 2016, 3:28 p.m. UTC | #1 
Hi Weston,

[auto build test WARNING on v4.6-rc1]
[also build test WARNING on next-20160401]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Weston-Andros-Adamson/pnfs-set-NFS_IOHDR_REDO-in-pnfs_read_resend_pnfs/20160401-223208
config: i386-allmodconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All warnings (new ones prefixed by >>):

   fs/nfs/pnfs.c: In function 'pnfs_do_read':
>> fs/nfs/pnfs.c:2164:6: warning: unused variable 'err' [-Wunused-variable]
     int err = 0;
         ^

vim +/err +2164 fs/nfs/pnfs.c

ceb11e13 Peng Tao              2014-11-10  2148  	struct nfs_pageio_descriptor pgio;
ceb11e13 Peng Tao              2014-11-10  2149  
a5073dc2 Weston Andros Adamson 2016-04-01  2150  	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
a5073dc2 Weston Andros Adamson 2016-04-01  2151  		nfs_pageio_init_read(&pgio, hdr->inode, false,
a5073dc2 Weston Andros Adamson 2016-04-01  2152  					hdr->completion_ops);
a5073dc2 Weston Andros Adamson 2016-04-01  2153  		hdr->task.tk_status = nfs_pageio_resend(&pgio, hdr);
a5073dc2 Weston Andros Adamson 2016-04-01  2154  	}
ceb11e13 Peng Tao              2014-11-10  2155  }
ceb11e13 Peng Tao              2014-11-10  2156  EXPORT_SYMBOL_GPL(pnfs_read_resend_pnfs);
ceb11e13 Peng Tao              2014-11-10  2157  
493292dd Trond Myklebust       2011-07-13  2158  static void
7f714720 Weston Andros Adamson 2014-05-15  2159  pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)
493292dd Trond Myklebust       2011-07-13  2160  {
493292dd Trond Myklebust       2011-07-13  2161  	const struct rpc_call_ops *call_ops = desc->pg_rpc_callops;
493292dd Trond Myklebust       2011-07-13  2162  	struct pnfs_layout_segment *lseg = desc->pg_lseg;
493292dd Trond Myklebust       2011-07-13  2163  	enum pnfs_try_status trypnfs;
ceb11e13 Peng Tao              2014-11-10 @2164  	int err = 0;
493292dd Trond Myklebust       2011-07-13  2165  
d45f60c6 Weston Andros Adamson 2014-06-09  2166  	trypnfs = pnfs_try_to_read_data(hdr, call_ops, lseg);
ceb11e13 Peng Tao              2014-11-10  2167  	if (trypnfs == PNFS_TRY_AGAIN)
a5073dc2 Weston Andros Adamson 2016-04-01  2168  		pnfs_read_resend_pnfs(hdr);
a5073dc2 Weston Andros Adamson 2016-04-01  2169  	if (trypnfs == PNFS_NOT_ATTEMPTED || hdr->task.tk_status)
d45f60c6 Weston Andros Adamson 2014-06-09  2170  		pnfs_read_through_mds(desc, hdr);
493292dd Trond Myklebust       2011-07-13  2171  }
493292dd Trond Myklebust       2011-07-13  2172  

:::::: The code at line 2164 was first introduced by commit
:::::: ceb11e13df3e78b450730c615037133c57b90c3b pnfs: allow LD to ask to resend read through pnfs

:::::: TO: Peng Tao <tao.peng@primarydata.com>
:::::: CC: Tom Haynes <loghyr@primarydata.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Weston Andros Adamson April 1, 2016, 3:43 p.m. UTC | #2 
> On Apr 1, 2016, at 11:28 AM, kbuild test robot <lkp@intel.com> wrote:
> 
> Hi Weston,
> 
> [auto build test WARNING on v4.6-rc1]
> [also build test WARNING on next-20160401]
> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
> 
> url:    https://github.com/0day-ci/linux/commits/Weston-Andros-Adamson/pnfs-set-NFS_IOHDR_REDO-in-pnfs_read_resend_pnfs/20160401-223208
> config: i386-allmodconfig (attached as .config)
> reproduce:
>        # save the attached .config to linux build tree
>        make ARCH=i386 
> 
> All warnings (new ones prefixed by >>):
> 
>   fs/nfs/pnfs.c: In function 'pnfs_do_read':
>>> fs/nfs/pnfs.c:2164:6: warning: unused variable 'err' [-Wunused-variable]
>     int err = 0;
>         ^

Thanks bot! Fixed and reposted.

-dros

> 
> vim +/err +2164 fs/nfs/pnfs.c
> 
> ceb11e13 Peng Tao              2014-11-10  2148  	struct nfs_pageio_descriptor pgio;
> ceb11e13 Peng Tao              2014-11-10  2149  
> a5073dc2 Weston Andros Adamson 2016-04-01  2150  	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
> a5073dc2 Weston Andros Adamson 2016-04-01  2151  		nfs_pageio_init_read(&pgio, hdr->inode, false,
> a5073dc2 Weston Andros Adamson 2016-04-01  2152  					hdr->completion_ops);
> a5073dc2 Weston Andros Adamson 2016-04-01  2153  		hdr->task.tk_status = nfs_pageio_resend(&pgio, hdr);
> a5073dc2 Weston Andros Adamson 2016-04-01  2154  	}
> ceb11e13 Peng Tao              2014-11-10  2155  }
> ceb11e13 Peng Tao              2014-11-10  2156  EXPORT_SYMBOL_GPL(pnfs_read_resend_pnfs);
> ceb11e13 Peng Tao              2014-11-10  2157  
> 493292dd Trond Myklebust       2011-07-13  2158  static void
> 7f714720 Weston Andros Adamson 2014-05-15  2159  pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)
> 493292dd Trond Myklebust       2011-07-13  2160  {
> 493292dd Trond Myklebust       2011-07-13  2161  	const struct rpc_call_ops *call_ops = desc->pg_rpc_callops;
> 493292dd Trond Myklebust       2011-07-13  2162  	struct pnfs_layout_segment *lseg = desc->pg_lseg;
> 493292dd Trond Myklebust       2011-07-13  2163  	enum pnfs_try_status trypnfs;
> ceb11e13 Peng Tao              2014-11-10 @2164  	int err = 0;
> 493292dd Trond Myklebust       2011-07-13  2165  
> d45f60c6 Weston Andros Adamson 2014-06-09  2166  	trypnfs = pnfs_try_to_read_data(hdr, call_ops, lseg);
> ceb11e13 Peng Tao              2014-11-10  2167  	if (trypnfs == PNFS_TRY_AGAIN)
> a5073dc2 Weston Andros Adamson 2016-04-01  2168  		pnfs_read_resend_pnfs(hdr);
> a5073dc2 Weston Andros Adamson 2016-04-01  2169  	if (trypnfs == PNFS_NOT_ATTEMPTED || hdr->task.tk_status)
> d45f60c6 Weston Andros Adamson 2014-06-09  2170  		pnfs_read_through_mds(desc, hdr);
> 493292dd Trond Myklebust       2011-07-13  2171  }
> 493292dd Trond Myklebust       2011-07-13  2172  
> 
> :::::: The code at line 2164 was first introduced by commit
> :::::: ceb11e13df3e78b450730c615037133c57b90c3b pnfs: allow LD to ask to resend read through pnfs
> 
> :::::: TO: Peng Tao <tao.peng@primarydata.com>
> :::::: CC: Tom Haynes <loghyr@primarydata.com>
> 
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
> <.config.gz>

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 2fa483e6dbe2..da90d665b01f 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2143,12 +2143,15 @@  pnfs_try_to_read_data(struct nfs_pgio_header *hdr,
 }
 
 /* Resend all requests through pnfs. */
-int pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr)
+void pnfs_read_resend_pnfs(struct nfs_pgio_header *hdr)
 {
 	struct nfs_pageio_descriptor pgio;
 
-	nfs_pageio_init_read(&pgio, hdr->inode, false, hdr->completion_ops);
-	return nfs_pageio_resend(&pgio, hdr);
+	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
+		nfs_pageio_init_read(&pgio, hdr->inode, false,
+					hdr->completion_ops);
+		hdr->task.tk_status = nfs_pageio_resend(&pgio, hdr);
+	}
 }
 EXPORT_SYMBOL_GPL(pnfs_read_resend_pnfs);
 
@@ -2162,8 +2165,8 @@  pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)
 
 	trypnfs = pnfs_try_to_read_data(hdr, call_ops, lseg);
 	if (trypnfs == PNFS_TRY_AGAIN)
-		err = pnfs_read_resend_pnfs(hdr);
-	if (trypnfs == PNFS_NOT_ATTEMPTED || err)
+		pnfs_read_resend_pnfs(hdr);
+	if (trypnfs == PNFS_NOT_ATTEMPTED || hdr->task.tk_status)
 		pnfs_read_through_mds(desc, hdr);
 }
 
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 1ac1db5f6dad..7222d3a35439 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -282,7 +282,7 @@  int _pnfs_return_layout(struct inode *);
 int pnfs_commit_and_return_layout(struct inode *);
 void pnfs_ld_write_done(struct nfs_pgio_header *);
 void pnfs_ld_read_done(struct nfs_pgio_header *);
-int pnfs_read_resend_pnfs(struct nfs_pgio_header *);
+void pnfs_read_resend_pnfs(struct nfs_pgio_header *);
 struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino,
 					       struct nfs_open_context *ctx,
 					       loff_t pos,