UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Avoid writeback threads getting stuck in mempool_alloc() 

In a low memory situation, allow the NFS writeback code to fail without
getting stuck in infinite loops in mempool_alloc().

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2022-03-21 13:48:36 -04:00
parent 515dcdcd48
commit 0bae835b63
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/pagelist.c
View File

@ -90,10 +90,10 @@ void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos)
} }
} }
static inline struct nfs_page * static inline struct nfs_page *nfs_page_alloc(void)
nfs_page_alloc(void)
{ {
struct nfs_page *p = kmem_cache_zalloc(nfs_page_cachep, GFP_KERNEL); struct nfs_page *p =
kmem_cache_zalloc(nfs_page_cachep, nfs_io_gfp_mask());
if (p) if (p)
INIT_LIST_HEAD(&p->wb_list); INIT_LIST_HEAD(&p->wb_list);
return p; return p;
@ -892,7 +892,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
struct nfs_commit_info cinfo; struct nfs_commit_info cinfo;
struct nfs_page_array *pg_array = &hdr->page_array; struct nfs_page_array *pg_array = &hdr->page_array;
unsigned int pagecount, pageused; unsigned int pagecount, pageused;
gfp_t gfp_flags = GFP_KERNEL; gfp_t gfp_flags = nfs_io_gfp_mask();
pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count); pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count);
pg_array->npages = pagecount; pg_array->npages = pagecount;
@ -979,7 +979,7 @@ nfs_pageio_alloc_mirrors(struct nfs_pageio_descriptor *desc,
desc->pg_mirrors_dynamic = NULL; desc->pg_mirrors_dynamic = NULL;
if (mirror_count == 1) if (mirror_count == 1)
return desc->pg_mirrors_static; return desc->pg_mirrors_static;
ret = kmalloc_array(mirror_count, sizeof(*ret), GFP_KERNEL); ret = kmalloc_array(mirror_count, sizeof(*ret), nfs_io_gfp_mask());
if (ret != NULL) { if (ret != NULL) {
for (i = 0; i < mirror_count; i++) for (i = 0; i < mirror_count; i++)
nfs_pageio_mirror_init(&ret[i], desc->pg_bsize); nfs_pageio_mirror_init(&ret[i], desc->pg_bsize);

8
fs/nfs/write.c
View File

@ -94,9 +94,15 @@ EXPORT_SYMBOL_GPL(nfs_commit_free);
static struct nfs_pgio_header *nfs_writehdr_alloc(void) static struct nfs_pgio_header *nfs_writehdr_alloc(void)
{ {
struct nfs_pgio_header *p = mempool_alloc(nfs_wdata_mempool, GFP_KERNEL); struct nfs_pgio_header *p;
p = kmem_cache_zalloc(nfs_wdata_cachep, nfs_io_gfp_mask());
if (!p) {
p = mempool_alloc(nfs_wdata_mempool, GFP_NOWAIT);
if (!p)
return NULL;
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
}
p->rw_mode = FMODE_WRITE; p->rw_mode = FMODE_WRITE;
return p; return p;
} }