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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 615C3FD8770 for ; Tue, 17 Mar 2026 14:10:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A759A6B008A; Tue, 17 Mar 2026 10:10:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4D476B008C; Tue, 17 Mar 2026 10:10:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 915B26B0092; Tue, 17 Mar 2026 10:10:58 -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 7CC196B008A for ; Tue, 17 Mar 2026 10:10:58 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 235278A6B2 for ; Tue, 17 Mar 2026 14:10:58 +0000 (UTC) X-FDA: 84555741396.06.C99827B Received: from fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.143.178]) by imf24.hostedemail.com (Postfix) with ESMTP id 794AD180003 for ; Tue, 17 Mar 2026 14:10:55 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=b3JTrfnj; spf=pass (imf24.hostedemail.com: domain of "prvs=529a8c084=kalyazin@amazon.co.uk" designates 63.178.143.178 as permitted sender) smtp.mailfrom="prvs=529a8c084=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.co.uk ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1773756655; 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:in-reply-to:references:references:dkim-signature; bh=YT+RN7R7BxgHS+s1x91TyyjwNFc2MVFokFMzhgUvxKw=; b=enCjSyN8uTBV8C2MJehhQEOGDZUoB+zRFivBSQX/am5TgtaZbIEK9fsdmndG1jiYlp2ukp L2PnZdjwl02UevaSqNN3hNCqcj0fD6Zk5EPmwDBzVZkvHS/ck0o5OOOSyIzuKwiLHsLqE7 fviiy5fHw/PSOhALORLG6ggSGzS24cg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=amazon.co.uk header.s=amazoncorp2 header.b=b3JTrfnj; spf=pass (imf24.hostedemail.com: domain of "prvs=529a8c084=kalyazin@amazon.co.uk" designates 63.178.143.178 as permitted sender) smtp.mailfrom="prvs=529a8c084=kalyazin@amazon.co.uk"; dmarc=pass (policy=quarantine) header.from=amazon.co.uk ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1773756655; a=rsa-sha256; cv=none; b=I30i65kBYtrd+I9sIQrCBkQxN4MLOSG+7NbJSlWOQMLFWX0HbVCXGE/ZdjwfE0oop/nceb Tzz4JtRhMWeEBh7wqxjOqK97/KaN1SBFa0N0L/7q03KR92S7bIr0EsOUdZEFlCrdwRj5P3 n50lNytwVIvH6pDi9p8lflPixKYYmtc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1773756655; x=1805292655; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YT+RN7R7BxgHS+s1x91TyyjwNFc2MVFokFMzhgUvxKw=; b=b3JTrfnjy7aO7yuHVAvyZtqv0Uv3EOV9WmRIz8RfHmiNTp14sm2SR5RV tvnb9iZZmhu9HCrAZr2WGoD9PsTrWyWuE6XYRjJs6bijAvIXFH07TkkIL qCj4w0xgPoRoubw1Yn83Bbd4a8MfUgMfHmJWpKmhJJrBIXRgzWmtV3nK6 vhOm0Ej8Q07ukqK7nGFXKOzGjdk5Y0KQ8uDXyFHbn7EFqflkJ38+Q36tH +bI73ItIy3889R1OKlP/Nq0HrJx162ReVLCjNzHHHAsXAkwhTQzUq/e/j FM7P9CwyoK/FtyRvMUXW3CqTske4VlPnxLA9uQmSeI8xm9mvALxyj5mj8 w==; X-CSE-ConnectionGUID: Jl3fpmDvQqSZ6PiOFO0afQ== X-CSE-MsgGUID: hATzySX/RrW5GB1+DbrJjQ== X-IronPort-AV: E=Sophos;i="6.23,124,1770595200"; d="scan'208";a="10894902" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2026 14:10:51 +0000 Received: from EX19MTAEUC001.ant.amazon.com [54.240.197.225:31423] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.35.101:2525] with esmtp (Farcaster) id 57d99ac1-34a2-4a23-b520-ce9bbfa8863e; Tue, 17 Mar 2026 14:10:50 +0000 (UTC) X-Farcaster-Flow-ID: 57d99ac1-34a2-4a23-b520-ce9bbfa8863e Received: from EX19D005EUB001.ant.amazon.com (10.252.51.12) by EX19MTAEUC001.ant.amazon.com (10.252.51.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Tue, 17 Mar 2026 14:10:45 +0000 Received: from EX19D005EUB003.ant.amazon.com (10.252.51.31) by EX19D005EUB001.ant.amazon.com (10.252.51.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Tue, 17 Mar 2026 14:10:44 +0000 Received: from EX19D005EUB003.ant.amazon.com ([fe80::b825:becb:4b38:da0c]) by EX19D005EUB003.ant.amazon.com ([fe80::b825:becb:4b38:da0c%3]) with mapi id 15.02.2562.037; Tue, 17 Mar 2026 14:10:44 +0000 From: "Kalyazin, Nikita" To: "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@vger.kernel.org" , "kernel@xen0n.name" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-pm@vger.kernel.org" CC: "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oupton@kernel.org" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "seanjc@google.com" , "tglx@kernel.org" , "mingo@redhat.com" , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "hpa@zytor.com" , "luto@kernel.org" , "peterz@infradead.org" , "willy@infradead.org" , "akpm@linux-foundation.org" , "david@kernel.org" , "lorenzo.stoakes@oracle.com" , "vbabka@kernel.org" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "song@kernel.org" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jolsa@kernel.org" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "skhan@linuxfoundation.org" , "riel@surriel.com" , "ryan.roberts@arm.com" , "jgross@suse.com" , "yu-cheng.yu@intel.com" , "kas@kernel.org" , "coxu@redhat.com" , "kevin.brodsky@arm.com" , "ackerleytng@google.com" , "yosry@kernel.org" , "ajones@ventanamicro.com" , "maobibo@loongson.cn" , "tabba@google.com" , "prsampat@amd.com" , "wu.fei9@sanechips.com.cn" , "mlevitsk@redhat.com" , "jmattson@google.com" , "jthoughton@google.com" , "agordeev@linux.ibm.com" , "alex@ghiti.fr" , "aou@eecs.berkeley.edu" , "borntraeger@linux.ibm.com" , "chenhuacai@kernel.org" , "dev.jain@arm.com" , "gor@linux.ibm.com" , "hca@linux.ibm.com" , "palmer@dabbelt.com" , "pjw@kernel.org" , "shijie@os.amperecomputing.com" , "svens@linux.ibm.com" , "thuth@redhat.com" , "wyihan@google.com" , "yang@os.amperecomputing.com" , "Jonathan.Cameron@huawei.com" , "Liam.Howlett@oracle.com" , "urezki@gmail.com" , "zhengqi.arch@bytedance.com" , "gerald.schaefer@linux.ibm.com" , "jiayuan.chen@shopee.com" , "lenb@kernel.org" , "osalvador@suse.de" , "pavel@kernel.org" , "rafael@kernel.org" , "vannapurve@google.com" , "jackmanb@google.com" , "aneesh.kumar@kernel.org" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Kalyazin, Nikita" Subject: [PATCH v11 01/16] set_memory: set_direct_map_* to take address Thread-Topic: [PATCH v11 01/16] set_memory: set_direct_map_* to take address Thread-Index: AQHcthfYKKVWyGEnck+/HNsWWreYfw== Date: Tue, 17 Mar 2026 14:10:44 +0000 Message-ID: <20260317141031.514-2-kalyazin@amazon.com> References: <20260317141031.514-1-kalyazin@amazon.com> In-Reply-To: <20260317141031.514-1-kalyazin@amazon.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.19.103.116] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Rspamd-Queue-Id: 794AD180003 X-Stat-Signature: b86xjaiuqabrxyy75sxnbb7edy1zn73u X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1773756655-247280 X-HE-Meta: U2FsdGVkX1/YNk36nK0xq1pTsZOnPrI8RZ2YowYQYfP2jcxUNj5QgMWMt39ifN3zNimEDcaG64tgedPpEgUv9qKNuLKOBrKiLiinyBt7CLxuv9QpnHAPxrGFlhNnIz/hWW7tJWBVd5P3Cvq7JFEXd5RyB4IPGV9TDfqUJCPTiDL0LLl79KhzFOAkiXPfV7sq9mvyHxcNoQExJXEvYLnrKWWf61uCnAZjBpoHsaooPN6penxuqAZwxwEXQ/vJk8GukMX9jiKng4CAPYXVG3pq/Vy4JWP+hC10jz2XTxXEcRtkuWa7ICS6Dhltx5r9cZqs/aNz+/LrOPj1VEDXmFiRSMZ7sXoE7MkMAlXQbmnR30A5HR+/isEUu0jrQQyzwF9rAmum/azSLALZ3iG0+ouBUIYyqU3gVIWDAjW0Ns2kfdpV4OJnOcRr1fm7vEu2ZN10YhsLZciQfiiXyViHQrM29X7aFdlPtjCn6EvMMmNK9OcEBT3a7NA22jHq4d2ICiLTvaXBgr47fZhwz/eJ1GWTMimgRUHxPui3PRK6wOg8lreFTd17dQOiGC8vfpAvPli+mZ6tiRJT1bt51LSpBkXYvbXnyRgv02S/XnUt1MesOYiLTEQY54rvhrsYFgH0cADS1F6PRUiX8RQbxT/PooABpE0lsalzAMumnzBXQTFdIlNwIxyr6SZBwdHCRoJipcdTHE77TahfkkJyalSYTTEJbQ4XqGSRz08XI2Qa8+8KubN87HGLQDYjTlLjREZ4XKk7w1ufPJO7qJF36W75ZkfFn20VR374Jd3vrrUdyshpeNOsmc3FBQTN07ltDo/Sx8gJxdnb672Nxpr2pXRJauRg4nYQyEh/lhRNO95eFflB02xottlzkWgq5F2pcu7lDD5dK+U+4fFKTUJttQZhTuuPens8MrmgV27C3tHDJccF0UCU9k/jGrKz3OZvGLS909PSHvN/7VgXZwbv41lhLCg AARgbeIs M2EeeXwNN9939tyvC6OGuhpTZ7e+voDgoKqDJFpZfwd7K8TIMXwA2UfU/8kVD/UkfdKDe3+ykE2zi15vFNg2+kP4TRb+L/db1t81RvO8KS6I2C/r30p6ncwzOEN2PPC7SdKQp7QH0VBEzmb5IAFnBwiP+7PbqYYdbJg2gUfcTlBprkQ2u1eqNR8T7WC9g1IGC25L3pNr7DykKTqdXn09d3xHZ01wzuK/JVMFPN8SmbpoqMP6KNOuB7LArpvSpUM+w6WQecBHYPnJy4Ft0Zln2WNutoXDMMAmedaXMYY/ahaEiXkd/A89IrrxKC2enBJbqVB3KOvOd13JRQs4pe5iln1m3q2B+ho/AByHA78M2wNhK8s8uQ+78LgKMHwUWC+/jLvyBebO8N13jEJ03uLa6eoEakA0C/dv1iflBECdFol/o4+bFYdtrJENwEsA+DTNSLOmw/yu8TSdEAuLhcULOWHl6zXAIiWpQSzoLidKh+8g0yfE/SNIZmDzX+H52Wg0sSx33S/oERsDnbTlul8hAPK6lLpxDU/GljdR3/Nvc0pIxJwEGBnq+G957UVPeGwvSuQhZWHUJaXQ1oC1+snvRxYc7h7zcErHqW0a/X2aGgyZUwHH+UTT2qh3IJgR8b8sm2W1Mwai3bYOmWr3cFYBTd1ivCrPp9sQeQ+mzvtn5etlQAwcjnAO/AvIAm2lpUWL4JZYTJ8263SH8FVcwbASLmO210A70bE3mWNlDtGxY4WFJ9KE3BYuWbgcGBNyUGQetByPCtw6OyNNBNMDYVVV4ccUv1mZi+yHdM3VY Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Nikita Kalyazin =0A= =0A= This is to avoid excessive conversions folio->page->address when adding=0A= helpers on top of set_direct_map_valid_noflush() in the next patch.=0A= =0A= Acked-by: David Hildenbrand (Arm) =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= arch/arm64/include/asm/set_memory.h | 7 ++++---=0A= arch/arm64/mm/pageattr.c | 19 +++++++++----------=0A= arch/loongarch/include/asm/set_memory.h | 7 ++++---=0A= arch/loongarch/mm/pageattr.c | 25 +++++++++++--------------=0A= arch/riscv/include/asm/set_memory.h | 7 ++++---=0A= arch/riscv/mm/pageattr.c | 17 +++++++++--------=0A= arch/s390/include/asm/set_memory.h | 7 ++++---=0A= arch/s390/mm/pageattr.c | 13 +++++++------=0A= arch/x86/include/asm/set_memory.h | 7 ++++---=0A= arch/x86/mm/pat/set_memory.c | 23 ++++++++++++-----------=0A= include/linux/set_memory.h | 9 +++++----=0A= kernel/power/snapshot.c | 4 ++--=0A= mm/execmem.c | 6 ++++--=0A= mm/secretmem.c | 6 +++---=0A= mm/vmalloc.c | 11 +++++++----=0A= 15 files changed, 89 insertions(+), 79 deletions(-)=0A= =0A= diff --git a/arch/arm64/include/asm/set_memory.h b/arch/arm64/include/asm/s= et_memory.h=0A= index 90f61b17275e..c71a2a6812c4 100644=0A= --- a/arch/arm64/include/asm/set_memory.h=0A= +++ b/arch/arm64/include/asm/set_memory.h=0A= @@ -11,9 +11,10 @@ bool can_set_direct_map(void);=0A= =0A= int set_memory_valid(unsigned long addr, int numpages, int enable);=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page);=0A= -int set_direct_map_default_noflush(struct page *page);=0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d);=0A= +int set_direct_map_invalid_noflush(const void *addr);=0A= +int set_direct_map_default_noflush(const void *addr);=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid);=0A= bool kernel_page_present(struct page *page);=0A= =0A= int set_memory_encrypted(unsigned long addr, int numpages);=0A= diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c=0A= index 358d1dc9a576..5aff94e1f8b2 100644=0A= --- a/arch/arm64/mm/pageattr.c=0A= +++ b/arch/arm64/mm/pageattr.c=0A= @@ -245,7 +245,7 @@ int set_memory_valid(unsigned long addr, int numpages, = int enable)=0A= __pgprot(PTE_VALID));=0A= }=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page)=0A= +int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= pgprot_t clear_mask =3D __pgprot(PTE_VALID);=0A= pgprot_t set_mask =3D __pgprot(0);=0A= @@ -253,11 +253,11 @@ int set_direct_map_invalid_noflush(struct page *page)= =0A= if (!can_set_direct_map())=0A= return 0;=0A= =0A= - return update_range_prot((unsigned long)page_address(page),=0A= - PAGE_SIZE, set_mask, clear_mask);=0A= + return update_range_prot((unsigned long)addr, PAGE_SIZE, set_mask,=0A= + clear_mask);=0A= }=0A= =0A= -int set_direct_map_default_noflush(struct page *page)=0A= +int set_direct_map_default_noflush(const void *addr)=0A= {=0A= pgprot_t set_mask =3D __pgprot(PTE_VALID | PTE_WRITE);=0A= pgprot_t clear_mask =3D __pgprot(PTE_RDONLY);=0A= @@ -265,8 +265,8 @@ int set_direct_map_default_noflush(struct page *page)= =0A= if (!can_set_direct_map())=0A= return 0;=0A= =0A= - return update_range_prot((unsigned long)page_address(page),=0A= - PAGE_SIZE, set_mask, clear_mask);=0A= + return update_range_prot((unsigned long)addr, PAGE_SIZE, set_mask,=0A= + clear_mask);=0A= }=0A= =0A= static int __set_memory_enc_dec(unsigned long addr,=0A= @@ -349,14 +349,13 @@ int realm_register_memory_enc_ops(void)=0A= return arm64_mem_crypt_ops_register(&realm_crypt_ops);=0A= }=0A= =0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d)=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid)=0A= {=0A= - unsigned long addr =3D (unsigned long)page_address(page);=0A= -=0A= if (!can_set_direct_map())=0A= return 0;=0A= =0A= - return set_memory_valid(addr, nr, valid);=0A= + return set_memory_valid((unsigned long)addr, numpages, valid);=0A= }=0A= =0A= #ifdef CONFIG_DEBUG_PAGEALLOC=0A= diff --git a/arch/loongarch/include/asm/set_memory.h b/arch/loongarch/inclu= de/asm/set_memory.h=0A= index 55dfaefd02c8..5e9b67b2fea1 100644=0A= --- a/arch/loongarch/include/asm/set_memory.h=0A= +++ b/arch/loongarch/include/asm/set_memory.h=0A= @@ -15,8 +15,9 @@ int set_memory_ro(unsigned long addr, int numpages);=0A= int set_memory_rw(unsigned long addr, int numpages);=0A= =0A= bool kernel_page_present(struct page *page);=0A= -int set_direct_map_default_noflush(struct page *page);=0A= -int set_direct_map_invalid_noflush(struct page *page);=0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d);=0A= +int set_direct_map_invalid_noflush(const void *addr);=0A= +int set_direct_map_default_noflush(const void *addr);=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid);=0A= =0A= #endif /* _ASM_LOONGARCH_SET_MEMORY_H */=0A= diff --git a/arch/loongarch/mm/pageattr.c b/arch/loongarch/mm/pageattr.c=0A= index f5e910b68229..9e08905d3624 100644=0A= --- a/arch/loongarch/mm/pageattr.c=0A= +++ b/arch/loongarch/mm/pageattr.c=0A= @@ -198,32 +198,29 @@ bool kernel_page_present(struct page *page)=0A= return pte_present(ptep_get(pte));=0A= }=0A= =0A= -int set_direct_map_default_noflush(struct page *page)=0A= +int set_direct_map_default_noflush(const void *addr)=0A= {=0A= - unsigned long addr =3D (unsigned long)page_address(page);=0A= -=0A= - if (addr < vm_map_base)=0A= + if ((unsigned long)addr < vm_map_base)=0A= return 0;=0A= =0A= - return __set_memory(addr, 1, PAGE_KERNEL, __pgprot(0));=0A= + return __set_memory((unsigned long)addr, 1, PAGE_KERNEL, __pgprot(0));=0A= }=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page)=0A= +int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= - unsigned long addr =3D (unsigned long)page_address(page);=0A= -=0A= - if (addr < vm_map_base)=0A= + if ((unsigned long)addr < vm_map_base)=0A= return 0;=0A= =0A= - return __set_memory(addr, 1, __pgprot(0), __pgprot(_PAGE_PRESENT | _PAGE_= VALID));=0A= + return __set_memory((unsigned long)addr, 1, __pgprot(0),=0A= + __pgprot(_PAGE_PRESENT | _PAGE_VALID));=0A= }=0A= =0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d)=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid)=0A= {=0A= - unsigned long addr =3D (unsigned long)page_address(page);=0A= pgprot_t set, clear;=0A= =0A= - if (addr < vm_map_base)=0A= + if ((unsigned long)addr < vm_map_base)=0A= return 0;=0A= =0A= if (valid) {=0A= @@ -234,5 +231,5 @@ int set_direct_map_valid_noflush(struct page *page, uns= igned nr, bool valid)=0A= clear =3D __pgprot(_PAGE_PRESENT | _PAGE_VALID);=0A= }=0A= =0A= - return __set_memory(addr, 1, set, clear);=0A= + return __set_memory((unsigned long)addr, 1, set, clear);=0A= }=0A= diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/s= et_memory.h=0A= index 87389e93325a..a87eabd7fc78 100644=0A= --- a/arch/riscv/include/asm/set_memory.h=0A= +++ b/arch/riscv/include/asm/set_memory.h=0A= @@ -40,9 +40,10 @@ static inline int set_kernel_memory(char *startp, char *= endp,=0A= }=0A= #endif=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page);=0A= -int set_direct_map_default_noflush(struct page *page);=0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d);=0A= +int set_direct_map_invalid_noflush(const void *addr);=0A= +int set_direct_map_default_noflush(const void *addr);=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid);=0A= bool kernel_page_present(struct page *page);=0A= =0A= #endif /* __ASSEMBLER__ */=0A= diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c=0A= index 3f76db3d2769..0a457177a88c 100644=0A= --- a/arch/riscv/mm/pageattr.c=0A= +++ b/arch/riscv/mm/pageattr.c=0A= @@ -374,19 +374,20 @@ int set_memory_nx(unsigned long addr, int numpages)= =0A= return __set_memory(addr, numpages, __pgprot(0), __pgprot(_PAGE_EXEC));= =0A= }=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page)=0A= +int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= - return __set_memory((unsigned long)page_address(page), 1,=0A= - __pgprot(0), __pgprot(_PAGE_PRESENT));=0A= + return __set_memory((unsigned long)addr, 1, __pgprot(0),=0A= + __pgprot(_PAGE_PRESENT));=0A= }=0A= =0A= -int set_direct_map_default_noflush(struct page *page)=0A= +int set_direct_map_default_noflush(const void *addr)=0A= {=0A= - return __set_memory((unsigned long)page_address(page), 1,=0A= - PAGE_KERNEL, __pgprot(_PAGE_EXEC));=0A= + return __set_memory((unsigned long)addr, 1, PAGE_KERNEL,=0A= + __pgprot(_PAGE_EXEC));=0A= }=0A= =0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d)=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid)=0A= {=0A= pgprot_t set, clear;=0A= =0A= @@ -398,7 +399,7 @@ int set_direct_map_valid_noflush(struct page *page, uns= igned nr, bool valid)=0A= clear =3D __pgprot(_PAGE_PRESENT);=0A= }=0A= =0A= - return __set_memory((unsigned long)page_address(page), nr, set, clear);= =0A= + return __set_memory((unsigned long)addr, numpages, set, clear);=0A= }=0A= =0A= #ifdef CONFIG_DEBUG_PAGEALLOC=0A= diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set= _memory.h=0A= index 94092f4ae764..3e43c3c96e67 100644=0A= --- a/arch/s390/include/asm/set_memory.h=0A= +++ b/arch/s390/include/asm/set_memory.h=0A= @@ -60,9 +60,10 @@ __SET_MEMORY_FUNC(set_memory_rox, SET_MEMORY_RO | SET_ME= MORY_X)=0A= __SET_MEMORY_FUNC(set_memory_rwnx, SET_MEMORY_RW | SET_MEMORY_NX)=0A= __SET_MEMORY_FUNC(set_memory_4k, SET_MEMORY_4K)=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page);=0A= -int set_direct_map_default_noflush(struct page *page);=0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d);=0A= +int set_direct_map_invalid_noflush(const void *addr);=0A= +int set_direct_map_default_noflush(const void *addr);=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid);=0A= bool kernel_page_present(struct page *page);=0A= =0A= #endif=0A= diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c=0A= index bb29c38ae624..8e90ff5cf50d 100644=0A= --- a/arch/s390/mm/pageattr.c=0A= +++ b/arch/s390/mm/pageattr.c=0A= @@ -383,17 +383,18 @@ int __set_memory(unsigned long addr, unsigned long nu= mpages, unsigned long flags=0A= return rc;=0A= }=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page)=0A= +int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= - return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_INV)= ;=0A= + return __set_memory((unsigned long)addr, 1, SET_MEMORY_INV);=0A= }=0A= =0A= -int set_direct_map_default_noflush(struct page *page)=0A= +int set_direct_map_default_noflush(const void *addr)=0A= {=0A= - return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_DEF)= ;=0A= + return __set_memory((unsigned long)addr, 1, SET_MEMORY_DEF);=0A= }=0A= =0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d)=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid)=0A= {=0A= unsigned long flags;=0A= =0A= @@ -402,7 +403,7 @@ int set_direct_map_valid_noflush(struct page *page, uns= igned nr, bool valid)=0A= else=0A= flags =3D SET_MEMORY_INV;=0A= =0A= - return __set_memory((unsigned long)page_to_virt(page), nr, flags);=0A= + return __set_memory((unsigned long)addr, numpages, flags);=0A= }=0A= =0A= bool kernel_page_present(struct page *page)=0A= diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_m= emory.h=0A= index 4362c26aa992..b6a4173ff249 100644=0A= --- a/arch/x86/include/asm/set_memory.h=0A= +++ b/arch/x86/include/asm/set_memory.h=0A= @@ -86,9 +86,10 @@ int set_pages_wb(struct page *page, int numpages);=0A= int set_pages_ro(struct page *page, int numpages);=0A= int set_pages_rw(struct page *page, int numpages);=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page);=0A= -int set_direct_map_default_noflush(struct page *page);=0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d);=0A= +int set_direct_map_invalid_noflush(const void *addr);=0A= +int set_direct_map_default_noflush(const void *addr);=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid);=0A= bool kernel_page_present(struct page *page);=0A= =0A= extern int kernel_set_to_readonly;=0A= diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c=0A= index 40581a720fe8..6aea1f470fd5 100644=0A= --- a/arch/x86/mm/pat/set_memory.c=0A= +++ b/arch/x86/mm/pat/set_memory.c=0A= @@ -2587,9 +2587,9 @@ int set_pages_rw(struct page *page, int numpages)=0A= return set_memory_rw(addr, numpages);=0A= }=0A= =0A= -static int __set_pages_p(struct page *page, int numpages)=0A= +static int __set_pages_p(const void *addr, int numpages)=0A= {=0A= - unsigned long tempaddr =3D (unsigned long) page_address(page);=0A= + unsigned long tempaddr =3D (unsigned long)addr;=0A= struct cpa_data cpa =3D { .vaddr =3D &tempaddr,=0A= .pgd =3D NULL,=0A= .numpages =3D numpages,=0A= @@ -2606,9 +2606,9 @@ static int __set_pages_p(struct page *page, int numpa= ges)=0A= return __change_page_attr_set_clr(&cpa, 1);=0A= }=0A= =0A= -static int __set_pages_np(struct page *page, int numpages)=0A= +static int __set_pages_np(const void *addr, int numpages)=0A= {=0A= - unsigned long tempaddr =3D (unsigned long) page_address(page);=0A= + unsigned long tempaddr =3D (unsigned long)addr;=0A= struct cpa_data cpa =3D { .vaddr =3D &tempaddr,=0A= .pgd =3D NULL,=0A= .numpages =3D numpages,=0A= @@ -2625,22 +2625,23 @@ static int __set_pages_np(struct page *page, int nu= mpages)=0A= return __change_page_attr_set_clr(&cpa, 1);=0A= }=0A= =0A= -int set_direct_map_invalid_noflush(struct page *page)=0A= +int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= - return __set_pages_np(page, 1);=0A= + return __set_pages_np(addr, 1);=0A= }=0A= =0A= -int set_direct_map_default_noflush(struct page *page)=0A= +int set_direct_map_default_noflush(const void *addr)=0A= {=0A= - return __set_pages_p(page, 1);=0A= + return __set_pages_p(addr, 1);=0A= }=0A= =0A= -int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d)=0A= +int set_direct_map_valid_noflush(const void *addr, unsigned long numpages,= =0A= + bool valid)=0A= {=0A= if (valid)=0A= - return __set_pages_p(page, nr);=0A= + return __set_pages_p(addr, numpages);=0A= =0A= - return __set_pages_np(page, nr);=0A= + return __set_pages_np(addr, numpages);=0A= }=0A= =0A= #ifdef CONFIG_DEBUG_PAGEALLOC=0A= diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h=0A= index 3030d9245f5a..1a2563f525fc 100644=0A= --- a/include/linux/set_memory.h=0A= +++ b/include/linux/set_memory.h=0A= @@ -25,17 +25,18 @@ static inline int set_memory_rox(unsigned long addr, in= t numpages)=0A= #endif=0A= =0A= #ifndef CONFIG_ARCH_HAS_SET_DIRECT_MAP=0A= -static inline int set_direct_map_invalid_noflush(struct page *page)=0A= +static inline int set_direct_map_invalid_noflush(const void *addr)=0A= {=0A= return 0;=0A= }=0A= -static inline int set_direct_map_default_noflush(struct page *page)=0A= +static inline int set_direct_map_default_noflush(const void *addr)=0A= {=0A= return 0;=0A= }=0A= =0A= -static inline int set_direct_map_valid_noflush(struct page *page,=0A= - unsigned nr, bool valid)=0A= +static inline int set_direct_map_valid_noflush(const void *addr,=0A= + unsigned long numpages,=0A= + bool valid)=0A= {=0A= return 0;=0A= }=0A= diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c=0A= index 6e1321837c66..6eddfb22c0ff 100644=0A= --- a/kernel/power/snapshot.c=0A= +++ b/kernel/power/snapshot.c=0A= @@ -88,7 +88,7 @@ static inline int hibernate_restore_unprotect_page(void *= page_address) {return 0=0A= static inline void hibernate_map_page(struct page *page)=0A= {=0A= if (IS_ENABLED(CONFIG_ARCH_HAS_SET_DIRECT_MAP)) {=0A= - int ret =3D set_direct_map_default_noflush(page);=0A= + int ret =3D set_direct_map_default_noflush(page_address(page));=0A= =0A= if (ret)=0A= pr_warn_once("Failed to remap page\n");=0A= @@ -101,7 +101,7 @@ static inline void hibernate_unmap_page(struct page *pa= ge)=0A= {=0A= if (IS_ENABLED(CONFIG_ARCH_HAS_SET_DIRECT_MAP)) {=0A= unsigned long addr =3D (unsigned long)page_address(page);=0A= - int ret =3D set_direct_map_invalid_noflush(page);=0A= + int ret =3D set_direct_map_invalid_noflush(page_address(page));=0A= =0A= if (ret)=0A= pr_warn_once("Failed to remap page\n");=0A= diff --git a/mm/execmem.c b/mm/execmem.c=0A= index 810a4ba9c924..220298ec87c8 100644=0A= --- a/mm/execmem.c=0A= +++ b/mm/execmem.c=0A= @@ -119,7 +119,8 @@ static int execmem_set_direct_map_valid(struct vm_struc= t *vm, bool valid)=0A= int err =3D 0;=0A= =0A= for (int i =3D 0; i < vm->nr_pages; i +=3D nr) {=0A= - err =3D set_direct_map_valid_noflush(vm->pages[i], nr, valid);=0A= + err =3D set_direct_map_valid_noflush(page_address(vm->pages[i]),=0A= + nr, valid);=0A= if (err)=0A= goto err_restore;=0A= updated +=3D nr;=0A= @@ -129,7 +130,8 @@ static int execmem_set_direct_map_valid(struct vm_struc= t *vm, bool valid)=0A= =0A= err_restore:=0A= for (int i =3D 0; i < updated; i +=3D nr)=0A= - set_direct_map_valid_noflush(vm->pages[i], nr, !valid);=0A= + set_direct_map_valid_noflush(page_address(vm->pages[i]), nr,=0A= + !valid);=0A= =0A= return err;=0A= }=0A= diff --git a/mm/secretmem.c b/mm/secretmem.c=0A= index 11a779c812a7..fd29b33c6764 100644=0A= --- a/mm/secretmem.c=0A= +++ b/mm/secretmem.c=0A= @@ -72,7 +72,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= goto out;=0A= }=0A= =0A= - err =3D set_direct_map_invalid_noflush(folio_page(folio, 0));=0A= + err =3D set_direct_map_invalid_noflush(folio_address(folio));=0A= if (err) {=0A= folio_put(folio);=0A= ret =3D vmf_error(err);=0A= @@ -87,7 +87,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf)= =0A= * already happened when we marked the page invalid=0A= * which guarantees that this call won't fail=0A= */=0A= - set_direct_map_default_noflush(folio_page(folio, 0));=0A= + set_direct_map_default_noflush(folio_address(folio));=0A= folio_put(folio);=0A= if (err =3D=3D -EEXIST)=0A= goto retry;=0A= @@ -151,7 +151,7 @@ static int secretmem_migrate_folio(struct address_space= *mapping,=0A= =0A= static void secretmem_free_folio(struct folio *folio)=0A= {=0A= - set_direct_map_default_noflush(folio_page(folio, 0));=0A= + set_direct_map_default_noflush(folio_address(folio));=0A= folio_zero_segment(folio, 0, folio_size(folio));=0A= }=0A= =0A= diff --git a/mm/vmalloc.c b/mm/vmalloc.c=0A= index 61caa55a4402..8822f73957d9 100644=0A= --- a/mm/vmalloc.c=0A= +++ b/mm/vmalloc.c=0A= @@ -3342,14 +3342,17 @@ struct vm_struct *remove_vm_area(const void *addr)= =0A= }=0A= =0A= static inline void set_area_direct_map(const struct vm_struct *area,=0A= - int (*set_direct_map)(struct page *page))=0A= + int (*set_direct_map)(const void *addr))=0A= {=0A= int i;=0A= =0A= /* HUGE_VMALLOC passes small pages to set_direct_map */=0A= - for (i =3D 0; i < area->nr_pages; i++)=0A= - if (page_address(area->pages[i]))=0A= - set_direct_map(area->pages[i]);=0A= + for (i =3D 0; i < area->nr_pages; i++) {=0A= + const void *addr =3D page_address(area->pages[i]);=0A= +=0A= + if (addr)=0A= + set_direct_map(addr);=0A= + }=0A= }=0A= =0A= /*=0A= -- =0A= 2.50.1=0A= =0A=