From patchwork Wed Oct 23 16:27:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13847505 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 4BDB8CFA44E for ; Wed, 23 Oct 2024 16:29:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D858D6B00A7; Wed, 23 Oct 2024 12:29:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0E926B00A8; Wed, 23 Oct 2024 12:29:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B87F26B00A9; Wed, 23 Oct 2024 12:29:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 96E246B00A7 for ; Wed, 23 Oct 2024 12:29:51 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 731DCC0DD9 for ; Wed, 23 Oct 2024 16:29:32 +0000 (UTC) X-FDA: 82705402542.07.410DC0A Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id 5F93114000A for ; Wed, 23 Oct 2024 16:29:38 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CdMzqkFo; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729700912; a=rsa-sha256; cv=none; b=fQUdvkM7IbuWhgYyma/gs7WTDkRnkxlU2bW+soDcibHFKe/ZJDgTZdss989AIZfN2JkOet f9ByUddi1sUYSfGhXzXKHhec7Jl0+1Iu1wnpd1TM5MhkRv1ChnZuX875wvPHJ2Rb5Jq8Zi lgKAWb8gdEYdBjSNPUnXm5Cp9qliQV0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CdMzqkFo; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@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=1729700912; 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=nMtx646qoAz8k0hrv0Ewms9p88A8qIHsv5cNI5fi5c0=; b=apKBxtZFSfxMS7tTq7p9X4EdfusB7+hN0Ehe+E/VtDp0ga79xUGwtgNfukybOnx6kleHoP Xz/KtnbFTdFTL/WLBg0AQhV5kPstYYyaVxXrMd81uTiAStTM6rDN/5UWEebcju27+3SHps NkOJm0RWxYEAY6lCFGNChlWRA/cxmEs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 49FACA41869; Wed, 23 Oct 2024 16:29:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 049B0C4CEE4; Wed, 23 Oct 2024 16:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729700987; bh=nyFGHJdxaOJGfMON4ADcqNZmm4B8ZcjCFybfUwv2QVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CdMzqkFoGWX2b7PqUYjaOLgPsSgx3plKCU2vqNIX57DWGYdA1jQq4ksX86hcp0Ugv TTVaihtq3olFqvVRmH4ux8HQokYedngI7cAAhfPrCPYYsXHZZoiN6pzJ3nAylPiH7K bb3YEyoMAywWZl5IK4NAIOnByYJRe15tMtAbd8c35ogVw5e7dfuIjpFNGGCC1fiF6J /n44T1S2NIJoA2evc0gIvR+SyqVMDPqyfLYX2YcniiVUZMFhNwBT2CtJTAHhahGj3z RBCgFt12Z6rRkFTgodgEgYga72XUQsWs+/9cBfVknah4t5l6IuPX9VAK7YH01aas8U j3vCYJbVvZIxQ== From: Mike Rapoport To: Andrew Morton , Luis Chamberlain Cc: Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Steven Rostedt , Suren Baghdasaryan , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v7 8/8] x86/module: enable ROX caches for module text on 64 bit Date: Wed, 23 Oct 2024 19:27:11 +0300 Message-ID: <20241023162711.2579610-9-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023162711.2579610-1-rppt@kernel.org> References: <20241023162711.2579610-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 8denfohiu44w393h96yrqdgtzdnswz9x X-Rspamd-Queue-Id: 5F93114000A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1729700978-967191 X-HE-Meta: U2FsdGVkX18vyYsKD8eDj6RbOkC2FV4Z09jPXiLbtFmYJLbV7dEMPVOk+ulVxV7XLVO2YxUy2QaNQRsBJ/LWGPD0QYsCif/4a61svF5Yj4pPB+aeoAoebiIdKeL90rQRBaNreJNmbsaWCPlQHYzLG5CjYW1HQ22hPOetIe67X3ooE1JfgNxn0TkSFXKTj8Zt2uwTzj6jjOYViEMOEk/MVhvQ1/eD3eUqR6PqmrJ1mUBnfoVz+W6IMTN6PCaQhDBC40u7eAhCaa8hZO32WDHXobNrOFfnU3iYXz5URsquxtWl+2ejQP6BS+QERetw+E/UubBH4sljf7oqB6yyZNtBeXW3qZFuhmRImlKeQYwhXYxyQGmO1cqEKKOdVC8UFoMRiTlgvMvbIeZ8KMZFqYG5CXUsk3a69z413EZAxvDBjcxW+Xpr/kwcya0oP5qqY3lR24HikSnGOAXoaoxgBn5S0hufRZSDdGk/gLfkr86vSpyOXN9ZVowu2pw9phDBGV9ZgYG3iYX5z0cvki1G1Yf1IBbLfZsqm/q9HfH3IJDWnwCEGPprvzFFesof+aYN80kX5WSjBaEUYhGCV4YNPX53/af+2qdBrqbkoEOBcsQtlqKSDyAs2pQSyb/UN673CKgdU4X14ipj8lgV3nrjuD0upQPXwCoBf/VlMZ2U7WlwCduyU6i5rZ+ByMVo3IkPQZrFiEatzyU9kxCq/bS7m7DK+kUFVq7XmyhEauBztbnic0I55jVCH9IQul8PizmwR7/xltxF+8P2ipAReVErSg6rL/XmiLpfo0Q/qb5OEtiah9/lgjfOcE83c1kxTiIuCKAvZ6tKQ1ZKf3rWGtYzjW4h2MoyPfR6WK3SVybXP4WegpG9b5vACcKg7gX43exLD3QVrq1WokHj+n+QuiPn9nOjChd3RizxQtdM4qKDQkPug47WmdjSppTbFuVrID0A+xJrQlZPyWHV/2dxjmgjiXV HxwG74+b H1tEolYm8LKDc7ilgaKLxjD7EjIjKWM/cXXvE/QdL1vNVj00k16l1+6dnVpiBrAJZYDqmayieEvHofmw3avMw77khkbr97LOo7ZRCK0LbWzp/xD2lDooPrPWBsv/r89XNp8opKM8cx2Mv08i1UUYsfaHdGalce8Y0DVefdM00h4og2QnQ/agMXXBc/pYrNx3/vDzjIpdMWF/QaVJEtQm4vy/DYaDDFFFBCvsJTGnrkuJiCra17m2H2gHqClqSujnS+NvBc1LXjZ+OLWQ= 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: "Mike Rapoport (Microsoft)" Enable execmem's cache of PMD_SIZE'ed pages mapped as ROX for module text allocations on 64 bit. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Luis Chamberlain Tested-by: kdevops --- arch/x86/Kconfig | 1 + arch/x86/mm/init.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2852fcd82cbd..ff71d18253ba 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -83,6 +83,7 @@ config X86 select ARCH_HAS_DMA_OPS if GART_IOMMU || XEN select ARCH_HAS_EARLY_DEBUG if KGDB select ARCH_HAS_ELF_RANDOMIZE + select ARCH_HAS_EXECMEM_ROX if X86_64 select ARCH_HAS_FAST_MULTIPLIER select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index eb503f53c319..c2e4f389f47f 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1053,18 +1053,53 @@ unsigned long arch_max_swapfile_size(void) #ifdef CONFIG_EXECMEM static struct execmem_info execmem_info __ro_after_init; +#ifdef CONFIG_ARCH_HAS_EXECMEM_ROX +void execmem_fill_trapping_insns(void *ptr, size_t size, bool writeable) +{ + /* fill memory with INT3 instructions */ + if (writeable) + memset(ptr, INT3_INSN_OPCODE, size); + else + text_poke_set(ptr, INT3_INSN_OPCODE, size); +} +#endif + struct execmem_info __init *execmem_arch_setup(void) { unsigned long start, offset = 0; + enum execmem_range_flags flags; + pgprot_t pgprot; if (kaslr_enabled()) offset = get_random_u32_inclusive(1, 1024) * PAGE_SIZE; start = MODULES_VADDR + offset; + if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX)) { + pgprot = PAGE_KERNEL_ROX; + flags = EXECMEM_KASAN_SHADOW | EXECMEM_ROX_CACHE; + } else { + pgprot = PAGE_KERNEL; + flags = EXECMEM_KASAN_SHADOW; + } + execmem_info = (struct execmem_info){ .ranges = { - [EXECMEM_DEFAULT] = { + [EXECMEM_MODULE_TEXT] = { + .flags = flags, + .start = start, + .end = MODULES_END, + .pgprot = pgprot, + .alignment = MODULE_ALIGN, + }, + [EXECMEM_KPROBES ... EXECMEM_BPF] = { + .flags = EXECMEM_KASAN_SHADOW, + .start = start, + .end = MODULES_END, + .pgprot = PAGE_KERNEL, + .alignment = MODULE_ALIGN, + }, + [EXECMEM_MODULE_DATA] = { .flags = EXECMEM_KASAN_SHADOW, .start = start, .end = MODULES_END,