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 AD92CC3ABBF for ; Tue, 6 May 2025 09:53:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8D666B0095; Tue, 6 May 2025 05:53:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3E956B0096; Tue, 6 May 2025 05:53:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1DB56B0098; Tue, 6 May 2025 05:53:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7CAEF6B0095 for ; Tue, 6 May 2025 05:53:04 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 038411620A4 for ; Tue, 6 May 2025 09:53:04 +0000 (UTC) X-FDA: 83412019530.07.6A32090 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by imf05.hostedemail.com (Postfix) with ESMTP id 16FD2100002 for ; Tue, 6 May 2025 09:53:02 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=DvpEM1ua; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.45 as permitted sender) smtp.mailfrom=revest@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746525183; a=rsa-sha256; cv=none; b=QPa7s+6MNhiRMGEXnPTegCZC9h0/UTWMMlZJNkRiLJDWlUEIqd146wSG552eK0wVL+V6vD NgyYLwkgKZkStQNqR+GgxZFRwebqFACk7JFUw30u5LupjcOj7wYqW/TPkjI5I3EqaG2+cV WRwMlxhzt/EmR/JJ8ciFlkOCmrt3edg= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=DvpEM1ua; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.45 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=1746525183; 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=JhJcuLA9lc6JwkXlygLvOeNzNKhkGSCKOxEZRRwR2Fk=; b=mu9T/QTKJH2cg+UtDw1PMYUws+xDtyWc84sEXW0G9jAMvgovgl9ADR4wHWUDejnL58ZHmB Z6YcnUO4YYuVfyxQjvQZuZ8F0Cm86r41cvFP9RyD3U9XpR0Yn71lPeJNbl4RUDAlks/KDW oB1HsIhLK+s0x1UolvTt7pTjjo56WcY= Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43e9ccaa1ebso7145595e9.1 for ; Tue, 06 May 2025 02:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1746525182; x=1747129982; 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=JhJcuLA9lc6JwkXlygLvOeNzNKhkGSCKOxEZRRwR2Fk=; b=DvpEM1uaUyp6dKS87J1Eyu7d+98EhpJO1sL1Nvzs9bPIdxC+l1qEj/PkRad0nON8sE 0xSwhOT77q5m3mKVaW28QvWfpC+AQ0N4wuOtDRcIR2JWoqD7L/ikwGsRYMN4Yh4BlYmU 45yUIrMuTycKLlSGdQGJnxxeTzSOPxAqrg7oY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746525182; x=1747129982; 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=JhJcuLA9lc6JwkXlygLvOeNzNKhkGSCKOxEZRRwR2Fk=; b=l3dpamQKNZTfSeUee/7HNCF8tcyqutZC546N3FcyuRQDlJtAT26Y7IGWUb05cYrOvD wNsljRz3gt9NNV6SYiJ/OrQrW5TjHy42jp+UdWUhngUobmidPF/OJzoUH6g/LNOE67ED a4Z/uHYvzn8pW6Hohb8XGUX5UyOKKLJd3fyJmunaOR024zZoht2IfIFPA5oFYuxN4Wic bvBZzpnpaY9svEPAeSU6CJ+76O61SpU2e2EE1FLikEATc30qWvOWqeXgBM7wFq1WKBuq J/Jn94QN/5GqBI0kyR9j/TfVXSF4kBNElTAmF8gnYOwAAAFxqSPWI4wKl1SGAOX8psId RppA== X-Forwarded-Encrypted: i=1; AJvYcCXr7smSkEyn8eeSkuB6iRyGj3RNhM9fAfYOjZQlY6Uq56Ibl4je3vjZoB8JixwuJTkYSU8IDyQy7w==@kvack.org X-Gm-Message-State: AOJu0YwmV7nxpfIcdqOlLEGhEs78ZX9sGn90dQOUlAadG31Vl2G25iJy fAwCDIfki483WzDdDRtKVRy01K0v7ug6D1JCjmsTQ6B5USbjIrUUA43rZ6010/2Bg6a/OPoFDGE = X-Gm-Gg: ASbGnctqlSYTINgafIng9H5ubU/ruyzRJjS8kIFMwoJagm4rl2M3gs2AJmpqWr4sO8C 1kCDbKIE6Cr7Jy+3Dl6VpaqvD63shb7B80l/OeDprTf0INrZmUp01UZ3JF0Uw6bJGc3zIuAYx88 KwHOjGxSMzKNfailYu3WHQxxaxBVfHYVtETnJVxsGuKoyzkJtPcR3T6jkGfhjZw1U6NUWyk2qIK lJEVT/NY52vf8MtGAAOJ1yMAhsUb522rIfw2vOSn2kFPMDxsmYtZcOlZm6y7VYUCUK6Wqd51ea3 yr8Vaw5CdHPdBMivKHPQqh/I7maqoPqWnPECN9E95kuHlKIfPleazEpc X-Google-Smtp-Source: AGHT+IHU7272b30JufMiYFqV3ys7N1n90y66VNZEPW3djdWr2Dr7SURgKX3aokdtNYam+3P+w0HERQ== X-Received: by 2002:a05:600c:3e07:b0:43b:c844:a4ba with SMTP id 5b1f17b1804b1-441bbec0fdfmr51577235e9.3.1746525181618; Tue, 06 May 2025 02:53:01 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:7196:3093:b0e3:1016]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae7a46sm12879860f8f.44.2025.05.06.02.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 02:53:01 -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 4/4] mm: consolidate VM_HIGH_ARCH_* macros into parametric macros Date: Tue, 6 May 2025 11:52:24 +0200 Message-ID: <20250506095224.176085-5-revest@chromium.org> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog In-Reply-To: <20250506095224.176085-1-revest@chromium.org> References: <20250506095224.176085-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 16FD2100002 X-Stat-Signature: 6d3nt58fbh3bxxw5zak9beenhmwz8htg X-Rspam-User: X-HE-Tag: 1746525182-932089 X-HE-Meta: U2FsdGVkX1+jZvYDH0NJ7gRSpztaSTp9EfURhjKbLbfNf2HY2fnPof7GyvsJDf+/tZfk9/r5i3kkI5J/+IDHeBk5A2ukNIgt8lfIIpwinjmPyBuNUTRy/XKISZBZ9XdHCsMu+ReEnO5lOTa6iWRit6vf1dmz7eDb31WarE6JwQbZogYb6yLLw8J7S7ji21HKrNNiLbczQH8ewCB2M9JEu74Fkwc/BhVmlv765TI+HUPsQ8wJISQatsULQyzOpOJUUbwNO6Q3R97lo48peMhPDaur94EpiPCWFrBG9VOWbCiGsB/la9xW9lVa5c/0hrksXV65bNnK70nTx39ULFWI2MjwdAP5mLKgmQ1N7oeb0xBEaRSwP8dBDLAKrdO/kYSvY9wRzEC7ZtF2oQpt1doiFpUuxGpdlP3IJYKAwSvGGW+JWKn4/3+JrmSDyd/X7maTMhJvFzpYvsy7BfYXsh/coDVmhJ0YLp7Qjmul5s3bZT032Im2zKj1tJZG5QJe7kvf7W1BkbbIqZWAlLRPRPFJw1gsZ9V2TDPPVh/yoBh+DF6W6csuDtqZ2f/qOlW7q6+LzcRiqc7mezSZG0tWZJ6E3Q00el1qd9Xm3ZGmvjUuW6B9c7e60Eiw//VR+hShdzGjmXCpoouJEJgXlg5vIjXf9UIXr+yPPii2C7+ssReyaQk1++WCoChcjyrClLr9bzQfpg4IFYYMq3+IEeOnM9sZVROIkL3qBvxefTQL3dG0anBBRZT9i4ObxIbTf5uYqXj/m5+XiBeBfdMGCt2/XvVc9ZIN8IFeABsIVWn/+4Wy0SCvHNRr6BlFLYckfGmekGU+JQG5ysTWnXC/tKDJwCknlCGxvPNovqHvTvhqefhCHJzzeceTpb2mzlpdchi/9+tmbPSrF2otGEGLPiM6bD2+Avj5zels9oM3ICwD2tz5aDttevsQ25LzP8AW45kXMFFy7Dy5dTmyZNxuf91EsIP 1deg03ba OgR8NFw+6CHpky1+NdDKoeqL+TPKvjtjKhm3GQAW6KK30ggCjFC/bAInIVRjdJhmpVQd/2lSbUslOdEif2JFNFBBy+CVOE2N3coU03FvQlziRWxS50P67rBFFYhATkqJ0xcneKd5FyZaTYdMKVKEnKbrXXF2zkfsJ1hVsnIJ24nBKRmzZsIfX1hce60/H+nFRpa8QEKweilCozwbziVbdQOs2NdZNBo5XlViJRxuNakzqZqWJCg8AWznP5kchM/FbecDGBvHev5lcE1GjC+W5t++iTAIkMUfjDGvzzPlvz23PHqH6D1ccUFLhwoY7xWbl0hpb1s7abuGvCkcJ1FcSXcjPzhNblOLSwm9M 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 | 50 ++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index b12549f0a6dce..6750020d5ea37 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_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.967.g6a0df3ecc3-goog