From mboxrd@z Thu Jan 1 00:00:00 1970 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 80E56C3ABBF for ; Wed, 7 May 2025 13:10:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABD3E6B0099; Wed, 7 May 2025 09:10:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A69076B009A; Wed, 7 May 2025 09:10:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E6806B009B; Wed, 7 May 2025 09:10:31 -0400 (EDT) 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 6BD806B0099 for ; Wed, 7 May 2025 09:10:31 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 61C481A0262 for ; Wed, 7 May 2025 13:10:31 +0000 (UTC) X-FDA: 83416145862.04.C6F255D Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by imf29.hostedemail.com (Postfix) with ESMTP id 9C996120013 for ; Wed, 7 May 2025 13:10:29 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=oKiXzXN3; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf29.hostedemail.com: domain of revest@chromium.org designates 209.85.128.47 as permitted sender) smtp.mailfrom=revest@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746623429; a=rsa-sha256; cv=none; b=Jz48fOgjHoXq2QEZ1gqQtm5ePnsZ8tVxiPDDgYtox6MGZysmY52r2pBYXV9RfFf40ajveA ue5PRc1DSyHbxq7xqw+SWZ5vDC+B836EaarrREpJE4Ar9Og4WNhdHCCjxB1IkyN9nYE2n1 vKwhgFSuDbC2gbOYrQMEhFLkOT1XzFk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=oKiXzXN3; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf29.hostedemail.com: domain of revest@chromium.org designates 209.85.128.47 as permitted sender) smtp.mailfrom=revest@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746623429; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SFFedIQoVt5THh/dDr0azukH/sRWNDMHFAQOWykjhMU=; b=hZsC6KuHPQzcXm3rdcFQEEUrW0B4pgnqEMSn7EXLrtsK0JIBnV8Be1FPm8ELgKYq0dbBYw XZUqpcEDM2kzrzISob3HD0gj8KdgkKopgFPKyOrAI0tSHkA23ENcqySjJprpPlQUKUIvG2 hQp/eBxZQaOD/KSEUDyj2lmbqUE8muA= Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-440668acbf3so8773415e9.0 for ; Wed, 07 May 2025 06:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1746623428; x=1747228228; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SFFedIQoVt5THh/dDr0azukH/sRWNDMHFAQOWykjhMU=; b=oKiXzXN3IIoR4NCASh85wx0KSiVyxWlrHqk3u9RrbUJcgaEdYzj0DKNBE25A0PeuA2 NJCvxizNJd4+F7+P9Uo4/AixqHig/bk1Qfap/gUpvimJf/vRdM6kgvhk6+/xnZMxpPLr 7fQhcrJFAlx5gINyn4DuaF5fRMgwys9miX37s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746623428; x=1747228228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SFFedIQoVt5THh/dDr0azukH/sRWNDMHFAQOWykjhMU=; b=qVRznfw55tM0paK5Gi1816vmBpBD9hNQWtm6UCEQ7dmIG9fsKHRHCHQCg9B2NHo12O opo+dbNWdv9WBovly6gEms44X/bDQr0Oblqqta54XSLZbcpV2Jjx/OZHaNAC8nZAScgW BCoxVeJlntJfhroDFmHOC4dlrPvT2PQtjn1MAJrk3EJPwcmkGhlRd8v11U+SZzm/IJtR MdZcxLSH/f2vdjx2NUhnFVKkrl1RG7gq9DeKCzbLrOZmkcNEnnfV60V6KoKpvTJtItdF j/ocqE4llbvgXeIzt6m0Zo/gUdf71Dkt69e50lsZWYj4YyUh1ETUaQ3a7RM9cTL5r10Y m7dg== X-Forwarded-Encrypted: i=1; AJvYcCWlzJqIQu2z3nbExezP6/F10nUFFHUtbwSyItIM9ZcOpRj5qu9Ba1AwM9LH131Hza5BAr99yPFO5w==@kvack.org X-Gm-Message-State: AOJu0Yx64LuB6BcfowFsoyfB/NAbl7/yhX97RfC94Aq6OgSf4yDh8lTN NrUUTIgZRo87UX6Vbl3X9rkezgPw44Ue9E4AxKopdr39sanKaREho84s77UmRg== X-Gm-Gg: ASbGncvhcY1e8t05ZDbNzRV9+lrqfw7yLZcpot7ffrNlIt+i/UT8rm0Yz31E7/JCuHm sQMAEeZIHscW7Mgo0hhNnDoFgu1IkGl8Bzu/wDD5IvCiKb4G3uJYuNrZ2ny2SaXCq+0Kko1WpNa +TVWRRePdEiZtPVTWDmdwTUKikbAQ5zRMrTYI4xDfI4sg49Yzb1aIO0RByxgzTK8H7z0BahnlrT EtxhjaiBSIU4DiDaVOdSExa+8Df/7cFm6OSf2xL/mIWzPtbqkBX9a7HzkXa5TRw0ylc/oh2xiwA VbgmBSdWtpV6C0o6CGLZWxwKzdjNwLI2efYyR0Lp0Oc99n8QAvGqiNXA X-Google-Smtp-Source: AGHT+IElR75OEHwMKC4gYQ5ikVeEAK7dbCSsz3voaw3tMaHSvQvvHy+t/om+lnqAq9lqYbAjHGVGzw== X-Received: by 2002:a05:600c:1ca3:b0:439:94f8:fc7b with SMTP id 5b1f17b1804b1-441d448b936mr9664875e9.0.1746623428057; Wed, 07 May 2025 06:10:28 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:558d:e1fb:c2ec:7513]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd32adcasm647435e9.6.2025.05.07.06.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 06:10:27 -0700 (PDT) From: Florent Revest To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, akpm@linux-foundation.org, broonie@kernel.org, thiago.bauermann@linaro.org, jackmanb@google.com, Florent Revest Subject: [PATCH v2 4/4] mm: consolidate VM_HIGH_ARCH_* macros into parametric macros Date: Wed, 7 May 2025 15:10:00 +0200 Message-ID: <20250507131000.1204175-5-revest@chromium.org> X-Mailer: git-send-email 2.49.0.987.g0cc8ee98dc-goog In-Reply-To: <20250507131000.1204175-1-revest@chromium.org> References: <20250507131000.1204175-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9C996120013 X-Stat-Signature: 6jtcknr4wxghidcgiani6m6chtrszb59 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746623429-807851 X-HE-Meta: U2FsdGVkX1/WDKY7O1QmHKRawnC7OjHmQk9F0aUpKm6P28Qw5Exn95cLUl74jDRlO+cIWUfmrpm5Wqi5ls7jIr4GRN7mt3N5yjyuXGdc1GSg6/xSzADqjKmCHLYxe5INbAwEZ1IB+c3oOOpCKfQwEaaH9Y8LEiNdoZibfbKxtynQimPR9yAs5wdSN6fmHre1c83/Se+R4iGqCSCxkpCJ5RGZy6k+f58vceiXr9+ZozEJbZx+J9FvF6wGEklCGu7gXXd54uLA+Sn9oOQA3uEAJtIjboDgoaNdWZcGCAXLY20CTl5j8Psbs/WvT4Fqqc+2a7RNGjjfKIZLNB9uNr3V7XYy5xm+Z57NOMmCl/QBz+5ztywgkU3DyB4i+ntN2RkYdGlhMPngTc++T4e9zG0k/8OL3DQJdlIxe4dcancSKjzzPoQJdRPSqE6oifvHf1JKazxtAcGwEUpIYuuzAdoImdpMbz2TJjfaFKwwbHOrK8OEWMIbD+Q7NkLSzGeFUZmI9mMP+7qS4ueByXZ5JThp08V/S7Xma8NWN9edRkjsYkVdbUDf+N57WRq4/wA7/Q8ObVKWiSBsj/K9USPuiVvgl1pu8gIogLxFQQhRKGkaC5dMvK5ZynFbdkkPeSjgpXDM262k9gs6sTbsb1hJs4NuDwbWwzLNE40Dxy6S3DfB4Sklcv1Lu9IqVQfjrqHyASh15j105TG3vodvnPq0//f13fCnSWVgEcgVuI8/RcSuhplMvNaDTiRTXkMl1KTWf04wqV1M9fHKqUzsAg96FKO71G24z+ydme3rNGweJPJiJ804IruTEl57oukZLxepGN33ZhAaEzDjob9Ath8+NXFyY7vw9BI8H/nplTZmQE9VzzNuVxPOs0UnJR9tlAtKMV8a2jQk5WG37t/w5VgBOblaLm7aB1pEW6yXIunzmCKDdN7/cje2MYZUqWpKq6SCWlymIBPIklXNPM/eNAIEhdR MKbowVMg T6s2ZrE8Z7ZrvtIEz7pFjJVO01tAOKoLdC6slbS06DsPEh0PjtfZg1pbge/mEVz3ot0c5OUVvRnkWuHg= 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: This reduces code duplication and chances of mistakes. Signed-off-by: Florent Revest --- include/linux/mm.h | 52 ++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index b12549f0a6dce..a53394d928585 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -298,42 +298,22 @@ extern unsigned int kobjsize(const void *objp); #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ #ifdef CONFIG_64BIT -#define VM_HIGH_ARCH_BIT_0 32 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_1 33 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_6 38 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_7 39 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_8 40 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_9 41 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_BIT_10 42 /* bit only usable on 64-bit architectures */ -#define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) -#define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) -#define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) -#define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) -#define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) -#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) -#define VM_HIGH_ARCH_6 BIT(VM_HIGH_ARCH_BIT_6) -#define VM_HIGH_ARCH_7 BIT(VM_HIGH_ARCH_BIT_7) -#define VM_HIGH_ARCH_8 BIT(VM_HIGH_ARCH_BIT_8) -#define VM_HIGH_ARCH_9 BIT(VM_HIGH_ARCH_BIT_9) -#define VM_HIGH_ARCH_10 BIT(VM_HIGH_ARCH_BIT_10) +#define VM_HIGH_ARCH_BIT(i) (32+i) /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH(i) BIT(VM_HIGH_ARCH_BIT(i)) #endif /* CONFIG_64BIT */ #ifdef CONFIG_ARCH_HAS_PKEYS -# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 -# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 -# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT(0) +# define VM_PKEY_BIT0 VM_HIGH_ARCH(0) +# define VM_PKEY_BIT1 VM_HIGH_ARCH(1) +# define VM_PKEY_BIT2 VM_HIGH_ARCH(2) #if CONFIG_ARCH_PKEY_BITS > 3 -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 +# define VM_PKEY_BIT3 VM_HIGH_ARCH(3) #else # define VM_PKEY_BIT3 0 #endif #if CONFIG_ARCH_PKEY_BITS > 4 -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 +# define VM_PKEY_BIT4 VM_HIGH_ARCH(4) #else # define VM_PKEY_BIT4 0 #endif @@ -349,7 +329,7 @@ extern unsigned int kobjsize(const void *objp); * (x86). See the comments near alloc_shstk() in arch/x86/kernel/shstk.c * for more details on the guard size. */ -# define VM_SHADOW_STACK VM_HIGH_ARCH_5 +# define VM_SHADOW_STACK VM_HIGH_ARCH(5) #endif #if defined(CONFIG_ARM64_GCS) @@ -357,7 +337,7 @@ extern unsigned int kobjsize(const void *objp); * arm64's Guarded Control Stack implements similar functionality and * has similar constraints to shadow stacks. */ -# define VM_SHADOW_STACK VM_HIGH_ARCH_6 +# define VM_SHADOW_STACK VM_HIGH_ARCH(6) #endif #ifndef VM_SHADOW_STACK @@ -381,8 +361,8 @@ extern unsigned int kobjsize(const void *objp); #endif #if defined(CONFIG_ARM64_MTE) -# define VM_MTE VM_HIGH_ARCH_4 /* Use Tagged memory for access control */ -# define VM_MTE_ALLOWED VM_HIGH_ARCH_5 /* Tagged memory permitted */ +# define VM_MTE VM_HIGH_ARCH(4) /* Use Tagged memory for access control */ +# define VM_MTE_ALLOWED VM_HIGH_ARCH(5) /* Tagged memory permitted */ #else # define VM_MTE VM_NONE # define VM_MTE_ALLOWED VM_NONE @@ -393,7 +373,7 @@ extern unsigned int kobjsize(const void *objp); #endif #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR -# define VM_UFFD_MINOR VM_HIGH_ARCH_9 /* UFFD minor faults */ +# define VM_UFFD_MINOR VM_HIGH_ARCH(9) /* UFFD minor faults */ #else /* !CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ # define VM_UFFD_MINOR VM_NONE #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ @@ -406,13 +386,13 @@ extern unsigned int kobjsize(const void *objp); * if KVM does not lock down the memory type. */ #ifdef CONFIG_64BIT -#define VM_ALLOW_ANY_UNCACHED VM_HIGH_ARCH_7 +#define VM_ALLOW_ANY_UNCACHED VM_HIGH_ARCH(7) #else #define VM_ALLOW_ANY_UNCACHED VM_NONE #endif #ifdef CONFIG_64BIT -#define VM_DROPPABLE VM_HIGH_ARCH_8 +#define VM_DROPPABLE VM_HIGH_ARCH(8) #elif defined(CONFIG_PPC32) #define VM_DROPPABLE VM_ARCH_1 #else @@ -421,7 +401,7 @@ extern unsigned int kobjsize(const void *objp); #ifdef CONFIG_64BIT /* VM is sealed, in vm_flags */ -#define VM_SEALED VM_HIGH_ARCH_10 +#define VM_SEALED VM_HIGH_ARCH(10) #endif /* Bits set in the VMA until the stack is in its final location */ -- 2.49.0.987.g0cc8ee98dc-goog