Commit b09a719f authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Stefan Bader

NFS: Use GFP_NOIO for two allocations in writeback

BugLink: https://bugs.launchpad.net/bugs/1750038

Prevent a deadlock that can occur if we wait on allocations
that try to write back our pages.
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Fixes: 00bfa30a ("NFS: Create a common pgio_alloc and pgio_release...")
Cc: stable@vger.kernel.org # 3.16+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
(backported from commit ae97aa52)
Signed-off-by: default avatarDaniel Axtens <daniel.axtens@canonical.com>
Acked-by: default avatarJuerg Haefliger <juerg.haefliger@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent db4fd0b0
...@@ -29,13 +29,14 @@ ...@@ -29,13 +29,14 @@
static struct kmem_cache *nfs_page_cachep; static struct kmem_cache *nfs_page_cachep;
static const struct rpc_call_ops nfs_pgio_common_ops; static const struct rpc_call_ops nfs_pgio_common_ops;
static bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount) static bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount,
gfp_t gfp_flags)
{ {
p->npages = pagecount; p->npages = pagecount;
if (pagecount <= ARRAY_SIZE(p->page_array)) if (pagecount <= ARRAY_SIZE(p->page_array))
p->pagevec = p->page_array; p->pagevec = p->page_array;
else { else {
p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_KERNEL); p->pagevec = kcalloc(pagecount, sizeof(struct page *), gfp_flags);
if (!p->pagevec) if (!p->pagevec)
p->npages = 0; p->npages = 0;
} }
...@@ -722,6 +723,7 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, ...@@ -722,6 +723,7 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
{ {
struct nfs_pgio_mirror *new; struct nfs_pgio_mirror *new;
int i; int i;
gfp_t gfp_flags = GFP_KERNEL;
desc->pg_moreio = 0; desc->pg_moreio = 0;
desc->pg_inode = inode; desc->pg_inode = inode;
...@@ -741,8 +743,10 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, ...@@ -741,8 +743,10 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
if (pg_ops->pg_get_mirror_count) { if (pg_ops->pg_get_mirror_count) {
/* until we have a request, we don't have an lseg and no /* until we have a request, we don't have an lseg and no
* idea how many mirrors there will be */ * idea how many mirrors there will be */
if (desc->pg_rw_ops->rw_mode == FMODE_WRITE)
gfp_flags = GFP_NOIO;
new = kcalloc(NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX, new = kcalloc(NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX,
sizeof(struct nfs_pgio_mirror), GFP_KERNEL); sizeof(struct nfs_pgio_mirror), gfp_flags);
desc->pg_mirrors_dynamic = new; desc->pg_mirrors_dynamic = new;
desc->pg_mirrors = new; desc->pg_mirrors = new;
...@@ -796,10 +800,14 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, ...@@ -796,10 +800,14 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
struct list_head *head = &mirror->pg_list; struct list_head *head = &mirror->pg_list;
struct nfs_commit_info cinfo; struct nfs_commit_info cinfo;
unsigned int pagecount, pageused; unsigned int pagecount, pageused;
gfp_t gfp_flags = GFP_KERNEL;
pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count); pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count);
if (!nfs_pgarray_set(&hdr->page_array, pagecount)) if (desc->pg_rw_ops->rw_mode == FMODE_WRITE)
gfp_flags = GFP_NOIO;
if (!nfs_pgarray_set(&hdr->page_array, pagecount, gfp_flags)) {
return nfs_pgio_error(desc, hdr); return nfs_pgio_error(desc, hdr);
}
nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq); nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq);
pages = hdr->page_array.pagevec; pages = hdr->page_array.pagevec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment