From patchwork Wed Sep 25 21:06:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13812429 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 3AA05CCF9F6 for ; Wed, 25 Sep 2024 21:07:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDB2D6B00B9; Wed, 25 Sep 2024 17:07:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B64A16B00BA; Wed, 25 Sep 2024 17:07:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B8496B00BC; Wed, 25 Sep 2024 17:07:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 73C496B00B9 for ; Wed, 25 Sep 2024 17:07:14 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EFB201C6EC3 for ; Wed, 25 Sep 2024 21:07:13 +0000 (UTC) X-FDA: 82604495946.16.49396C0 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf30.hostedemail.com (Postfix) with ESMTP id 528C78001F for ; Wed, 25 Sep 2024 21:07:12 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RFMABg80; spf=pass (imf30.hostedemail.com: domain of arnd@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727298396; 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=8CVTgd+7b6LEU/GD97fZdlNzkmFWQW6tq/yEuPivrIc=; b=G+PGhNNDNAzEWIjKSqkn1gCaWOa/Syx83ByjnOWESjMYlNkpxqnI1mCP66CBWlRniLaNR9 T7re0kBH39uQjgahtGUyi7z4I1d48m2RHBjdonPQLC1n24uZWPwOQbwng0XCAdpniYw1Nk qP2vjUxkk6jvQ9YVm3RpfEGR2uTEpQ8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RFMABg80; spf=pass (imf30.hostedemail.com: domain of arnd@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727298396; a=rsa-sha256; cv=none; b=aWNSHLmdXoyscZbW8VdJZ3DukbhuEo0jkMF+n+At+GLUM6eoh1KI8Z47DVu7vh3yVO2jdz c2JlEPSTR+BWJLvDysom4uOTuw7kZ8RoMMK1OSmx4DfZ2dG1Y5iCbliUwnZYgtztXfV8NL /Bbgz4Oj3Tj59lfDfSpSUp+Rwm4+Oys= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 8C5C7A4489A; Wed, 25 Sep 2024 21:07:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A44A1C4CECF; Wed, 25 Sep 2024 21:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727298431; bh=9WWq9eu7cuIVH7faIexy4b1QmBlJqq/TWxw3ZIHVjt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RFMABg80UAzlZRGWyrqfIVrpC9pf+KZ7ccnvBYINSdZOE0vEoxMWceBAliZEcMTDW RCpJv2VfcSBLoHeF7E0VDAWsrUKkSgwBOV+P/dVgyITQ122pl5kO5UEOgqjNQZdVfO h4SNxxhIeb2DH76DzE4IlhLrg0T8UQo/j9VkVlXW+oUFymIn6rtT8GPYYlUEcZu7uZ wqHhouBebch/JiLDf7+51e9ufJfgMu3DNhow/hM/VsMPDaC6oAMSQo6eXKF+wHEHKy BbipYo1sQUC+mbsQHvc97qE69iXeCHgMwZE4eDvGEVZFYu6lq2naZhA8bXu43iX0nU OKOKG0CyQpcrg== From: Arnd Bergmann To: linux-mm@kvack.org Cc: Arnd Bergmann , "Jason A. Donenfeld" , Alexander Viro , Alexandre Torgue , Andreas Larsson , Andrew Morton , Ard Biesheuvel , Christian Brauner , Christoph Hellwig , Christophe Leroy , Damien Le Moal , David Hildenbrand , Greg Ungerer , Helge Deller , Kees Cook , "Liam R . Howlett" , Lorenzo Stoakes , Matt Turner , Max Filippov , Michael Ellerman , Michal Hocko , Nicholas Piggin , Richard Henderson , Thomas Bogendoerfer , Vladimir Murzin , Vlastimil Babka , linux-stm32@st-md-mailman.stormreply.com, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arch@vger.kernel.org Subject: [PATCH 4/5] asm-generic: use asm-generic/mman-common.h on parisc and alpha Date: Wed, 25 Sep 2024 21:06:14 +0000 Message-Id: <20240925210615.2572360-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240925210615.2572360-1-arnd@kernel.org> References: <20240925210615.2572360-1-arnd@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: anbbyjz173prdu1bw98p48qfb91683do X-Rspamd-Queue-Id: 528C78001F X-Rspamd-Server: rspam11 X-HE-Tag: 1727298432-143329 X-HE-Meta: U2FsdGVkX18v4c3u9KW+7cBsi9waD0ws72KupcwOCTCzP4nVSJm6wouJgSNtqqVBIoWCC/GtlV+8Ocrp+1ge4/AbaORhyS6jVz4BroOfEt23ss7O7WrZN52ag3sb5Tp3WDJsRwlgBqpD4YoiqYs5N/beDtwQXuxDBhQ11U8TWwUHP3MWRYWdYgZdTvCp0He/HAXZbGO3DaOA+3EQ9XxBy3hO4iFPq+GdcVwaL0fiauRJz4faA6ZnNQI/MYtFzKtybnVD7VyFtxaPLTKCq3mqBQmDdx6qy9dhWLR4wZLlWQ1CNI/8FmjOSJHPQN7+iXxn5LK6DjZ1Ai2w+SUP4AZXgktF4XayeslibVRT5Xx/6Jd+qaf/hY4X4Xgc/qkE45bllYb3OQpdjtG7YJmy1xmIHWvZvbvGPUuaOuWNzFVnqV/8FS09ofS2GFaDVUx+dAEX8e88XxGiFjKD73ZqszIbIKvnliLVkvGoJlxDTderaelN41dKV/7/gjXlRmYdCwfBw1i/Uel9GTTa9Fjh3RX0jeFya6dEMu0q6f1fJDHzCP5xNF6F43kwZw716WKjlQV4vbccSQkqpRZEzcE4LBJ3JZ40wDNqP00Isz86+Q6yb+H3v8XdPug1bqIgCcRpNFbIuRX2ZGqtE4NeMy+QCs1IzHaU2gZCAOzrVBanFTjoBj9FdX7vPas7VaUvD84lC3tuH1Uw+qMYJWr5B3ki9Pb95R3XOAF8gYuBCtVFTEFkZ/nji6ZzR+CNzuvsuHvhBMlkt5/hqZiJpA9jIMG1sEUsCt9hCxmak+agXq84GdeKcrdKS7Ejv8sRMfWbkoQbBd1C+WKAypMTCz0ZuuD8OlEVnRgym9FJotOujszgKPrgNGDBcxER5teZ5REOYcKhBKt1YTw0cR3HvqPSgyj45472sLiZKCn+enFYFsCvEItwKVALOhh/SHowNrBNWFD7Xt5l8M9fxybof1rQaZts/rB HVGAD8YS gGCIMetI7YYbu0p47ZnSnM+2RPtAgOHDsdEDS7RIV3AQg0M0fLbgQPxu9BLZ54ngPhYTlC0Zh0NzDwbOzjO2r6nUBvSOgyox4vUGVW8awYo1YpTY1aCq8aiBWDAgKNt6ZvQRyADPBM57W1YZ+nifLIp38F9oHCxrP7NdSLVAIigCNKBzl2xc2PqtUW45DBrNPzxQrkOuns+T77jX2iKlDDQa6UA== 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: From: Arnd Bergmann These two architectures each have their own set of MAP_* flags, like powerpc, mips and others do. In addition, the msync() flags are also different, here both define the same flags but in a different order. Finally, alpha also has a custom MADV_DONTNEED flag for madvise. Make the generic MADV_DONTNEED and MS_* definitions conditional on them already being defined and then include the common header header from both architectures, to remove the bulk of the contents. Signed-off-by: Arnd Bergmann --- arch/alpha/include/uapi/asm/mman.h | 68 +++----------------------- arch/parisc/include/uapi/asm/mman.h | 66 +------------------------ include/uapi/asm-generic/mman-common.h | 5 ++ 3 files changed, 13 insertions(+), 126 deletions(-) diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h index 1f1c03c047ce..fc8b74aa3f89 100644 --- a/arch/alpha/include/uapi/asm/mman.h +++ b/arch/alpha/include/uapi/asm/mman.h @@ -2,18 +2,6 @@ #ifndef __ALPHA_MMAN_H__ #define __ALPHA_MMAN_H__ -#define PROT_READ 0x1 /* page can be read */ -#define PROT_WRITE 0x2 /* page can be written */ -#define PROT_EXEC 0x4 /* page can be executed */ -#ifndef PROT_SEM /* different on mips and xtensa */ -#define PROT_SEM 0x8 /* page may be used for atomic ops */ -#endif -/* 0x10 reserved for arch-specific use */ -/* 0x20 reserved for arch-specific use */ -#define PROT_NONE 0x0 /* page can not be accessed */ -#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ -#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ - /* 0x01 - 0x03 are defined in linux/mman.h */ #define MAP_TYPE 0x0f /* Mask for type of mapping (OSF/1 is _wrong_) */ #define MAP_FIXED 0x100 /* Interpret addr exactly */ @@ -43,62 +31,18 @@ #define MCL_ONFAULT 32768 /* lock all pages that are faulted in */ /* - * Flags for mlock - */ -#define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */ - -/* - * Flags for msync + * Flags for msync, order is different from all others */ #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_SYNC 2 /* synchronous memory sync */ #define MS_INVALIDATE 4 /* invalidate the caches */ -#define MADV_NORMAL 0 /* no further special treatment */ -#define MADV_RANDOM 1 /* expect random page references */ -#define MADV_SEQUENTIAL 2 /* expect sequential page references */ -#define MADV_WILLNEED 3 /* will need these pages */ -#define MADV_DONTNEED 6 /* don't need these pages */ +/* + * Flags for madvise, 1 through 3 are normal + */ /* originally MADV_SPACEAVAIL 5 */ +#define MADV_DONTNEED 6 /* don't need these pages */ -/* common parameters: try to keep these consistent across architectures */ -#define MADV_FREE 8 /* free pages only if memory pressure */ -#define MADV_REMOVE 9 /* remove these pages & resources */ -#define MADV_DONTFORK 10 /* don't inherit across fork */ -#define MADV_DOFORK 11 /* do inherit across fork */ - -#define MADV_MERGEABLE 12 /* KSM may merge identical pages */ -#define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ - -#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */ -#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */ - -#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump, - overrides the coredump filter bits */ -#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */ - -#define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */ -#define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */ - -#define MADV_COLD 20 /* deactivate these pages */ -#define MADV_PAGEOUT 21 /* reclaim these pages */ - -#define MADV_POPULATE_READ 22 /* populate (prefault) page tables readable */ -#define MADV_POPULATE_WRITE 23 /* populate (prefault) page tables writable */ - -#define MADV_DONTNEED_LOCKED 24 /* like DONTNEED, but drop locked pages too */ - -#define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */ - -#define MADV_HWPOISON 100 /* poison a page for testing */ -#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */ - -/* compatibility flags */ -#define MAP_FILE 0 - -#define PKEY_DISABLE_ACCESS 0x1 -#define PKEY_DISABLE_WRITE 0x2 -#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\ - PKEY_DISABLE_WRITE) +#include #endif /* __ALPHA_MMAN_H__ */ diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index 1cd5d816d4cf..3732950a5cd8 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -2,19 +2,6 @@ #ifndef __PARISC_MMAN_H__ #define __PARISC_MMAN_H__ - -#define PROT_READ 0x1 /* page can be read */ -#define PROT_WRITE 0x2 /* page can be written */ -#define PROT_EXEC 0x4 /* page can be executed */ -#ifndef PROT_SEM /* different on mips and xtensa */ -#define PROT_SEM 0x8 /* page may be used for atomic ops */ -#endif -/* 0x10 reserved for arch-specific use */ -/* 0x20 reserved for arch-specific use */ -#define PROT_NONE 0x0 /* page can not be accessed */ -#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ -#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ - /* 0x01 - 0x03 are defined in linux/mman.h */ #define MAP_TYPE 0x2b /* Mask for type of mapping, includes bits 0x08 and 0x20 */ #define MAP_FIXED 0x04 /* Interpret addr exactly */ @@ -43,61 +30,12 @@ #define MCL_ONFAULT 4 /* lock all pages that are faulted in */ /* - * Flags for mlock - */ -#define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */ - -/* - * Flags for msync + * Flags for msync, order is different from all others */ #define MS_SYNC 1 /* synchronous memory sync */ #define MS_ASYNC 2 /* sync memory asynchronously */ #define MS_INVALIDATE 4 /* invalidate the caches */ -#define MADV_NORMAL 0 /* no further special treatment */ -#define MADV_RANDOM 1 /* expect random page references */ -#define MADV_SEQUENTIAL 2 /* expect sequential page references */ -#define MADV_WILLNEED 3 /* will need these pages */ -#define MADV_DONTNEED 4 /* don't need these pages */ - -/* common parameters: try to keep these consistent across architectures */ -#define MADV_FREE 8 /* free pages only if memory pressure */ -#define MADV_REMOVE 9 /* remove these pages & resources */ -#define MADV_DONTFORK 10 /* don't inherit across fork */ -#define MADV_DOFORK 11 /* do inherit across fork */ - -#define MADV_MERGEABLE 12 /* KSM may merge identical pages */ -#define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ - -#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */ -#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */ - -#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump, - overrides the coredump filter bits */ -#define MADV_DODUMP 17 /* Clear the MADV_DONTDUMP flag */ - -#define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */ -#define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */ - -#define MADV_COLD 20 /* deactivate these pages */ -#define MADV_PAGEOUT 21 /* reclaim these pages */ - -#define MADV_POPULATE_READ 22 /* populate (prefault) page tables readable */ -#define MADV_POPULATE_WRITE 23 /* populate (prefault) page tables writable */ - -#define MADV_DONTNEED_LOCKED 24 /* like DONTNEED, but drop locked pages too */ - -#define MADV_COLLAPSE 25 /* Synchronous hugepage collapse */ - -#define MADV_HWPOISON 100 /* poison a page for testing */ -#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */ - -/* compatibility flags */ -#define MAP_FILE 0 - -#define PKEY_DISABLE_ACCESS 0x1 -#define PKEY_DISABLE_WRITE 0x2 -#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\ - PKEY_DISABLE_WRITE) +#include #endif /* __PARISC_MMAN_H__ */ diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h index 2911dd14ef2a..81a14ed99197 100644 --- a/include/uapi/asm-generic/mman-common.h +++ b/include/uapi/asm-generic/mman-common.h @@ -27,15 +27,20 @@ /* * Flags for msync */ +#ifndef MS_ASYNC /* different order on alpha and parisc */ #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_INVALIDATE 2 /* invalidate the caches */ #define MS_SYNC 4 /* synchronous memory sync */ +#endif #define MADV_NORMAL 0 /* no further special treatment */ #define MADV_RANDOM 1 /* expect random page references */ #define MADV_SEQUENTIAL 2 /* expect sequential page references */ #define MADV_WILLNEED 3 /* will need these pages */ +/* 4 through 6 are different on alpha */ +#ifndef MADV_DONTNEED #define MADV_DONTNEED 4 /* don't need these pages */ +#endif /* common parameters: try to keep these consistent across architectures */ #define MADV_FREE 8 /* free pages only if memory pressure */