| Message ID | 20220605152539.3196045-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] mm/page_alloc: use might_alloc() | expand |
On 6/5/22 17:25, Daniel Vetter wrote: > mempool are generally used for GFP_NOIO, so this wont benefit all that > much because might_alloc currently only checks GFP_NOFS. But it does > validate against mmu notifier pte zapping, some might catch some > drivers doing really silly things, plus it's a bit more meaningful in > what we're checking for here. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org Reviewed-by: Vlastimil Babka <vbabka@suse.cz> > --- > mm/mempool.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/mempool.c b/mm/mempool.c > index b933d0fc21b8..96488b13a1ef 100644 > --- a/mm/mempool.c > +++ b/mm/mempool.c > @@ -379,7 +379,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) > gfp_t gfp_temp; > > VM_WARN_ON_ONCE(gfp_mask & __GFP_ZERO); > - might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); > + might_alloc(gfp_mask); > > gfp_mask |= __GFP_NOMEMALLOC; /* don't allocate emergency reserves */ > gfp_mask |= __GFP_NORETRY; /* don't loop in __alloc_pages */
diff --git a/mm/mempool.c b/mm/mempool.c index b933d0fc21b8..96488b13a1ef 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -379,7 +379,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) gfp_t gfp_temp; VM_WARN_ON_ONCE(gfp_mask & __GFP_ZERO); - might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); + might_alloc(gfp_mask); gfp_mask |= __GFP_NOMEMALLOC; /* don't allocate emergency reserves */ gfp_mask |= __GFP_NORETRY; /* don't loop in __alloc_pages */
mempool are generally used for GFP_NOIO, so this wont benefit all that much because might_alloc currently only checks GFP_NOFS. But it does validate against mmu notifier pte zapping, some might catch some drivers doing really silly things, plus it's a bit more meaningful in what we're checking for here. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org --- mm/mempool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)