From patchwork Sat Feb 24 01:58:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13570235 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D4E8C5478C for ; Sat, 24 Feb 2024 01:58:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A55E6B007B; Fri, 23 Feb 2024 20:58:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 156956B007E; Fri, 23 Feb 2024 20:58:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01DF86B0080; Fri, 23 Feb 2024 20:58:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E300B6B007B for ; Fri, 23 Feb 2024 20:58:07 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B6DE3160157 for ; Sat, 24 Feb 2024 01:58:07 +0000 (UTC) X-FDA: 81825037014.09.8E288E1 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf22.hostedemail.com (Postfix) with ESMTP id 079E4C0003 for ; Sat, 24 Feb 2024 01:58:05 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FZY724dS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3LE3ZZQYKCGERTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3LE3ZZQYKCGERTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708739886; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=OxJAE1uSiuAHKlkfqA5vMwgno+A6UVTMYqvcjH6/eSk=; b=x4phY9OiB+cXzzyOvRVJhv6eZUrmtaqi1z2tR4VXh0bFRM9kq414aWRMixvnxffeQlfWJC /bI7zKe8U/J6+N249VIK7javC+Vg0gMFrblqdgbpjA95EO4U2hR9hiL31nTUmlD+F5Xy0Y jBaK+sJ05tG7aiRUfJzd1QeENxdANwA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FZY724dS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 3LE3ZZQYKCGERTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3LE3ZZQYKCGERTQDMAFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708739886; a=rsa-sha256; cv=none; b=5bYKo8c7hEKLXnXKmTQQxea2hWjWVYMfjbSH/WiIWP5Sy+uoth1Q+cwvEat90E8YODP3n7 g3sS4SkVJ9AehYiFk5KJUnvpjvHzNo/rOZf+0gVPLxnhpSagKIVuhyKoPQW/liR9sTdq0c d+xVgohpe9R48lyuWtFp0TqRmkxPHwE= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608d2cffc7eso1685427b3.0 for ; Fri, 23 Feb 2024 17:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708739885; x=1709344685; darn=kvack.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:from:to:cc:subject:date:message-id:reply-to; bh=OxJAE1uSiuAHKlkfqA5vMwgno+A6UVTMYqvcjH6/eSk=; b=FZY724dSxVEvdV2CjKinOMlHIbGwZD2XQdaW9JcoJ18tLM9DOsobPdwu1nxqHJefPV WEYza4VYZOd+URARenLq6tWWBruQgOcvY43Z35Py6PVt31TFo9gdkhsKxYqtHkIZC5Ib ajHjEPXIV+2u5Hsb3+St5e+FRlH2E+SJ4aiqAAvdH7jMFyzWE2pGAd52l3LTiFFmihxM zutyuybSPDlzGSRjCv9TYbIvj2szF2bHPl5Jn+eS+KPeuBvBlwTO4tUgnImr/zXHvbVQ 71qBtnILSFj/CMapQqDEpwft7z4Vi+wDUGGsWpqXGL63zlZNKO+nRInARKA8NCJD0t18 ijEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708739885; x=1709344685; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OxJAE1uSiuAHKlkfqA5vMwgno+A6UVTMYqvcjH6/eSk=; b=Sef8/b5m6BuVOdPwS7siOE0y+NdNP00HJ13F3VADlB90JTM2UdNg+118IjrJiFQ0xb EME/Ggflzb4dpbBWwlw3yPsFlNUKr1913MqcwQVcu0PQ5hAAS0bAav7DcwX0g4jnqOFH 5VYvY+RoJqjRU45L2xgJlsKjGEnr6tXeedb3nMxvJqjJmGScdpFfN3C/V4+VxojqE/oO KLjvDC7664Tp0oxsqA8u33QRj03AsFqE8jsAwFRJRzkJq+mSO686k5dy2D2JpcooTUg3 2BWfPxfMwSExAbTbu4v/zpEx7WppjaaziFCABOV3ixEwB1dTiN12c7PZZLjuPGu42Q4V SdHg== X-Forwarded-Encrypted: i=1; AJvYcCWS/PyjOsPN99fDkMfrQg5ftmVs0c1apKC0kFLLKnKZQgxItU5ZURJy0vFrfn5LLQvyp1OADoj56fapclzZ2APte+c= X-Gm-Message-State: AOJu0YzH9WyswZG5P2rUjVYhYp4aumcYUcmtxCI1YMzT80kP8ovfWw6G C4GjO7DZmVY2xNoIEJhQG3nhHhbXfotiCen0TqH1keOJKTullr/cLz3EMpNcfUat/imwU0QOAJH wFA== X-Google-Smtp-Source: AGHT+IGtBbMVCifF1ia9ZEGs0SLu3LluxNX6gDLjJVev8hxlcSexXU2441mZZZig36JIPLE066jJNPvrMc0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:77e1:98cf:e33c:dd99]) (user=surenb job=sendgmr) by 2002:a0d:d98f:0:b0:607:b85e:5a92 with SMTP id b137-20020a0dd98f000000b00607b85e5a92mr335723ywe.5.1708739884991; Fri, 23 Feb 2024 17:58:04 -0800 (PST) Date: Fri, 23 Feb 2024 17:58:00 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240224015800.2569851-1-surenb@google.com> Subject: [PATCH v5 1/1] mm: enumerate all gfp flags From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, petr@tesarici.cz, keescook@chromium.org, pasha.tatashin@soleen.com, mhocko@suse.com, surenb@google.com, kernel-team@android.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org X-Rspamd-Queue-Id: 079E4C0003 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 73diwn4dib66ksadp6wjtbbe76xnkpu6 X-HE-Tag: 1708739885-538882 X-HE-Meta: U2FsdGVkX19PZNNAvQSuMzWdrRwYu1QUUYUxT/QJcrH39gs/0YvoSMZ8ebxfgvPa0yQ6io6Egwgv2T5u90osBOE5zAsQCeAj4yBudi621NSv0FRIJDVH5PZWLNQywydFjd4yofVgBH1+k8QWVgQqHC32fWSujFM0xF8YM744uq9k7ve5ezgxYXXrq9n3yGSytWz80rofYS3berCr2UJyA8BERUd3/HZmlinjV1IyjMOroK0moWLga/L8J55hDIWoZ5JofQK8rqYytbtDHPjii6b07YRkv26Fx8nNSn81HXqozk+00BwynFIMLnKM4ww/qHzX19vAdHHCnEjVV9CMXDtYM4DVQEP21LXd8z4V4wHdwEm11/S+a+ATm3q0s/5oeKKGV/jnYmXsiDoONLbY2m8uUV3VEwvovvAQRNCqdhqIL/C2awV0GHf/z+QivGw4g9IaxD1wJhpUFL0nW9/oj4qhlYl2166oQIRr6BeluhtcAXk3qsc+t/bi7MOHuRHNZlX+vkJ1qagmdz04/hm8oaL4Y6eINFDnvoAU1xlPIXUKuYAg1CYkWzGER/Z1YX2SuTCy6zHSz5aGxzlhvdqdHvuC7QmZ3aZcY7JpEf1LwQD4Qq2rRZTUrYCwBvwbfSfx3ND30el3bMCxDc57c5unHmmzmYCP59ymbepS3eST+tc0U+Llghmi9fjkv/o4MnZM1rVvoa4ZPovi3il36B5aSAfVuiojY09jGNcEX4FnKRzVaa9M+PcCTt4/fN0QGZr+bwZXqyiTSgq+mW/6vxIInCH/scsF0o03sZG6s82SsowMVnOn7l01NNMEf1UcROQOOGfs4ppfOnXXNPe0VciwiVdEIOuzws7jcmclscMeyqw/dy16EYNTy94w9+0LBw9Nj7v2RKCW5DxBZoXjPQjsZESjwCZmie6/qkchlYcuagKEyJ/q9NkGBSgfHlBgibR6a3G1MIpGj+YutVcLbNY Yh44GzmH BppyJozKtk4hLA8jqbIM9wfaEuit3mfhZE94hudGBX0HSu8pUQ4Atg1ek9AmDMLwI1JG9uQ+CFlDRzEGch5zeCrVM5VNoJkk45mBuJkAX/J4JtGQCd+CiHW0KMm9tDHetM5btxFq5Lb7+R5ebURNCIQPOCgsJYIeXQqjPxns/usMxO9OL2KFXKbwDopJUE5j5x4Wiry9KjogdIxKXCo2/nuqXM2cjcR2wK9pyE+5rKLZG+DszC/oXV6POEnekMfTeHsltG7e9opoqFvRk8phQaMsAng0E4OkaMVOIYRS+LlIEmisl6JFSwnSgBK1C0A4ajgL0D6Ym/GC5jkuR8xHa2g2HS/r6h03MlFlHIM97rtbI9B9W/fmaMl7L0V3jaJT6e5d1KHTXLgISoAltPWRzaEiTcVsnsIz92okSwXVJGqmt52gv0d4gYiA3V2y0NPPN1PNbY3hOfwc8+3RJnaqj+nw3nLO0yhBXfD16Dq8ko+6Jun+ScUFUDDo4xZUE1KRj7VmDwkshOmnLrIUQEGbCEuEsGXaChngQRs42lnPjWt/NJkDaVqzNGSDXXUVk+wcV3E+DZlaOfOKhszPsjI060nj8LP8Km11BQZmZEXz2s3JJZmLZgzXqs0CJ5Iy9f1tTUC2Rell7litzwUbjCTgMGV6hyQtn6ynQOozD2CVYQhHnU++GHcFC/RW+3Y9tsxftpBtbwRxydmlJWf7baA+FRtECyjM3lkRQHaOVBDIEZVV11bJ1UKb4ZPu2MzM0lqw3e5XocJvt12fXbaqrpJDAJmIRgh3CCUUldraZQn+fv/XueB6a87XhANWlcavrU4sQLe+sfRYBuUmfc7uvDPwwBx32iQ== 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: List-Subscribe: List-Unsubscribe: Introduce GFP bits enumeration to let compiler track the number of used bits (which depends on the config options) instead of hardcoding them. That simplifies __GFP_BITS_SHIFT calculation. Suggested-by: Petr Tesařík Signed-off-by: Suren Baghdasaryan Reviewed-by: Kees Cook Reviewed-by: Pasha Tatashin Acked-by: Michal Hocko --- Changes from v4 [1]: - Split from the series [2] as a stand-alone patch, per Michal Hocko - Added Reviewed-by, per Pasha Tatashin - Added Acked-by, per Michal Hocko [1] https://lore.kernel.org/all/20240221194052.927623-7-surenb@google.com/ [2] https://lore.kernel.org/all/20240221194052.927623-1-surenb@google.com/ include/linux/gfp_types.h | 90 +++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 28 deletions(-) base-commit: 603c04e27c3e9891ce7afa5cd6b496bfacff4206 diff --git a/include/linux/gfp_types.h b/include/linux/gfp_types.h index 1b6053da8754..868c8fb1bbc1 100644 --- a/include/linux/gfp_types.h +++ b/include/linux/gfp_types.h @@ -21,44 +21,78 @@ typedef unsigned int __bitwise gfp_t; * include/trace/events/mmflags.h and tools/perf/builtin-kmem.c */ +enum { + ___GFP_DMA_BIT, + ___GFP_HIGHMEM_BIT, + ___GFP_DMA32_BIT, + ___GFP_MOVABLE_BIT, + ___GFP_RECLAIMABLE_BIT, + ___GFP_HIGH_BIT, + ___GFP_IO_BIT, + ___GFP_FS_BIT, + ___GFP_ZERO_BIT, + ___GFP_UNUSED_BIT, /* 0x200u unused */ + ___GFP_DIRECT_RECLAIM_BIT, + ___GFP_KSWAPD_RECLAIM_BIT, + ___GFP_WRITE_BIT, + ___GFP_NOWARN_BIT, + ___GFP_RETRY_MAYFAIL_BIT, + ___GFP_NOFAIL_BIT, + ___GFP_NORETRY_BIT, + ___GFP_MEMALLOC_BIT, + ___GFP_COMP_BIT, + ___GFP_NOMEMALLOC_BIT, + ___GFP_HARDWALL_BIT, + ___GFP_THISNODE_BIT, + ___GFP_ACCOUNT_BIT, + ___GFP_ZEROTAGS_BIT, +#ifdef CONFIG_KASAN_HW_TAGS + ___GFP_SKIP_ZERO_BIT, + ___GFP_SKIP_KASAN_BIT, +#endif +#ifdef CONFIG_LOCKDEP + ___GFP_NOLOCKDEP_BIT, +#endif + ___GFP_LAST_BIT +}; + /* 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_RECLAIMABLE 0x10u -#define ___GFP_HIGH 0x20u -#define ___GFP_IO 0x40u -#define ___GFP_FS 0x80u -#define ___GFP_ZERO 0x100u +#define ___GFP_DMA BIT(___GFP_DMA_BIT) +#define ___GFP_HIGHMEM BIT(___GFP_HIGHMEM_BIT) +#define ___GFP_DMA32 BIT(___GFP_DMA32_BIT) +#define ___GFP_MOVABLE BIT(___GFP_MOVABLE_BIT) +#define ___GFP_RECLAIMABLE BIT(___GFP_RECLAIMABLE_BIT) +#define ___GFP_HIGH BIT(___GFP_HIGH_BIT) +#define ___GFP_IO BIT(___GFP_IO_BIT) +#define ___GFP_FS BIT(___GFP_FS_BIT) +#define ___GFP_ZERO BIT(___GFP_ZERO_BIT) /* 0x200u unused */ -#define ___GFP_DIRECT_RECLAIM 0x400u -#define ___GFP_KSWAPD_RECLAIM 0x800u -#define ___GFP_WRITE 0x1000u -#define ___GFP_NOWARN 0x2000u -#define ___GFP_RETRY_MAYFAIL 0x4000u -#define ___GFP_NOFAIL 0x8000u -#define ___GFP_NORETRY 0x10000u -#define ___GFP_MEMALLOC 0x20000u -#define ___GFP_COMP 0x40000u -#define ___GFP_NOMEMALLOC 0x80000u -#define ___GFP_HARDWALL 0x100000u -#define ___GFP_THISNODE 0x200000u -#define ___GFP_ACCOUNT 0x400000u -#define ___GFP_ZEROTAGS 0x800000u +#define ___GFP_DIRECT_RECLAIM BIT(___GFP_DIRECT_RECLAIM_BIT) +#define ___GFP_KSWAPD_RECLAIM BIT(___GFP_KSWAPD_RECLAIM_BIT) +#define ___GFP_WRITE BIT(___GFP_WRITE_BIT) +#define ___GFP_NOWARN BIT(___GFP_NOWARN_BIT) +#define ___GFP_RETRY_MAYFAIL BIT(___GFP_RETRY_MAYFAIL_BIT) +#define ___GFP_NOFAIL BIT(___GFP_NOFAIL_BIT) +#define ___GFP_NORETRY BIT(___GFP_NORETRY_BIT) +#define ___GFP_MEMALLOC BIT(___GFP_MEMALLOC_BIT) +#define ___GFP_COMP BIT(___GFP_COMP_BIT) +#define ___GFP_NOMEMALLOC BIT(___GFP_NOMEMALLOC_BIT) +#define ___GFP_HARDWALL BIT(___GFP_HARDWALL_BIT) +#define ___GFP_THISNODE BIT(___GFP_THISNODE_BIT) +#define ___GFP_ACCOUNT BIT(___GFP_ACCOUNT_BIT) +#define ___GFP_ZEROTAGS BIT(___GFP_ZEROTAGS_BIT) #ifdef CONFIG_KASAN_HW_TAGS -#define ___GFP_SKIP_ZERO 0x1000000u -#define ___GFP_SKIP_KASAN 0x2000000u +#define ___GFP_SKIP_ZERO BIT(___GFP_SKIP_ZERO_BIT) +#define ___GFP_SKIP_KASAN BIT(___GFP_SKIP_KASAN_BIT) #else #define ___GFP_SKIP_ZERO 0 #define ___GFP_SKIP_KASAN 0 #endif #ifdef CONFIG_LOCKDEP -#define ___GFP_NOLOCKDEP 0x4000000u +#define ___GFP_NOLOCKDEP BIT(___GFP_NOLOCKDEP_BIT) #else #define ___GFP_NOLOCKDEP 0 #endif -/* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* * Physical address zone modifiers (see linux/mmzone.h - low four bits) @@ -249,7 +283,7 @@ typedef unsigned int __bitwise gfp_t; #define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP) /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT (26 + IS_ENABLED(CONFIG_LOCKDEP)) +#define __GFP_BITS_SHIFT ___GFP_LAST_BIT #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /**