Skip to contentSkip to conversation

mm/slub: remove duplicate flag in allocate_slab()

PATCH In review Jiyoup Kim 5 participants 5 messages Apr 9, 2022 – Apr 12, 2022

Subsystems (2)
lore
Share & tools
lore

Jiyoup Kim

author
#0 lore raw

PATCH 1/1 mm/slub: remove duplicate flag in allocate_slab()

In allocate_slab(), __GFP_NOFAIL flag is removed twice when trying higher-order allocation. Remove it.

---
 mm/slub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +1 -1
index 74d92aa4a3a2..a0e605ab3036 100644
@@ -1939,7 +1939,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 	 */
 	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;
 	if ((alloc_gfp & __GFP_DIRECT_RECLAIM) && oo_order(oo) > oo_order(s->min))
-		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~(__GFP_RECLAIM|__GFP_NOFAIL);
+		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~__GFP_RECLAIM;
 
 	slab = alloc_slab_page(alloc_gfp, node, oo);
 	if (unlikely(!slab)) {
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Jiyoup Kim

In allocate_slab(), __GFP_NOFAIL flag is removed twice when trying higher-order allocation. Remove it.

---
 mm/slub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +0 -0
index 74d92aa4a3a2..a0e605ab3036 100644

mm/slub.c static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) · line 1945

Quoted 8 lines
mm/slub.c +1 -1
@@ -1939,7 +1939,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 	 */
 	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;
 	if ((alloc_gfp & __GFP_DIRECT_RECLAIM) && oo_order(oo) > oo_order(s->min))
-		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~(__GFP_RECLAIM|__GFP_NOFAIL);
+		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~__GFP_RECLAIM;
 
 	slab = alloc_slab_page(alloc_gfp, node, oo);
 	if (unlikely(!slab)) {

Looks good to me.

Thanks!

Quoted 4 lines
Signature · 1 line
2.25.1
Signature · 2 lines
Thanks,
Hyeonggon
#3 lore raw
In reply to Jiyoup Kim
Quoted 4 lines · Jiyoup Kim

In allocate_slab(), __GFP_NOFAIL flag is removed twice when trying higher-order allocation. Remove it.

Thanks, added.

Quoted 17 lines
---
 mm/slub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +1 -1
index 74d92aa4a3a2..a0e605ab3036 100644
@@ -1939,7 +1939,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 	 */
 	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;
 	if ((alloc_gfp & __GFP_DIRECT_RECLAIM) && oo_order(oo) > oo_order(s->min))
-		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~(__GFP_RECLAIM|__GFP_NOFAIL);
+		alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~__GFP_RECLAIM;
 
 	slab = alloc_slab_page(alloc_gfp, node, oo);
 	if (unlikely(!slab)) {