From patchwork Wed May 16 21:14:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10404897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89BD6602C2 for ; Wed, 16 May 2018 21:14:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7926F28748 for ; Wed, 16 May 2018 21:14:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D95728753; Wed, 16 May 2018 21:14:57 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL 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 CE5AB28748 for ; Wed, 16 May 2018 21:14:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE56D6B0369; Wed, 16 May 2018 17:14:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ABB166B036B; Wed, 16 May 2018 17:14:55 -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 985806B036C; Wed, 16 May 2018 17:14:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 53F036B0369 for ; Wed, 16 May 2018 17:14:55 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id j14-v6so1344986pfn.11 for ; Wed, 16 May 2018 14:14:55 -0700 (PDT) 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; bh=SEsIX5Nm8mledlRhJMgBRG/PgqOd1GDy2UdK1rF73g4=; b=PBfRFvYxfcdDLBVpalMmmkeT8jpJ7/CDeAAGEQ4ZF3Hqk2wtc7wzHvALRV4e5aKmRE jcYpu92s22OiwYRFsOpycAesWlztb08J2UMka0GYiVQMoIK6ke4UmUBs1j7ep4A7Ojqy e0nsMWorNbJ6LhhmdZt5BK6wjOuMf4axoy3nSPJOuRbfeJl8Y8nG0Z2ugvsCEHFHgYqj w4lHcR1bmlE5nb7vUdqPrTCca61NEgZRA4RF1kbswItlJd66rOL8VZfveLOPzev7f7D3 C+3rvnlyHJ0necjfaSvkKz+SXHu9cxeLIou2SfYLwBoJZEFTdalUP/YOIHCOOkHZscrX xJDw== X-Gm-Message-State: ALKqPweVEg2pAWwKU8Kd18SS1Aii0/omSKhofq3NsFsOYVtQDmulDo8l wNKEMCnXzBnvke/1KI8QiS16ODmK59Opf/cJnczKdDksZNUSLsWZTHc0CfdY7HohHGFrF7q9xKJ yCvyzCbsdwbtDkPs4xb/JJC8GbsXSuNeqJs7j6ECf7JQQxsm1RyzoHu3zwNTzlGNWbMrCxI6m+T LWmJPvvfWRPZE4Y/fYWabnV98UhgLQdy5LVbbgp8q7fgTjvAC4BkA655CTGo/zhloUOBThbXMTD WvUKehlbxuwPgbArXBDmKFUbUcYpZu/PP9FdqjVkOXTEPsS9UL8xvKXQezopv66c1WG6YekrjbN sWlCHaecA02IrFCsefFfg0/7+yRj0YGiC5VCrycLzNXtJ9HlAk28BrO2rpvewTPme8JDtbUSodg d X-Received: by 2002:a63:6142:: with SMTP id v63-v6mr1984080pgb.432.1526505295016; Wed, 16 May 2018 14:14:55 -0700 (PDT) X-Received: by 2002:a63:6142:: with SMTP id v63-v6mr1984056pgb.432.1526505294157; Wed, 16 May 2018 14:14:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526505294; cv=none; d=google.com; s=arc-20160816; b=cFz+LOSlGxghuVm3RwvM3LWZxEXL+bLs4S3kkEwVaSeYEZMjVznxQdAcxF11ToKOK+ IasZ757+l7PXtMOvPyD1sIdKuzqkic9SNgWHX+doIXtenWiPG2ULHD3bDE4vqYWopssY tn6R25nWyoq9qgq+Hb+5GbAtLQ3D3QtASfXU/FPJxlsyRw/GnYafaZrAkTqFnQtR3wBI y7ekZuZafocHSWDbBS/GFUcVQMF5dIZ7V9c4MPXwN5aI7ujEvAZn0HSPXVSKTD7023jQ tAYPeOSwSdUtFTrtz2e7AEVeUGlNFMwV8xkQ2wFtI0T4hZ2PssTSfbJeEqhFhMyL1kw4 lGDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=SEsIX5Nm8mledlRhJMgBRG/PgqOd1GDy2UdK1rF73g4=; b=r/ewJEc1nkPTX8FDEHnEMIP6kkkc4XFlDiHfYQJjNj29+S6CHDQFCeM10+yCbbFgbS KzxJC6/tHQqScbhiVqDdBx/l0+qcHK/XQLv0C2tR58VrymYMps5FYvdc/s7HFghb4iR7 S/r1OmV3bF1LBV7QpSH3RvXaO+r2ZYCD/jBtyhsJZZMvKWbhu6LHLFaT0TzMXNcftXho wvhqUVn9qyCdzDHnyGGl+etwrmgQ1w3VJwvwZk8RzJ+cxHZBUXszCUkj3TVBU3jH29QH 9GyvIYXo47aVOcoXBsuJGPQpyNMUqM1PEOcky4qh0hKVu9AUyIhDWYUz35Nh1Io47Rt4 SOzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D+RmJPVP; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j4-v6sor2388914pfn.82.2018.05.16.14.14.54 for (Google Transport Security); Wed, 16 May 2018 14:14:54 -0700 (PDT) Received-SPF: pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D+RmJPVP; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SEsIX5Nm8mledlRhJMgBRG/PgqOd1GDy2UdK1rF73g4=; b=D+RmJPVPtlroI3vebvcTePA9LSgSMOFJ4TlgVjPviA/McVcrsMR6FtoWdteRXYPnxz 4RB/LnjbW20B5qJqQOdmMison+onCbv0WSV+WLTFV3VE+Q8xJRsjHD8CKcMh9muY4Hwb IewVY3Hor6ApPXEFt/FmhuOdykjYhbhnp3sVWGAa3TqFwZviuoPoi2s+C+uPTa3h3NcL 4mZ5zs6JoTP1BIu9hOxft1PAKmeV990Uc+GDSO8+oWGI5Pw9qw0iI9OSK2YaYVvUWtlX kTWvRZXDO+6MXQoaK4A8g+aIRB1yB4HcnbrWgzHWnG23vjfiYEZXxMh6ndFsK/hVKLqH ILuA== X-Google-Smtp-Source: AB8JxZpcets5304Fp5Cg4LY7hpyh03ypoDn3zZbTCheqxHyT9PsstcgHsqp/W63qZr1oV3U3Q56A8g== X-Received: by 2002:a62:a21e:: with SMTP id m30-v6mr2538411pff.251.1526505293409; Wed, 16 May 2018 14:14:53 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id x2-v6sm8129931pfk.113.2018.05.16.14.14.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 May 2018 14:14:52 -0700 (PDT) From: Shakeel Butt To: Michal Hocko , Andrew Morton , Greg Thelen , Mel Gorman , Vlastimil Babka Cc: Linux MM , LKML , Shakeel Butt Subject: [PATCH v2] mm: save two stranding bit in gfp_mask Date: Wed, 16 May 2018 14:14:39 -0700 Message-Id: <20180516211439.177440-1-shakeelb@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog 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 ___GFP_COLD and ___GFP_OTHER_NODE were removed but their bits were stranded. Fill the gaps by moving the existing gfp masks around. Signed-off-by: Shakeel Butt Suggested-by: Vlastimil Babka Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- Changelog since v1: - Moved couple of gfp masks instead of sliding all. include/linux/gfp.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 1a4582b44d32..036846fc00a6 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -24,6 +24,7 @@ struct vm_area_struct; #define ___GFP_HIGH 0x20u #define ___GFP_IO 0x40u #define ___GFP_FS 0x80u +#define ___GFP_WRITE 0x100u #define ___GFP_NOWARN 0x200u #define ___GFP_RETRY_MAYFAIL 0x400u #define ___GFP_NOFAIL 0x800u @@ -36,11 +37,10 @@ struct vm_area_struct; #define ___GFP_THISNODE 0x40000u #define ___GFP_ATOMIC 0x80000u #define ___GFP_ACCOUNT 0x100000u -#define ___GFP_DIRECT_RECLAIM 0x400000u -#define ___GFP_WRITE 0x800000u -#define ___GFP_KSWAPD_RECLAIM 0x1000000u +#define ___GFP_DIRECT_RECLAIM 0x200000u +#define ___GFP_KSWAPD_RECLAIM 0x400000u #ifdef CONFIG_LOCKDEP -#define ___GFP_NOLOCKDEP 0x2000000u +#define ___GFP_NOLOCKDEP 0x800000u #else #define ___GFP_NOLOCKDEP 0 #endif @@ -205,7 +205,7 @@ struct vm_area_struct; #define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP) /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT (25 + IS_ENABLED(CONFIG_LOCKDEP)) +#define __GFP_BITS_SHIFT (23 + IS_ENABLED(CONFIG_LOCKDEP)) #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /*