vduse-avoid-using-__gfp_nofail.patch removed from -mm tree
The quilt patch titled
Subject: vduse: avoid using __GFP_NOFAIL
has been removed from the -mm tree. Its filename was
vduse-avoid-using-__gfp_nofail.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Jason Wang <[email protected]>
Subject: vduse: avoid using __GFP_NOFAIL
Date: Sat, 31 Aug 2024 08:28:21 +1200
Patch series "mm/vdpa: correct misuse of non-direct-reclaim __GFP_NOFAIL and improve related doc and warn", v4.
__GFP_NOFAIL carries the semantics of never failing, so its callers do not check the return value:
%__GFP_NOFAIL: The VM implementation _must_ retry infinitely: the caller cannot handle allocation failures. The allocation could block indefinitely but will never return with failure. Testing for failure is pointless.
However, __GFP_NOFAIL can sometimes fail if it exceeds size limits or is used with GFP_ATOMIC/GFP_NOWAIT in a non-sleepable context. This patchset handles illegal using __GFP_NOFAIL together with GFP_ATOMIC lacking __GFP_DIRECT_RECLAIM(without this, we can't do anything to reclaim memory to satisfy the nofail requirement) and improve related document and warnings.
The proper size limits for __GFP_NOFAIL will be handled separately after more discussions.
This patch (of 3):
mm doesn't support non-blockable __GFP_NOFAIL allocation. Because persisting in providing __GFP_NOFAIL services for non-block users who cannot perform direct memory reclaim may only result in an endless busy loop.
Therefore, in such cases, the current mm-core may directly return a NULL pointer:
static inline struct page *
__alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
struct alloc_context *ac)
{
...
if (gfp_mask & __GFP_NOFAIL) {
/*
* All existing users of the __GFP_NOFAIL are blockable, so warn
* of any new users that actually require GFP_NOWAIT
*/
if (WARN_ON_ONCE_GFP(!can_direct_reclaim, gfp_mask))
goto fail;
...
}
...
fail:
warn_alloc(gfp_mask, ac->nodemask,
"page allocation failure: order:%u", order);
got_pg:
return page;
}Unfortuantely, vpda does that nofail allocation under non-sleepable lock. A possible way to fix that is to move the pages allocation out of the lock into the caller, but having to allocate a huge number of pages and auxiliary page array seems to be problematic as well per Tetsuon: " You should implement proper error handling instead of using __GFP_NOFAIL if count can become large."
So I chose another way, which does not release kernel bounce pages when user tries to register userspace bounce pages. Then we can avoid allocating in paths where failure is not expected.(e.g in the release). We pay this for more memory usage as we don't release kernel bounce pages but further optimizations could be done on top.
---
drivers/vdpa/vdpa_user/iova_domain.c | 19 +++++++++++-------- drivers/vdpa/vdpa_user/iova_domain.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/vdpa/vdpa_user/iova_domain.c renamed from drivers/vdpa/vdpa_user/iova_domain.c~vduse-avoid-using-__gfp_nofail +11 -8
@@ -162,6 +162,7 @@ static void vduse_domain_bounce(struct v enum dma_data_direction dir) {struct vduse_bounce_map *map; +struct page *page;unsigned int offset;void *addr;size_t sz;
@@ -178,7 +179,10 @@ static void vduse_domain_bounce(struct v map->orig_phys == INVALID_PHYS_ADDR))return ; - addr =kmap_local_page (map->bounce_page); + page = domain->user_bounce_pages ? + map->user_bounce_page : map->bounce_page; + + addr =kmap_local_page (page);do_bounce (map->orig_phys + offset, addr + offset, sz, dir);kunmap_local (addr); size -= sz;
@@ -270,9 +274,8 @@ int vduse_domain_add_user_bounce_pages(smemcpy_to_page (pages[i],0 ,page_address (map->bounce_page),PAGE_SIZE ); -__free_page (map->bounce_page); } - map->bounce_page = pages[i]; + map->user_bounce_page = pages[i];get_page (pages[i]); } domain->user_bounce_pages = true;
@@ -297,17 +300,17 @@ void vduse_domain_remove_user_bounce_pagstruct page *page =NULL ; map = &domain->bounce_maps[i]; -if (WARN_ON (!map->bounce_page)) +if (WARN_ON (!map->user_bounce_page))continue ;/* Copy user page to kernel page if it's in use */ if (map->orig_phys !=INVALID_PHYS_ADDR ) { - page =alloc_page (GFP_ATOMIC | __GFP_NOFAIL); + page = map->bounce_page;memcpy_from_page (page_address (page), - map->bounce_page,0 ,PAGE_SIZE ); + map->user_bounce_page,0 ,PAGE_SIZE ); } -put_page (map->bounce_page); - map->bounce_page = page; +put_page (map->user_bounce_page); + map->user_bounce_page =NULL ; } domain->user_bounce_pages = false; out:
drivers/vdpa/vdpa_user/iova_domain.h renamed from drivers/vdpa/vdpa_user/iova_domain.h~vduse-avoid-using-__gfp_nofail +1 -0
@@ -21,6 +21,7 @@struct vduse_bounce_map {struct page *bounce_page; +struct page *user_bounce_page;u64 orig_phys; };
_
Patches currently in -mm which might be from [email protected] are