From patchwork Wed May 16 20:20:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10404797 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 6E978601D2 for ; Wed, 16 May 2018 20:21:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56D3B28A20 for ; Wed, 16 May 2018 20:21:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51F5628A1F; Wed, 16 May 2018 20:21:19 +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 F31CA28862 for ; Wed, 16 May 2018 20:20:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D54A76B02D5; Wed, 16 May 2018 16:20:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D06286B0357; Wed, 16 May 2018 16:20:45 -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 BAA076B0358; Wed, 16 May 2018 16:20:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id 733EE6B02D5 for ; Wed, 16 May 2018 16:20:45 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id l128-v6so791916pga.22 for ; Wed, 16 May 2018 13:20:45 -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=RraVPIlx0OS9iF9h4iM5zt3S2JtY5zYD+1Mv/ehESRw=; b=KOK3uTQuuSVoxhiIWiEz1RRje/w2hpQoJGo85m2gGZfoho8IquBfRY5rEJUV8ipllw cSkyXoG2md3L6Sw6it4L1M1Xa/xXuaAE31maFv+OglkUKcYpw3AaBjXvb44/l3ZWFINY 9puatsuB51wqVy2wn/mw13CMNWQb2h+U3pNpJn6Z36Arc6Jmq1+aagxv8FTz11zWpcKW Vp41fc40G/vVuZeO3stN0hLw26YvX5JELqnKNuzREooAPFP3bfNI5vwYx4V0jOIZqWft rh+TgE/7RliyfGsIqG9+pB30xU5UeRHrXiuEBIVHMMd/YtD64ZXGUw2FjlU7bR+JPS65 5AyQ== X-Gm-Message-State: ALKqPwdgI1VVFdjFuIo7wTg+ZhyktPqc15qMFv0kiPnnqWxPpn82bOKa wyXtPqubiplAowmd+t71dH/M75XoPKJos5O+HWLYDWGCvrw4kcyWHWssP0/PXwkT3TXs/o5Qagb QLp7QbFg2/Bw9EdGWKTYxR+X5L5+CEV5NqSFhAaTCd/rCdyUDLL0pPqC8JVAarEWcMV1URmwW6Q nW11/lK/+ac7D77+yVE1fYxhbnXPIpZfA+vhkQEm6tZjoVySwHxjJSiMHi+iaoYt65y62NuWbFf MQs0jpBJsD/FTLI9D6U4vBcUx5J3R1kC5lhcU3A8ZWE379XCc7RFdyVi3BAntuLMmWE+4zxHSZv fSjD8HcMZzySa85vy0geKefsa9pXtvjA4XGfJiouTxT0l/Lx1MDS7JqM7pHb+jtCO+ZZlgAQOBZ t X-Received: by 2002:a62:49d7:: with SMTP id r84-v6mr2398953pfi.146.1526502045090; Wed, 16 May 2018 13:20:45 -0700 (PDT) X-Received: by 2002:a62:49d7:: with SMTP id r84-v6mr2398922pfi.146.1526502044251; Wed, 16 May 2018 13:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526502044; cv=none; d=google.com; s=arc-20160816; b=hz2d1qU4vmVT7JJqI3jh8aT3A62+ndtabAsgkqy30iMEjMW1ZJ/3vy6hfHkf2a0iHE WU46FAmIvbt87yepTQNActH3SMcEViCSN3C7M6METhgqOyOwj7QmwHBhJHYHbI7pOJp+ C7NoEp079gTGGUNfTgsOi78IE0GvD81JSuGicpjjWlmEhyiS252N8HtmnN5rjP/VWrKV GQoJtchCwgmAJC3iYT0px+hzKwHQcMH+4qOeBnLTb104PQLGa9e2ZhVxuxdhdFNEVQe1 aWu6j0skVierF1V4zE1xP3avpGNA6+2mkuh+n/bhXPgieR9TXElTsfx2rTLUEjKJObnU nwpg== 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=RraVPIlx0OS9iF9h4iM5zt3S2JtY5zYD+1Mv/ehESRw=; b=0HV/WDX0XmUwkl6cfX815G5gNfTNvaCfmPDt3m8euFLSWiH8aWjcYlw2knO9xv8Lbs bwzD/BoDZytL5Ni/+Ifs4GwKa9Yw8gK3nrUHrqT4Cc778jjJfM3IAPxcthlNudcm6s93 DnWEED+nIbXYOkB8A62XjKSxhXB5OKYVs7r3Qkf5SnZeNcT6JWdF5/a8tfy35sWXFiTu M5Qnkg+4TiHMPlLCOyqr27Yhr2IYDYFwkp+2xYD3Luz0z6h1r9g+ZHekLZzqrD21wAAO FXIXtCadPYxFvJnYA6Huvrss3AACCd9Sguk231QdcgIzyA9kAvziwDk2LcxCa5ad5+J9 RtCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=g3O2KGxt; 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 q1-v6sor2415484plb.62.2018.05.16.13.20.44 for (Google Transport Security); Wed, 16 May 2018 13:20:44 -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=g3O2KGxt; 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=RraVPIlx0OS9iF9h4iM5zt3S2JtY5zYD+1Mv/ehESRw=; b=g3O2KGxtNecGVabDEkeiusC0gbZU07Ju9ZlZsJ6vvXge2/TPzK8OrhR0bV9UKWSswl yGNND4l16Tik6gIGu+w69A14uReAfurreQay9hbopOSQ4YI4jqmQ0GZ63x+yv7LzYJ+u ki70xEtbcIOlEgYu5hyAvbkVCwYquPShqNekFS35681Zj8B2co0Y6MmrYE9JAh4AN6Yi k1CriWokeuCXHeZTYq11GSvgZdk+YNYWTwabIdH5pzG5LaR4Zdi1uEnxont9b8NXZ1Zk GWkGxvVuGzWeLJStOz3z+XhsaSV8Lfku8Dop3BXe2NVY3IwCbXoS54dv4UPFFXLVkzdA wbfw== X-Google-Smtp-Source: AB8JxZrBh3hJ+LNs/tuuMIM4T/DFvYWDFppCdHfEMOEDxdxhIz1uEZn4e3QrBTkbjIszQbN8avYdAg== X-Received: by 2002:a17:902:9883:: with SMTP id s3-v6mr2372583plp.179.1526502043426; Wed, 16 May 2018 13:20:43 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id k2-v6sm6667236pfg.82.2018.05.16.13.20.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 May 2018 13:20:41 -0700 (PDT) From: Shakeel Butt To: Michal Hocko , Andrew Morton , Greg Thelen , Mel Gorman , Vlastimil Babka Cc: Linux MM , LKML , Shakeel Butt Subject: [PATCH] mm: save two stranding bit in gfp_mask Date: Wed, 16 May 2018 13:20:23 -0700 Message-Id: <20180516202023.167627-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. Slide existing gfp masks to make those two bits available. Signed-off-by: Shakeel Butt --- include/linux/gfp.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 1a4582b44d32..8edf72d32411 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -16,31 +16,31 @@ struct vm_area_struct; */ /* Plain integer GFP bitmasks. Do not use this directly. */ -#define ___GFP_DMA 0x01u -#define ___GFP_HIGHMEM 0x02u -#define ___GFP_DMA32 0x04u -#define ___GFP_MOVABLE 0x08u +#define ___GFP_DMA 0x1u +#define ___GFP_HIGHMEM 0x2u +#define ___GFP_DMA32 0x4u +#define ___GFP_MOVABLE 0x8u #define ___GFP_RECLAIMABLE 0x10u #define ___GFP_HIGH 0x20u #define ___GFP_IO 0x40u #define ___GFP_FS 0x80u -#define ___GFP_NOWARN 0x200u -#define ___GFP_RETRY_MAYFAIL 0x400u -#define ___GFP_NOFAIL 0x800u -#define ___GFP_NORETRY 0x1000u -#define ___GFP_MEMALLOC 0x2000u -#define ___GFP_COMP 0x4000u -#define ___GFP_ZERO 0x8000u -#define ___GFP_NOMEMALLOC 0x10000u -#define ___GFP_HARDWALL 0x20000u -#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_NOWARN 0x100u +#define ___GFP_RETRY_MAYFAIL 0x200u +#define ___GFP_NOFAIL 0x400u +#define ___GFP_NORETRY 0x800u +#define ___GFP_MEMALLOC 0x1000u +#define ___GFP_COMP 0x2000u +#define ___GFP_ZERO 0x4000u +#define ___GFP_NOMEMALLOC 0x8000u +#define ___GFP_HARDWALL 0x10000u +#define ___GFP_THISNODE 0x20000u +#define ___GFP_ATOMIC 0x40000u +#define ___GFP_ACCOUNT 0x80000u +#define ___GFP_DIRECT_RECLAIM 0x100000u +#define ___GFP_WRITE 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)) /*