From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE27C433DF for ; Sat, 4 Jul 2020 02:26:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B3918206BE for ; Sat, 4 Jul 2020 02:26:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rm8MxnE+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3918206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4ECC28D0010; Fri, 3 Jul 2020 22:26:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 476A28D0001; Fri, 3 Jul 2020 22:26:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 364D48D0010; Fri, 3 Jul 2020 22:26:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0224.hostedemail.com [216.40.44.224]) by kanga.kvack.org (Postfix) with ESMTP id 1D25C8D0001 for ; Fri, 3 Jul 2020 22:26:21 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 826F12C89 for ; Sat, 4 Jul 2020 02:26:20 +0000 (UTC) X-FDA: 76998804120.02.linen04_420aa7626e96 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 6507110009D64F5E for ; Sat, 4 Jul 2020 02:26:20 +0000 (UTC) X-HE-Tag: linen04_420aa7626e96 X-Filterd-Recvd-Size: 7196 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Sat, 4 Jul 2020 02:26:19 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id bj10so7995546plb.11 for ; Fri, 03 Jul 2020 19:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=II51EPnwJMOcWdyoUw4YLKaIG/nNyOclkFIQIjarNH4=; b=Rm8MxnE+oHihWZAqkvp4NnmGLRTm8jSnNA84QbZvP2arD5J6WGID48Bi/p4wh0Jtvz JHifwq1QbLFwUGYElm35vm9AuuA+IwTIF2glcgYgaGubtxXDUintL3zbRWBGeAVLOIbv lZIyi6/VfBeeX/v7WRadjoo61XmZmolbItsO8oBO6fJucAln+UbKs1aEFZBPkKx/6YnQ Ocd6NmLgLTJxwfseqoVd6FLVhwFGThfRQdoCKBUcm5WqNGE6HW35oHVQjfPUewGoxFKh O6ikFOXNP9u9IP7CLYpOvHI8gYkGlrR1xl0UBqtgVCiY31s1Ppj/ijazJ9GvU6N2mG6O MrrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=II51EPnwJMOcWdyoUw4YLKaIG/nNyOclkFIQIjarNH4=; b=fmcQ/kpWGg2yZtle+2QT9HU8dHZ3Ka7gkwsk69amlVQjr1r6HZRsREKcBZxip8snPu D2l+wM86tIY2My3nFLaLLNMwUxDdi5p5+nO1gmEF7XZJepWPuvAMmQIzhL83p/FsDV92 4Av3GsZ2Hbn8hGWYF3QgsZOevo/Rb02hiPjd5KCzMsd0NLtWtxcqtT/Vp4//Qc8sxZOr V47reSsx+bdg90GajiEhjZzPiI91zHhX2gAIV3HZJknraHdEjHfBFbicSJ83whH07eJd S5sFZ01Yzkqt0NRkwKrN1vynBKzYzHJJxuMPcYfagYVdv+k+V9xyhfvijhGVYRxqRK/f 6onQ== X-Gm-Message-State: AOAM5339PtnfwlrjV3Xkl7u1vynM3IExJjZ9ww340oYzjG+C0K3VhRyG SEhuM3zKA2IcO3W0q7Fu8ls= X-Google-Smtp-Source: ABdhPJyH4XebO/kP4WJauzJvCQRtSMVRpC+gNzBwtz3xILGxHzM8hmdaOhFE03fj6Y1Vw7vgXkJSTA== X-Received: by 2002:a17:90a:b38b:: with SMTP id e11mr22188677pjr.120.1593829579061; Fri, 03 Jul 2020 19:26:19 -0700 (PDT) Received: from localhost ([144.34.187.180]) by smtp.gmail.com with ESMTPSA id w17sm7303568pge.10.2020.07.03.19.26.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Jul 2020 19:26:18 -0700 (PDT) Date: Sat, 4 Jul 2020 02:26:07 +0000 From: Long Li To: willy@infradead.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org Subject: [PATCH v5] mm, slab: Check GFP_SLAB_BUG_MASK before alloc_pages in kmalloc_order Message-ID: <20200704022607.GA57530@lilong> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 6507110009D64F5E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: kmalloc cannot allocate memory from HIGHMEM. Allocating large amounts of memory currently bypasses the check and will simply leak the memory when page_address() returns NULL. To fix this, factor the GFP_SLAB_BUG_MASK check out of slab & slub, and call it from kmalloc_order() as well. In order to make the code clear, the warning message is put in one place. Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Pekka Enberg Cc: Christoph Lameter Cc: David Rientjes Cc: Joonsoo Kim Cc: Andrew Morton Signed-off-by: Long Li --- changes in v5: -Change the check function name to kmalloc_fix_flags(), This name may be more appropriate. changes in V4: -Change the check function name to kmalloc_check_flags() -Put the flags check into the kmalloc_check_flags() changes in V3: -Put the warning message in one place -updage the change log to be clear mm/slab.c | 8 +------- mm/slab.h | 1 + mm/slab_common.c | 18 +++++++++++++++++- mm/slub.c | 8 +------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index ac7a223d9ac3..f2f150bd180b 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2573,13 +2573,7 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep, * Be lazy and only check for valid flags here, keeping it out of the * critical path in kmem_cache_alloc(). */ - if (unlikely(flags & GFP_SLAB_BUG_MASK)) { - gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK; - flags &= ~GFP_SLAB_BUG_MASK; - pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", - invalid_mask, &invalid_mask, flags, &flags); - dump_stack(); - } + flags = kmalloc_fix_flags(flags); WARN_ON_ONCE(cachep->ctor && (flags & __GFP_ZERO)); local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK); diff --git a/mm/slab.h b/mm/slab.h index a06f3313e4a0..8cd2bf391725 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -90,6 +90,7 @@ void create_kmalloc_caches(slab_flags_t); struct kmem_cache *kmalloc_slab(size_t, gfp_t); #endif +gfp_t kmalloc_fix_flags(gfp_t flags); /* Functions provided by the slab allocators */ int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags); diff --git a/mm/slab_common.c b/mm/slab_common.c index a143a8c8f874..16d63f6dad05 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -26,6 +26,8 @@ #define CREATE_TRACE_POINTS #include +#include "internal.h" + #include "slab.h" enum slab_state slab_state; @@ -805,6 +807,20 @@ void __init create_kmalloc_caches(slab_flags_t flags) } #endif /* !CONFIG_SLOB */ +gfp_t kmalloc_fix_flags(gfp_t flags) +{ + if (unlikely(flags & GFP_SLAB_BUG_MASK)) { + gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK; + + flags &= ~GFP_SLAB_BUG_MASK; + pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", + invalid_mask, &invalid_mask, flags, &flags); + dump_stack(); + } + + return flags; +} + /* * To avoid unnecessary overhead, we pass through large allocation requests * directly to the page allocator. We use __GFP_COMP, because we will need to @@ -815,7 +831,7 @@ void *kmalloc_order(size_t size, gfp_t flags, unsigned int order) void *ret = NULL; struct page *page; - flags |= __GFP_COMP; + flags = kmalloc_fix_flags(flags) | __GFP_COMP; page = alloc_pages(flags, order); if (likely(page)) { ret = page_address(page); diff --git a/mm/slub.c b/mm/slub.c index 62d2de56549e..dfaad93163d5 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1817,13 +1817,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) { - if (unlikely(flags & GFP_SLAB_BUG_MASK)) { - gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK; - flags &= ~GFP_SLAB_BUG_MASK; - pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", - invalid_mask, &invalid_mask, flags, &flags); - dump_stack(); - } + flags = kmalloc_fix_flags(flags); return allocate_slab(s, flags & (GFP_RECLAIM_MASK | GFP_CONSTRAINT_MASK), node); -- 2.17.1