From patchwork Mon Apr 29 12:16:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13646782 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 E3B1FC25B10 for ; Mon, 29 Apr 2024 12:19:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E7C86B009A; Mon, 29 Apr 2024 08:19:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 797C26B009B; Mon, 29 Apr 2024 08:19:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 638416B009C; Mon, 29 Apr 2024 08:19:28 -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 460136B009A for ; Mon, 29 Apr 2024 08:19:28 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B4BA3121B07 for ; Mon, 29 Apr 2024 12:19:27 +0000 (UTC) X-FDA: 82062474774.09.E9CC4C5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 1AC40180036 for ; Mon, 29 Apr 2024 12:19:23 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MmvWvxbC; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714393164; 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=L2IvRt6u6jqo/e5amHBUqWQrOE6g/Jgm0JvMVudiXTE=; b=KoASbDr0F+Nu6FgBAIdkeFH9G0g1uNdP5fvjcgOptPRo3VoPqEz0IzwPqVs/uyIlQefNdV +mO4Br0lSrWihQDjgz2FKwP+DgDm8L2PrsiIe99IisJNDqgID2VvjIYGTn8WR6wli0+L0W r4Q3Wj3aZ7OZqEzgP68vaBokaN6ucWg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MmvWvxbC; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714393164; a=rsa-sha256; cv=none; b=nkhGt8Ju6sqD+Etz7/9e/igSDGkChB37Xg9DRivKd7gUhQa9KfrKibCkh5oayCyN1/y8AH LoWTVyUs/6BoD05H01c6Siing5dHgPZzzT+BOYlh+xBA0uSB9thTWNcLdwmNvp4xg85xWO ehzKNS9Sz7UVG37q6NYEgLMHoHDsNvk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4115760CF4; Mon, 29 Apr 2024 12:19:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1518AC4AF1C; Mon, 29 Apr 2024 12:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714393157; bh=dj8Jeem56mTOW4r4fQ6hbW3YTYti2N5hSv58QgNFPjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MmvWvxbC0HGTjKznBDq5WvNVUvymJ1XQrKqyn/OVi8liMXpHcQT38BD78iN0jrzIc QCK25AaJ5h6mcydeXdfzBUTc4xUaXrWbrAaWdBuFmTl/RCkXHdnN/iPijhgL45JYe0 eXQ18cphcIbLcZNXfloTS6rlbQ9MTc9Txu4k8o3MY4KP0mAfQqILil2NMPrXMcwnak 6sIqAhTOM4p1HykmXgzfa3hLG21FfFWgMeB2KKtIo95gGUtfWNF9j5Vdt45GD30uqh 4QcH3ZbXMjkBY6nfwBBwL8WMVQkEl8iann/2QSk4rfiIqEk4IqoC7S5W/YvtwYo2Zh zAkBFTnQiwjWg== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexandre Ghiti , Andrew Morton , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Catalin Marinas , Christophe Leroy , "David S. Miller" , Dinh Nguyen , Donald Dutile , Eric Chanudet , Heiko Carstens , Helge Deller , Huacai Chen , Kent Overstreet , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Michael Ellerman , Mike Rapoport , Nadav Amit , Palmer Dabbelt , Peter Zijlstra , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Rick Edgecombe , Russell King , Sam Ravnborg , Song Liu , Steven Rostedt , Thomas Bogendoerfer , Thomas Gleixner , Will Deacon , bpf@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, netdev@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v7 14/16] powerpc: use CONFIG_EXECMEM instead of CONFIG_MODULES where appropriate Date: Mon, 29 Apr 2024 15:16:18 +0300 Message-ID: <20240429121620.1186447-15-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240429121620.1186447-1-rppt@kernel.org> References: <20240429121620.1186447-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1AC40180036 X-Stat-Signature: gsud7h1xdums433dqdt9didnu3j3xkde X-Rspam-User: X-HE-Tag: 1714393163-492628 X-HE-Meta: U2FsdGVkX1822QV8p7XuzVG4nfA4mu+Olim/lVPNO8QGoLh4IqFToIKM98dw2hoXt6E4ODlfQYX4hXy18Hi5oEhtcYiSfGXNNJ2xydzqKW9DNPxAoh6F00ADr3iDL2OK/JjrdQV0Z8g5xgDpfF5GUhZtFAoE6csiYHjB9WY2cybn69gdwaqis8/8Z0IWr28j51neH0qnEx+SkVVE3aNX6KQ+9gzIVRu8T4ML44Bf6sX3MHuffceWJUjFlSOIENTlwOf47HOL4KwapOjkb9gqx6plSqQoidk20G0atnFbYe+ZQkmis6DM3k4fVILt+wQ2xINcUAzR8yVRVcPJoe/u0+dJf8dmcvZSZZnyDKFccqQvIXjU0vRfXBa3fQKLhkeoUPP4hGHRKOnsu9VPbGFIWJXkxNjQNOAAl1PPmQzuZqiwBVTu9skS58YLasoZmgRAEj/xJ3jSdeA2Aju2is/UAtr47eQKCwDFDgJrCGB1oIWj/Yt0OChuXwQyKQkNck4bmPJysXhRc4zL497CWKVRuDbcxnElG4V52uD8vJtuuDD9u4BAF6bRjYOhyvxG2fga/Ub3QyxXTbcE7x2b+laGCmJx/QuXZzlP7r9dgKbNVYQbpsiC57ok71RjPZEXoohtNGRpnRKL5ys639iL7+Y7/5+NI8vkCzKJO5VWFrK2ExbQrS6PKY/eyOb5elePD16nAtNksx11a37EGlmJxQgVXJ+KlNczfUUJSkF/Zmh7DW89Ofc5IwSUe/c6Mcw8a2Px5uyHZWatxhESDJHj6lyD3e0iouDn+e9ub60+BVrC8B/3tYEITeaKkwgPrKWKkso2ptlyOcM0Ewweli7XS1ZK7FjPgliKEwOEYC+FVPc2xUSLE2oBpJeY4xfWnLCgf2iXSqpkrX6EAiLPItmsbZ9yFZQMhbBr+s6TeP1rFoxsfGzgIDSN4rYGEm7WTomdvqAuGEgwCdgw6w6wjx3bVC3 3YwQCyq+ KDxMlcU5ZCJfWb4y/IG/8YjheGZCMUTs7ItxfuZ6oouiG6pIfz8JO6hdm1aDsq52PKWJrf65iPbJ1E2+KvSWoJOBZaMvfDi/hgQMAzBw23ekm7a1dodRmSXxFtUMnGmwk/ik0CsMqy5NAGQyqxWQX2lB+IQ== 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 (IBM)" There are places where CONFIG_MODULES guards the code that depends on memory allocation being done with module_alloc(). Replace CONFIG_MODULES with CONFIG_EXECMEM in such places. Signed-off-by: Mike Rapoport (IBM) --- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/kasan.h | 2 +- arch/powerpc/kernel/head_8xx.S | 4 ++-- arch/powerpc/kernel/head_book3s_32.S | 6 +++--- arch/powerpc/lib/code-patching.c | 2 +- arch/powerpc/mm/book3s32/mmu.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1c4be3373686..2e586733a464 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -285,7 +285,7 @@ config PPC select IOMMU_HELPER if PPC64 select IRQ_DOMAIN select IRQ_FORCED_THREADING - select KASAN_VMALLOC if KASAN && MODULES + select KASAN_VMALLOC if KASAN && EXECMEM select LOCK_MM_AND_FIND_VMA select MMU_GATHER_PAGE_SIZE select MMU_GATHER_RCU_TABLE_FREE diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index 365d2720097c..b5bbb94c51f6 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -19,7 +19,7 @@ #define KASAN_SHADOW_SCALE_SHIFT 3 -#if defined(CONFIG_MODULES) && defined(CONFIG_PPC32) +#if defined(CONFIG_EXECMEM) && defined(CONFIG_PPC32) #define KASAN_KERN_START ALIGN_DOWN(PAGE_OFFSET - SZ_256M, SZ_256M) #else #define KASAN_KERN_START PAGE_OFFSET diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 647b0b445e89..edc479a7c2bc 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -199,12 +199,12 @@ instruction_counter: mfspr r10, SPRN_SRR0 /* Get effective address of fault */ INVALIDATE_ADJACENT_PAGES_CPU15(r10, r11) mtspr SPRN_MD_EPN, r10 -#ifdef CONFIG_MODULES +#ifdef CONFIG_EXECMEM mfcr r11 compare_to_kernel_boundary r10, r10 #endif mfspr r10, SPRN_M_TWB /* Get level 1 table */ -#ifdef CONFIG_MODULES +#ifdef CONFIG_EXECMEM blt+ 3f rlwinm r10, r10, 0, 20, 31 oris r10, r10, (swapper_pg_dir - PAGE_OFFSET)@ha diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index c1d89764dd22..57196883a00e 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -419,14 +419,14 @@ InstructionTLBMiss: */ /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_IMISS -#ifdef CONFIG_MODULES +#ifdef CONFIG_EXECMEM lis r1, TASK_SIZE@h /* check if kernel address */ cmplw 0,r1,r3 #endif mfspr r2, SPRN_SDR1 li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC rlwinm r2, r2, 28, 0xfffff000 -#ifdef CONFIG_MODULES +#ifdef CONFIG_EXECMEM li r0, 3 bgt- 112f lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ @@ -442,7 +442,7 @@ InstructionTLBMiss: andc. r1,r1,r2 /* check access & ~permission */ bne- InstructionAddressInvalid /* return if access not permitted */ /* Convert linux-style PTE to low word of PPC-style PTE */ -#ifdef CONFIG_MODULES +#ifdef CONFIG_EXECMEM rlwimi r2, r0, 0, 31, 31 /* userspace ? -> PP lsb */ #endif ori r1, r1, 0xe06 /* clear out reserved bits */ diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index c6ab46156cda..7af791446ddf 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -225,7 +225,7 @@ void __init poking_init(void) static unsigned long get_patch_pfn(void *addr) { - if (IS_ENABLED(CONFIG_MODULES) && is_vmalloc_or_module_addr(addr)) + if (IS_ENABLED(CONFIG_EXECMEM) && is_vmalloc_or_module_addr(addr)) return vmalloc_to_pfn(addr); else return __pa_symbol(addr) >> PAGE_SHIFT; diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c index 100f999871bc..625fe7d08e06 100644 --- a/arch/powerpc/mm/book3s32/mmu.c +++ b/arch/powerpc/mm/book3s32/mmu.c @@ -184,7 +184,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top) static bool is_module_segment(unsigned long addr) { - if (!IS_ENABLED(CONFIG_MODULES)) + if (!IS_ENABLED(CONFIG_EXECMEM)) return false; if (addr < ALIGN_DOWN(MODULES_VADDR, SZ_256M)) return false;