From patchwork Sun Nov 11 09:03:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10677523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE4DB13AD for ; Sun, 11 Nov 2018 09:04:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF2A02B08D for ; Sun, 11 Nov 2018 09:04:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D36762B098; Sun, 11 Nov 2018 09:04:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 581E52B08D for ; Sun, 11 Nov 2018 09:04:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB4306B0005; Sun, 11 Nov 2018 04:04:08 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B5ECF6B0007; Sun, 11 Nov 2018 04:04:08 -0500 (EST) 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 A831C6B0005; Sun, 11 Nov 2018 04:04:08 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 68C8A6B0005 for ; Sun, 11 Nov 2018 04:04:08 -0500 (EST) Received: by mail-pg1-f198.google.com with SMTP id 143so1172852pgc.3 for ; Sun, 11 Nov 2018 01:04:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tHCTBgMG+6sJtZR5onayP64SmgPAtqMgziPQMQVZWKM=; b=YXwLJKd9mHyyqW8fftR3HfxkgnDjyqb/gqSrd0uLFp+hsQJJWb7+wKiJL7PlnzjNFI KVI7/n/DzJnVMV/4sRvEM9ydc5V4706Jd1qBDcOg/iruorkUmBc7QkGMQftMijSR2Txl tb+4sCOPIlvJsmktAKAYNsshIydiilvAw3J/4f6NSucRu0yi3pr/TC8lvTF6bWmzHNL3 jCFSIF5IImhVjaav2gl0AKX+rF1R5R1wxW4LoZfSHi2HbD4GF/Ko3JYund2Hv3VjVrMz UVMkI+e1PszLdhXMt4LhKLffiTeeVj5+RjemJ6qyTEdQaXyln9nJ7FEjTvLDpihkLZjX jNpQ== X-Gm-Message-State: AGRZ1gKev1gndb37D1GCqTiqYZszYwcjfL0/tBCCC+E4hjXApQF055Kk aC8je31Kwi/epqyBA8Jfs5aRf+RIVBqmputD7aVZRdJOV7ypqXXU58eznFnYtRr9ul+7Q29gbTx hJkJuZRPHufS3q5lr5ZqdiQwDXsYW5rdUc5NSdCcs+USrS6gm/lypE1MAPVplnlx+hf4zydaRP+ d7CUcrJWREN9VH3xOpROI9WLGHSyzLy5yhN9HBBvdq1bquhdUKA9CTxnmNSWxxZgesdeRHIyYWy vQRF/pWSPeFx/ehDQ+mhEudsEzTITpIH57BwlDvrmpDwzDbnmhFwFbUc8ECz7LrzQMxtT1WVq2m QZ/1IEnnHD53Lgb2GQ+nMeAlyRc59rW1FogodDDXhoHUcds/Lz/WcxhKkvdkDe8EI1t16B4c/uo x X-Received: by 2002:a17:902:5e4:: with SMTP id f91-v6mr2460980plf.75.1541927048048; Sun, 11 Nov 2018 01:04:08 -0800 (PST) X-Received: by 2002:a17:902:5e4:: with SMTP id f91-v6mr2460932plf.75.1541927047270; Sun, 11 Nov 2018 01:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541927047; cv=none; d=google.com; s=arc-20160816; b=KFBJoWxOnCLZODkdrcSrk834jX0L2F0+/SbWWWO3/jHJarSJyD9OIln6GNZcBp7R0R snKCix/HflY4kS5m9EKMqS6qZWc3Xkg7WgHQb617U1chBjRUkIafnxn0oa+m594qaflc 0enrHLrB4md5LHT+T84gRaKFQSoG8y+clhZQ6ck5MYJqoF9I0yY7jt/KHq0uCmnh9VqY 2aglj62Yvj8W1Pu313ZweZQlprSyJIXa8DACKUaQOgIw1to6cw01cZiEmUNpERGWOcFl 8OqQrQLpvfft9Z17qN5feeJZwsOZ4kQb/E1+O6s6g1vWr9JNCqhzLF0cCsLRA4rTpCZJ z+wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tHCTBgMG+6sJtZR5onayP64SmgPAtqMgziPQMQVZWKM=; b=BlJbsuCIiFuUEeKDhejYxydVSeL2eyLm6LgBp0g+rJ7SuTYbdUbjKnfNB2YfoJ30ga LehIlUc6J16JBmdMZnm8PNxg+vO2DT9ztllJsAx2CdD7ZJ1n7MYqOGJ8zGIJh3B3J/xz EJ//Yo0KexAdxS85u2Y1H45PuBHTZETHJw6x569qZNlN2oKJGdSfIGH5GJgYjbDEkFpE HYP7ybJkGXnh7Yi800aSwxvKcY9YjvPXWOC8aN9WGUmtcJ1sdPsxuMVei4f8XVHadkGy 70F5HkfHBcOLNC9Kx4u34I56ulFgFeDnUHQiwKbuvbUi+iYiG76C94bNLdtbMU6oy6ir 2j0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=l7Tlciw4; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j38sor5502575pgm.3.2018.11.11.01.04.07 for (Google Transport Security); Sun, 11 Nov 2018 01:04:07 -0800 (PST) Received-SPF: pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=l7Tlciw4; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tHCTBgMG+6sJtZR5onayP64SmgPAtqMgziPQMQVZWKM=; b=l7Tlciw4q3K/mse2HceMtZDnrFM6ck6HToUmTsxs8jqxQdGLn9fB6x8w53HsMNvnTH RnBzgCGqDhuWKFO2CQ9TnefxUQWJI887Ol18UPHXQRc6lSN2Sh2R6hpIxxjJ+4jlSsKA FUktM+/wIwGDOTQ3nu7H7NgmdVXxlN0Iya5bc= X-Google-Smtp-Source: AJdET5fqOgcNWbxIYJn57HFqDYGS+E0e9yJHKY4fkrYGQEuWX7H6W4a2yVrcs3FVlRHmJiNJMxoaDA== X-Received: by 2002:a63:920a:: with SMTP id o10mr13137383pgd.141.1541927046794; Sun, 11 Nov 2018 01:04:06 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id 69sm8107956pgg.86.2018.11.11.01.04.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 01:04:06 -0800 (PST) From: Nicolas Boichat To: Robin Murphy Cc: Will Deacon , Joerg Roedel , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Michal Hocko , Mel Gorman , Levin Alexander , Huaisheng Ye , Mike Rapoport , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yong Wu , Matthias Brugger , Tomasz Figa , yingjoe.chen@mediatek.com Subject: [PATCH v2 1/3] mm: slab/slub: Add check_slab_flags function to check for valid flags Date: Sun, 11 Nov 2018 17:03:39 +0800 Message-Id: <20181111090341.120786-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181111090341.120786-1-drinkcat@chromium.org> References: <20181111090341.120786-1-drinkcat@chromium.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Remove duplicated code between slab and slub, and will make it easier to make the test more complicated in the next commits. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- mm/internal.h | 17 +++++++++++++++-- mm/slab.c | 8 +------- mm/slub.c | 8 +------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 3b1ec1412fd2cd..7a500b232e4a43 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -33,8 +33,22 @@ /* Control allocation cpuset and node placement constraints */ #define GFP_CONSTRAINT_MASK (__GFP_HARDWALL|__GFP_THISNODE) -/* Do not use these with a slab allocator */ -#define GFP_SLAB_BUG_MASK (__GFP_DMA32|__GFP_HIGHMEM|~__GFP_BITS_MASK) +/* Check for flags that must not be used with a slab allocator */ +static inline gfp_t check_slab_flags(gfp_t flags) +{ + gfp_t bug_mask = __GFP_DMA32 | __GFP_HIGHMEM | ~__GFP_BITS_MASK; + + if (unlikely(flags & bug_mask)) { + gfp_t invalid_mask = flags & bug_mask; + + flags &= ~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; +} void page_writeback_init(void); diff --git a/mm/slab.c b/mm/slab.c index 2a5654bb3b3ff3..251e09a5a3ef5c 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2656,13 +2656,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 = check_slab_flags(flags); WARN_ON_ONCE(cachep->ctor && (flags & __GFP_ZERO)); local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK); diff --git a/mm/slub.c b/mm/slub.c index e3629cd7aff164..1cca562bebdc8d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1681,13 +1681,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 = check_slab_flags(flags); return allocate_slab(s, flags & (GFP_RECLAIM_MASK | GFP_CONSTRAINT_MASK), node);