From patchwork Tue Jun 30 14:51:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 11634227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A089912 for ; Tue, 30 Jun 2020 14:52:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C0A7120675 for ; Tue, 30 Jun 2020 14:52:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KdcNZMBc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0A7120675 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 1E66B6B0074; Tue, 30 Jun 2020 10:52:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1BC626B0078; Tue, 30 Jun 2020 10:52:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F9616B007B; Tue, 30 Jun 2020 10:52:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0204.hostedemail.com [216.40.44.204]) by kanga.kvack.org (Postfix) with ESMTP id EEDF96B0074 for ; Tue, 30 Jun 2020 10:52:34 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id B5AA02DFA for ; Tue, 30 Jun 2020 14:52:34 +0000 (UTC) X-FDA: 76986169428.11.wind82_3114b9826e78 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 6C628180F8B87 for ; Tue, 30 Jun 2020 14:52:34 +0000 (UTC) X-Spam-Summary: 30,2,0,f15c134e4ef8ab96,d41d8cd98f00b204,lonuxli.64@gmail.com,,RULES_HIT:41:152:355:379:421:560:800:960:966:967:973:988:989:1260:1277:1312:1313:1314:1345:1434:1437:1516:1518:1519:1534:1541:1593:1594:1595:1596:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2560:2563:2682:2685:2693:2731:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3608:3865:3866:3867:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4385:5007:6261:6653:7514:7875:8603:9025:9040:9413:10010:10400:11026:11232:11473:11658:11914:12043:12048:12296:12297:12517:12519:12555:12895:13069:13255:13311:13357:13895:14181:14394:14687:14721:14777:21080:21433:21444:21451:21627:21666:21788:21990:30003:30012:30054:30070,0,RBL:209.85.215.196:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.100;04yrahqbw34syr7uz8pi9jnw58a86ocpuhti7xhkxd3bk3r85gsz3rmkndffkrj.wz6khq3ocpkbhobarajsh63hxhqop7ykmrwfgmutp8nmtnob9z1f6o4mf1y3tu5.w-lbl8.mailshell.net-223.2 38.255.1 X-HE-Tag: wind82_3114b9826e78 X-Filterd-Recvd-Size: 4535 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 14:52:34 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id d4so10062228pgk.4 for ; Tue, 30 Jun 2020 07:52:33 -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=e5weAmxeHY/HZDcuo/a+y01NxEAlRLsWW0XwibE2AXc=; b=KdcNZMBcgu/1NT3Ui/X+l4Mzw5QlqI0Z1yCzhaCTJWNTMtdQR3mAzGCiLB6wkxhKjx LVP5/VaZ4tmkuS9XoLLpYjyL9qMD0Jgzxa8Epa0po6wJCAa0gUGYt3R6lhB7D+l/PgCI ZWfEeaxdyzER1jNfZWSvN03UPEyUn76Nwbp7W2ncJAQ+MKFR96aSu5bQI5y1u5G8acx9 goh3HkSTo7/PtptU7s34od9XBe+NWYGC7v8+TqkqCq34RJRD7fg5YeuKjo/JHu/BafrY baKSkvbyQZsp9GG0Wod3pACnvCXsa5YcpE3BydYcgZZmS7qwYqCibzpCjAYNfY81prUO J8PA== 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=e5weAmxeHY/HZDcuo/a+y01NxEAlRLsWW0XwibE2AXc=; b=WDhPsS15qRZamwYnQ2SOzjt9VPElqor6w2m/JaP1MduIqSPnI6VD5dP3eDq8DVwj2V nkwTxlY+t4V72yP3sj+KoE8WVEfJYKB1l0pivnMnT/fS+LF0khstY89S1vtGsTNV81I1 2j2GBuWl6/cp+Q9Hk2SfPi1+yekS2EN28RJPvC4KC/6Mgg0Ev//T97GDmB3ri2QYQHfO vOm2zyeZhsfldaOPWEIjksvZmBoUx0+3jEieKzAWLZajBcwLYhcOE6dctT788d/Wn7r8 Na4/ftTCJV1k7QZWtswPeZ6wKZVGznl4tE7lQvjL/4U/oPBLRmmz6y9nThGlTLU9/L54 iNBw== X-Gm-Message-State: AOAM532ASdNMDc1yxlx0x0mMjjivOjtBe8Dnv7VcqzaSjE/kylGZGw4D 79C8DP0mQvl2KRpY/Sr+f5I= X-Google-Smtp-Source: ABdhPJxTsrQbRQvGqP0lLFh19GhfoXBIdE6Pe+sS9b4dz0E8IfPtWxbDZDGbv4uImfsTzdBDPKsfdQ== X-Received: by 2002:a63:6bc5:: with SMTP id g188mr14604148pgc.395.1593528752965; Tue, 30 Jun 2020 07:52:32 -0700 (PDT) Received: from localhost ([144.34.187.180]) by smtp.gmail.com with ESMTPSA id k100sm2618702pjb.57.2020.06.30.07.52.22 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jun 2020 07:52:32 -0700 (PDT) Date: Tue, 30 Jun 2020 14:51:55 +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, linux-kernel@vger.kernel.org Subject: [PATCH v2] mm, slab: Check GFP_SLAB_BUG_MASK before alloc_pages in kmalloc_order Message-ID: <20200630145155.GA52108@lilong> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 6C628180F8B87 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: In the ARM32 environment with highmem enabled. Using flag of kmalloc() with __GFP_HIGHMEM to allocate large memory, it will go through the kmalloc_order() path and return NULL. The __GFP_HIGHMEM flag will cause alloc_pages() to allocate highmem memory and pages cannot be directly converted to a virtual address, kmalloc_order() will return NULL and the page has been allocated. After modification, GFP_SLAB_BUG_MASK has been checked before allocating pages, refer to the new_slab(). Signed-off-by: Long Li --- Changes in v2: - patch is rebased againest "[PATCH] mm: Free unused pages in kmalloc_order()" [1] - check GFP_SLAB_BUG_MASK and generate warnings before alloc_pages in kmalloc_order() [1] https://lkml.org/lkml/2020/6/27/16 mm/slab_common.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/slab_common.c b/mm/slab_common.c index a143a8c8f874..3548f4f8374b 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -27,6 +27,7 @@ #include #include "slab.h" +#include "internal.h" enum slab_state slab_state; LIST_HEAD(slab_caches); @@ -815,6 +816,15 @@ void *kmalloc_order(size_t size, gfp_t flags, unsigned int order) void *ret = NULL; struct page *page; + 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 |= __GFP_COMP; page = alloc_pages(flags, order); if (likely(page)) {