05 Apr, 2016
2 commits
-
Mostly direct substitution with occasional adjustment or removing
outdated comments.Signed-off-by: Kirill A. Shutemov
Acked-by: Michal Hocko
Signed-off-by: Linus Torvalds -
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.Let's stop pretending that pages in page cache are special. They are
not.The changes are pretty straight-forward:
- << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> ;
- >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> ;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)Signed-off-by: Kirill A. Shutemov
Acked-by: Michal Hocko
Signed-off-by: Linus Torvalds
11 Jun, 2015
1 commit
-
This was only ever set to nfs_writeback_release_common(), a function
which is completely empty. Let's just drop this function pointer and
simplify the code a bit.Signed-off-by: Anna Schumaker
Signed-off-by: Trond Myklebust
04 Feb, 2015
3 commits
-
This patch adds mirrored write support to the pgio layer. The default
is to use one mirror, but pgio callers may define callbacks to change
this to any value up to the (arbitrarily selected) limit of 16.The basic idea is to break out members of nfs_pageio_descriptor that cannot
be shared between mirrored DSes and put them in a new structure.Signed-off-by: Weston Andros Adamson
-
Add a new operation to nfs_pageio_ops that is called on nfs_pageio_complete.
Signed-off-by: Weston Andros Adamson
-
Signed-off-by: Tom Haynes
23 Aug, 2014
1 commit
-
This handles the 'nonblock=false' case in nfs_lock_and_join_requests.
If the group is already locked and blocking is allowed, drop the inode lock
and wait for the group lock to be cleared before trying it all again.
This should fix warnings found in peterz's tree (sched/wait branch), where
might_sleep() checks are added to wait.[ch].Reported-by: Fengguang Wu
Signed-off-by: Weston Andros Adamson
Reviewed-by: Peng Tao
Signed-off-by: Trond Myklebust
04 Aug, 2014
2 commits
-
Fix the comment in nfs_page.h for PG_INODE_REF to reflect that it's no longer
set only on head requests. Also add a WARN_ON_ONCE in nfs_inode_remove_request
as PG_INODE_REF should always be set.Suggested-by: Peng Tao
Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
Return errors from wait_on_bit_lock from nfs_page_group_lock.
Add a bool argument @wait to nfs_page_group_lock. If true, loop over
wait_on_bit_lock until it returns cleanly. If false, return the error
from wait_on_bit_lock.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust
25 Jun, 2014
3 commits
-
Clean up pnfs_read_done_resend_to_mds and pnfs_write_done_resend_to_mds:
- instead of passing all arguments from a nfs_pgio_header, just pass the header
- share the common codeReviewed-by: Christoph Hellwig
Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
struct nfs_pgio_data only exists as a member of nfs_pgio_header, but is
passed around everywhere, because there used to be multiple _data structs
per _header. Many of these functions then use the _data to find a pointer
to the _header. This patch cleans this up by merging the nfs_pgio_data
structure into nfs_pgio_header and passing nfs_pgio_header around instead.Reviewed-by: Christoph Hellwig
Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
nfs_rw_header was used to allocate an nfs_pgio_header along with an
nfs_pgio_data, because a _header would need at least one _data.Now there is only ever one nfs_pgio_data for each nfs_pgio_header -- move
it to nfs_pgio_header and get rid of nfs_rw_header.Reviewed-by: Christoph Hellwig
Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust
29 May, 2014
10 commits
-
Operations that modify state for a whole page must be syncronized across
all requests within a page group. In the write path, this is calling
end_page_writeback and removing the head request from an inode.
Both of these operations should not be called until all requests
in a page group have reached the point where they would call them.This patch should have no effect yet since all page groups currently
have one request, but will come into play when pg_test functions are
modified to split pages into sub-page regions.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
Operations that modify state for a whole page must be syncronized across
all requests within a page group. In the read path, this is calling
unlock_page and SetPageUptodate. Both of these functions should not be
called until all requests in a page group have reached the point where
they would call them.This patch should have no effect yet since all page groups currently
have one request, but will come into play when pg_test functions are
modified to split pages into sub-page regions.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
Add "page groups" - a circular list of nfs requests (struct nfs_page)
that all reference the same page. This gives nfs read and write paths
the ability to account for sub-page regions independently. This
somewhat follows the design of struct buffer_head's sub-page
accounting.Only "head" requests are ever added/removed from the inode list in
the buffered write path. "head" and "sub" requests are treated the
same through the read path and the rest of the write/commit path.
Requests are given an extra reference across the life of the list.Page groups are never rejoined after being split. If the read/write
request fails and the client falls back to another path (ie revert
to MDS in PNFS case), the already split requests are pushed through
the recoalescing code again, which may split them further and then
coalesce them into properly sized requests on the wire. Fragmentation
shouldn't be a problem with the current design, because we flush all
requests in page group when a non-contiguous request is added, so
the only time resplitting should occur is on a resend of a read or
write.This patch lays the groundwork for sub-page splitting, but does not
actually do any splitting. For now all page groups have one request
as pg_test functions don't yet split pages. There are several related
patches that are needed support multiple requests per page group.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
This is a step toward allowing pg_test to inform the the
coalescing code to reduce the size of requests so they may fit in
whatever scheme the pg_test callback wants to define.For now, just return the size of the request if there is space, or 0
if there is not. This shouldn't change any behavior as it acts
the same as when the pg_test functions returned bool.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
@inode is passed but not used.
Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
Remove unused flags PG_NEED_COMMIT and PG_NEED_RESCHED.
Add comments describing how each flag is used.Signed-off-by: Weston Andros Adamson
Signed-off-by: Trond Myklebust -
Most of this code is the same for both the read and write paths, so
combine everything and use the rw_ops when necessary.Signed-off-by: Anna Schumaker
Signed-off-by: Trond Myklebust -
Combining these functions will let me make a single nfs_rw_common_ops
struct (see the next patch).Signed-off-by: Anna Schumaker
Signed-off-by: Trond Myklebust -
The read and write paths do exactly the same thing for the rpc_prepare
rpc_op. This patch combines them together into a single function.Signed-off-by: Anna Schumaker
Signed-off-by: Trond Myklebust -
I create a new struct nfs_rw_ops to decide the differences between reads
and writes. This struct will be set when initializing a new
nfs_pgio_descriptor, and then passed on to the nfs_rw_header when a new
header is allocated.Signed-off-by: Anna Schumaker
Signed-off-by: Trond Myklebust
03 Aug, 2012
1 commit
-
To allow layout driver to pass private information around
pg_init/pg_doio.Signed-off-by: Peng Tao
Signed-off-by: Boaz Harrosh
Signed-off-by: Trond Myklebust
29 Jun, 2012
1 commit
-
The 'committed' field is not needed once we have put the struct nfs_page
on the right list.Also correct the type of the verifier: it is not an array of __be32, but
simply an 8 byte long opaque array.Signed-off-by: Trond Myklebust
10 May, 2012
3 commits
-
Function rename to ensure that the functionality of nfs_unlock_request()
mirrors that of nfs_lock_request(). Then let nfs_unlock_and_release_request()
do the work of what used to be called nfs_unlock_request()...Signed-off-by: Trond Myklebust
Cc: Fred Isaman -
We only have two places where we need to grab a reference when trying
to lock the nfs_page. We're better off making that explicit.Signed-off-by: Trond Myklebust
Cc: Fred Isaman -
We have to unlock the nfs_page before we call nfs_end_page_writeback
to avoid races with functions that expect the page to be unlocked
when PG_locked and PG_writeback are not set.
The problem is that nfs_unlock_request also releases the nfs_page,
causing a deadlock if the release of the nfs_open_context
triggers an iput() while the PG_writeback flag is still set...The solution is to separate the unlocking and release of the nfs_page,
so that we can do the former before nfs_end_page_writeback and the
latter after.Signed-off-by: Trond Myklebust
Cc: Fred Isaman
28 Apr, 2012
4 commits
-
This also has the advantage that it allows directio to use pnfs.
Signed-off-by: Fred Isaman
Signed-off-by: Trond Myklebust -
Signed-off-by: Fred Isaman
Signed-off-by: Trond Myklebust -
Factors out the code that will need to change when directio
starts using these code paths. This will allow directio to use
the generic pagein and flush routinesSigned-off-by: Fred Isaman
Signed-off-by: Trond Myklebust -
Decouple nfs_pgio_header and nfs_read_data, and have (possibly
multiple) nfs_read_datas each take a refcount on nfs_pgio_header.For the moment keeps nfs_read_header as a way to preallocate a single
nfs_read_data with the nfs_pgio_header. The code doesn't need this,
and would be prettier without, but given the amount of churn I am
already introducing I didn't want to play with tuning new mempools.This also fixes bug in pnfs_ld_handle_read_error. In the case of
desc->pg_bsize < PAGE_CACHE_SIZE, the pages list was empty, causing
replay attempt to do nothing.Signed-off-by: Fred Isaman
Signed-off-by: Trond Myklebust
17 Mar, 2012
1 commit
-
Move more pnfs-isms out of the generic commit code.
Bugfixes:
- filelayout_scan_commit_lists doesn't need to get/put the lseg.
In fact since it is run under the inode->i_lock, the lseg_put()
can deadlock.- Ensure that we distinguish between what needs to be done for
commit-to-data server and what needs to be done for commit-to-MDS
using the new flag PG_COMMIT_TO_DS. Otherwise we may end up calling
put_lseg() on a bucket for a struct nfs_page that got written
through the MDS.- Fix a case where we were using list_del() on an nfs_page->wb_list
instead of list_del_init().- filelayout_initiate_commit needs to call filelayout_commit_release
on error instead of the mds_ops->rpc_release(). Otherwise it won't
clear the commit lock.Cleanups:
- Let the files layout manage the commit lists for the pNFS case.
Don't expose stuff like pnfs_choose_commit_list, and the fact
that the commit buckets hold references to the layout segment
in common code.- Cast out the put_lseg() calls for the struct nfs_read/write_data->lseg
into the pNFS layer from whence they came.- Let the pNFS layer manage the NFS_INO_PNFS_COMMIT bit.
Signed-off-by: Trond Myklebust
Cc: Fred Isaman
11 Mar, 2012
2 commits
-
The radix tree is only being used to compile lists of reqs needing commit.
It is simpler to just put the reqs directly into a list.Signed-off-by: Fred Isaman
Signed-off-by: Trond Myklebust -
The last real use of this tag was removed by
commit 7f2f12d963 NFS: Simplify nfs_wb_page()Signed-off-by: Fred Isaman
Signed-off-by: Trond Myklebust
20 Oct, 2011
1 commit
-
Don't rely on the PageError flag to tell us if one of the partial reads of
the page failed. Instead, replace that with a dedicated flag in the
struct nfs_page.Then clean out redundant uses of the PageError flag: the VM no longer
checks it for reads.Signed-off-by: Trond Myklebust
15 Jul, 2011
4 commits
-
...and ensure that we recoalese to take into account differences in
differences in block sizes when falling back to write through the MDS.Signed-off-by: Trond Myklebust
-
...and ensure that we recoalese to take into account differences in
block sizes when falling back to read through the MDS.Signed-off-by: Trond Myklebust
-
If an attempt to do pNFS fails, and we have to fall back to writing through
the MDS, then we may want to re-coalesce the requests that we already have
since the block size for the MDS read/writes may be different to that of
the DS read/writes.Signed-off-by: Trond Myklebust
-
Signed-off-by: Trond Myklebust
13 Jul, 2011
1 commit
-
Ensure that we always get a layout before setting up the i/o request.
Signed-off-by: Trond Myklebust