From patchwork Fri Feb 21 14:28:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tip-bot2 for Kirill A. Shutemov" X-Patchwork-Id: 13985603 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 ED99CC021B6 for ; Fri, 21 Feb 2025 14:28:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82110280001; Fri, 21 Feb 2025 09:28:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CF7F28000A; Fri, 21 Feb 2025 09:28:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 630C1280001; Fri, 21 Feb 2025 09:28:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3198328000A for ; Fri, 21 Feb 2025 09:28:43 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C465E14120F for ; Fri, 21 Feb 2025 14:28:42 +0000 (UTC) X-FDA: 83144182884.16.3126B7B Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf19.hostedemail.com (Postfix) with ESMTP id BA0771A001A for ; Fri, 21 Feb 2025 14:28:40 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=WwYJDxOk; dkim=pass header.d=linutronix.de header.s=2020e header.b=OhmXpsIH; spf=pass (imf19.hostedemail.com: domain of tip-bot2@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=tip-bot2@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740148121; h=from:from:sender:sender:reply-to: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=KWndIPAXGE91G/D4TOAKxIsbHn8ei0K5UzfIIzlINAI=; b=olPRXVR8lpJIptnPwxlC6m1P6SXiqgVCcCHwekt744lETnjpmvxB//GrdX0WbL2EG/A4Yl g8Qp0V7AxM/bZnZ3RFBV24U2J7lZU9sVtmZTv/iKHW4NusTyTxjU4COR6KEVP2dNgg2X8e r59Hf1W4jJ9iCBUIVprgyCnEu8KnkNA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=WwYJDxOk; dkim=pass header.d=linutronix.de header.s=2020e header.b=OhmXpsIH; spf=pass (imf19.hostedemail.com: domain of tip-bot2@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=tip-bot2@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740148121; a=rsa-sha256; cv=none; b=PP9vGBHYoPtta6kZU8ADVRZEHmoQcvGks6rFuHTtcfxsUyOnuIYYBKzS2mklk3O0aXIjev WFNGrYgRl8CUHUikrosb776SO848D8/wt0US/Ah/X24wNEWeuViGft4k90QUSNW3z6eTGF 0Ji30Wc2vEgx5abOEAW7FxEP544htUo= Date: Fri, 21 Feb 2025 14:28:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1740148119; h=from:from:sender:sender:reply-to: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; bh=KWndIPAXGE91G/D4TOAKxIsbHn8ei0K5UzfIIzlINAI=; b=WwYJDxOk7ieQwcquxiZW4fyM/CD9NC8re3G3C/mnYHwnan9ag8SzWQxNHvbKf82xzYNgVl WsJ+SkGGxyK7nIYw7fQhaKEVoiwktNvuyVPbpXptsNJXBLNFE7IyCWrUhuzoHS2I07zvN2 auILsO/E6iBxYIqpLVmdDouTivZo3mjRlNJdHvoMlczgt7c/aHYHkbgcC/Nn3HqyxtQUAC dNhCK5jPeLMVURUQ+QxXm8x0Ibo4gj1zB7p4ttXpoweJf+DS2OUu3Gr6XNsZPBwtPcWetU RtTmVEiCLmzlSRMocdChmE33s8vXG/o29QxKYjhpZqtUp6Tl7mv4L6bxAaERGQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1740148119; h=from:from:sender:sender:reply-to: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; bh=KWndIPAXGE91G/D4TOAKxIsbHn8ei0K5UzfIIzlINAI=; b=OhmXpsIHCHk66LVxzlotJzoEoOSP2NZJU3f+36Tdk+u33z0nXJad6Yh2C2V85aW6Duz5GU /yr7tfPAhiEN24BQ== From: "tip-bot2 for Kirill A. Shutemov" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] mm/memremap: Pass down MEMREMAP_* flags to arch_memremap_wb() Cc: "Kirill A. Shutemov" , Ingo Molnar , Andrew Morton , Dave Hansen , linux-mm@kvack.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250217163822.343400-2-kirill.shutemov@linux.intel.com> References: <20250217163822.343400-2-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Message-ID: <174014811865.10177.8934046854387322499.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Rspam-User: X-Rspamd-Queue-Id: BA0771A001A X-Stat-Signature: ayksaszo4k8uqckt6z5w9id43z587zy5 X-Rspamd-Server: rspam03 X-HE-Bulk: true X-HE-Tag: 1740148120-958326 X-HE-Meta: U2FsdGVkX18VBMBsWCUwcfuWbZNu3uYtLQYYefENHEYtwDxvlmYJRmDLbS+kcyuuR5YskVVTliMTnksTQ30azwuOhQfQcDJshssPGpxxkjzjEoeEsM9FH3Mdt7LYRhWOKL7fpmcW7cGC8kVl9U7Ib2+NEHZ5EzNbPiUySejkpuRH6NKBA0gncb+00PVlJAYifsm8F2WhQUiYNO7pTauDXxPn5aiwg0ZdsUA0pOySkAny0Oc9I6GgnFauCY9KTt24JmJu7vdOub0EeWc5z1V6G+6gK9WHoC53j9sNZch92JEPwNMAmRsw0q1DjRGmUl6NfH3MHTA+MEvjZceXxCNAj8SpkjxnUgTUgaIfVh7LmV8bYe1E2eyWQwGzpneFsimvVOWRlLeAI/0hCRzT8wNECkZzubQFCe/F0pTicAH+PYx10Q9EObZMzKCNyCOnr2IrnG9cbYCZZD2UqTD5kIvk7Cnwq6bKitfLOBQe0w1d080heeBoy3NANVcodc88EOto0H5XQ0e9gUC+4AIeNRf3yW9VVaZEe7v7sB4C5aRoUAR7lRMqmlsfrltrbGpYLewpifoh8RKuFDlPrK3AnONaZPcwr27NPtywkYmdMEby8zkOLDTh6WCKYnyL5tcH8+K4PqNfDmLbbzhg9kAfOdEtlAjxc3hf5x0IQElkJj4HCxy+PH6jXgYXHMmp2gF8ClgDnWrbFiFXHkz20GU0ReBMyhl76d6Anzsvb6t5MDX6LrJtJs58avVcWgV3IE228pQ7yxLXhB6T4/ZnucM8y2aAph8vk5f6UN0xzGxorWFbrkcRBMDoU7CHEdrfVO7kS38J80XORcBy72fpd2XQgx9EmhWRhFFgI/FVm5HgNXhY+MkGzGhoZBYpXItJSFsLhPGTleDAmf3ZHffY7q+OiSHCkgcHwtBuwLmYKdnTWvE61hF75xNrCnoj1BqTrXuZ3cdwOCRDDUdO/JhwuvWrh+r /OL6YC2D ZXCgtfSb6Wuv99EyDVok1lag1dJjl5e075jowhXKXU2uBkik2Kjr4NW5jeQQSo4jhyL8f95zt1mZg7PhUFBsdPDxbS2MdiKKA/kVngFpSC9P8Nj07n6rDEQiTQKx/DsSlu0M18shkcwPH3Lk6183hIqIp4FUov814EoK5xDqVnM4M5kDUiYsAbYXawaQqHdC1bxhO0kujcbGfpxTWnd7COjsIFGbhdMCih6OWCRRuroCdm1X8gKilFW0bcwKmPqLtpkmgnWVHTqGwOt8RzDDqfyfDqDPlBIGweTzVaBfOB3PoNHxYJbIlpCC1AkL7rZH7amSVV/LH5bpCCroztECsUvsv0pkLBDFW4/7xROThlnTh134Z3BqYstzNXTf1lJA1JCOrJcUM+23/XAGg4Uy4l/Z++t4ndsrJJH4Jp0rRLiLdQcISdQ01rdJ7Ka2CEplqcS3CZMHAhkt45ky8dR+i3VWHAxs36qkMWZ7KGCEf4BSFzksyWRUnHNIxBfPRyLsXdNDmiz/Hv7VAaZTdy4UN5gTsVUwW1pk9gQGmjJdZqApoffkNoVZTu1vFmh9vAFUB1r5zygk+Iq+/aHHTcKeiTprqLA== 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: The following commit has been merged into the x86/mm branch of tip: Commit-ID: a9ebcb88136ca80cb53de27ca5ae77de18bbe368 Gitweb: https://git.kernel.org/tip/a9ebcb88136ca80cb53de27ca5ae77de18bbe368 Author: Kirill A. Shutemov AuthorDate: Mon, 17 Feb 2025 18:38:20 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 21 Feb 2025 15:05:38 +01:00 mm/memremap: Pass down MEMREMAP_* flags to arch_memremap_wb() x86 version of arch_memremap_wb() needs the flags to decide if the mapping has to be encrypted or decrypted. Pass down the flag to arch_memremap_wb(). All current implementations ignore the argument. Signed-off-by: Kirill A. Shutemov Signed-off-by: Ingo Molnar Cc: Andrew Morton Cc: Dave Hansen Cc: linux-mm@kvack.org Link: https://lore.kernel.org/r/20250217163822.343400-2-kirill.shutemov@linux.intel.com --- arch/arm/include/asm/io.h | 2 +- arch/arm/mm/ioremap.c | 2 +- arch/arm/mm/nommu.c | 2 +- arch/riscv/include/asm/io.h | 2 +- kernel/iomem.c | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 1815748..bae5edf 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -381,7 +381,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); void iounmap(volatile void __iomem *io_addr); #define iounmap iounmap -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size); +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags); #define arch_memremap_wb arch_memremap_wb /* diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 89f1c97..748698e 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -436,7 +436,7 @@ void __arm_iomem_set_ro(void __iomem *ptr, size_t size) set_memory_ro((unsigned long)ptr, PAGE_ALIGN(size) / PAGE_SIZE); } -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags) { return (__force void *)arch_ioremap_caller(phys_addr, size, MT_MEMORY_RW, diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 1a8f691..d638cc8 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -248,7 +248,7 @@ void __iomem *pci_remap_cfgspace(resource_size_t res_cookie, size_t size) EXPORT_SYMBOL_GPL(pci_remap_cfgspace); #endif -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags) { return (void *)phys_addr; } diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 1c5c641..0257f4a 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -136,7 +136,7 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) #include #ifdef CONFIG_MMU -#define arch_memremap_wb(addr, size) \ +#define arch_memremap_wb(addr, size, flags) \ ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) #endif diff --git a/kernel/iomem.c b/kernel/iomem.c index dc21207..75e61c1 100644 --- a/kernel/iomem.c +++ b/kernel/iomem.c @@ -6,7 +6,8 @@ #include #ifndef arch_memremap_wb -static void *arch_memremap_wb(resource_size_t offset, unsigned long size) +static void *arch_memremap_wb(resource_size_t offset, unsigned long size, + unsigned long flags) { #ifdef ioremap_cache return (__force void *)ioremap_cache(offset, size); @@ -91,7 +92,7 @@ void *memremap(resource_size_t offset, size_t size, unsigned long flags) if (is_ram == REGION_INTERSECTS) addr = try_ram_remap(offset, size, flags); if (!addr) - addr = arch_memremap_wb(offset, size); + addr = arch_memremap_wb(offset, size, flags); } /*