nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

NFS: Try to join page groups before an O_DIRECT retransmission

Browse source 
If we have to retransmit requests, try to join their page groups
first.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2020-03-30 20:57:49 -04:00
parent e00ed89d7b
commit ed5d588fe4
3 changed files with 22 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
fs/nfs/direct.c
View file

@ -505,6 +505,24 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter)
return result; return result;
} }
static void
nfs_direct_join_group(struct list_head *list, struct inode *inode)
{
struct nfs_page *req, *next;
list_for_each_entry(req, list, wb_list) {
if (req->wb_head != req || req->wb_this_page == req)
continue;
for (next = req->wb_this_page;
next != req->wb_head;
next = next->wb_this_page) {
nfs_list_remove_request(next);
nfs_release_request(next);
}
nfs_join_page_group(req, inode);
}
}
static void static void
nfs_direct_write_scan_commit_list(struct inode *inode, nfs_direct_write_scan_commit_list(struct inode *inode,
struct list_head *list, struct list_head *list,
@ -527,6 +545,8 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
nfs_init_cinfo_from_dreq(&cinfo, dreq); nfs_init_cinfo_from_dreq(&cinfo, dreq);
nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo); nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);
nfs_direct_join_group(&reqs, dreq->inode);
dreq->count = 0; dreq->count = 0;
dreq->max_count = 0; dreq->max_count = 0;
list_for_each_entry(req, &reqs, wb_list) list_for_each_entry(req, &reqs, wb_list)

2
fs/nfs/write.c
View file

@ -501,7 +501,7 @@ nfs_destroy_unlinked_subrequests(struct nfs_page *destroy_list,
* the (former) group. All subrequests are removed from any write or commit * the (former) group. All subrequests are removed from any write or commit
* lists, unlinked from the group and destroyed. * lists, unlinked from the group and destroyed.
*/ */
static void void
nfs_join_page_group(struct nfs_page *head, struct inode *inode) nfs_join_page_group(struct nfs_page *head, struct inode *inode)
{ {
struct nfs_page *subreq; struct nfs_page *subreq;

1
include/linux/nfs_page.h
View file

@ -141,6 +141,7 @@ extern void nfs_unlock_request(struct nfs_page *req);
extern void nfs_unlock_and_release_request(struct nfs_page *); extern void nfs_unlock_and_release_request(struct nfs_page *);
extern struct nfs_page *nfs_page_group_lock_head(struct nfs_page *req); extern struct nfs_page *nfs_page_group_lock_head(struct nfs_page *req);
extern int nfs_page_group_lock_subrequests(struct nfs_page *head); extern int nfs_page_group_lock_subrequests(struct nfs_page *head);
extern void nfs_join_page_group(struct nfs_page *head, struct inode *inode);
extern int nfs_page_group_lock(struct nfs_page *); extern int nfs_page_group_lock(struct nfs_page *);
extern void nfs_page_group_unlock(struct nfs_page *); extern void nfs_page_group_unlock(struct nfs_page *);
extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int); extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);