From patchwork Fri Apr 26 08:28:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13644311 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 ACDDFC4345F for ; Fri, 26 Apr 2024 08:31:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E6086B00B2; Fri, 26 Apr 2024 04:31:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3715B6B00B3; Fri, 26 Apr 2024 04:31:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C22F6B00B4; Fri, 26 Apr 2024 04:31:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id ECF886B00B2 for ; Fri, 26 Apr 2024 04:31:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 94D861A0793 for ; Fri, 26 Apr 2024 08:31:56 +0000 (UTC) X-FDA: 82051015032.21.B95CEF2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf10.hostedemail.com (Postfix) with ESMTP id 4680EC000B for ; Fri, 26 Apr 2024 08:31:53 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T2zDQNxT; spf=pass (imf10.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714120315; 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=ZoaTKIDL4qmEUZLhoxs40DTczOotHWC6D42wMaHf4/ImvxyBvPVU9GZdAdHYgz0dyOLaIb gudjUB/780BQWVnyDfJl77oweQBLeUUv8OliTrOKb4ABKyGM7s3S0ZyQp6b6MWFe2oXu1u YkWgOFBn8+iiXnrhHCP2MG+NTYlYJEo= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T2zDQNxT; spf=pass (imf10.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714120315; a=rsa-sha256; cv=none; b=mVxGoFsGDyH4kXeCAI3vBHr9zPQER+AXvcUa6DYlpRcC8YMP7ztPr8eMQAP+Lhju+yhLQ8 7qb+htVslNkmc5PpKW8uVxJPRAx9JT5t/syuhhKjMLPCLHa/IUb/5aoV0u5PjOsqDEWCjs g57vjWHehekKVzqk8YCS7aCxmPQTweA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id E5F5FCE1BDD; Fri, 26 Apr 2024 08:31:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83575C4AF0E; Fri, 26 Apr 2024 08:31:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714120310; bh=dj8Jeem56mTOW4r4fQ6hbW3YTYti2N5hSv58QgNFPjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2zDQNxTHEoxJ4aCR22G281nOiollvnCxQOab3enluXTsoB12YVvViBnoB7fetYqJ Qz4E+LTwmZak2qqvfhx89kkdiLHJLSAEA7mzcmpZ3CQivx/dOvo6Kp/Fs+m/P+7Sky 5HWHTSNpba7DicZuIx2fsYuSovhdErrakpV+E62oVc4AFfW+9oMqab0M2onJnInPx+ Sw3HlM3ogzwYsgrEIdl/DFTp059qi6Vt3C936iyKg8laxRC779XoBEssstc19IZg0T ODuYJ73SzaIa0u58HNGjY75N3s/l9v1NtiKzHTlR62sTKxj+VCH8EjvV1fCdIwChug QjvpJ146GlAAQ== 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 , 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 v6 14/16] powerpc: use CONFIG_EXECMEM instead of CONFIG_MODULES where appropriate Date: Fri, 26 Apr 2024 11:28:52 +0300 Message-ID: <20240426082854.7355-15-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240426082854.7355-1-rppt@kernel.org> References: <20240426082854.7355-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: pjypryuh8jrnkpobgu33wz4mbo89k75f X-Rspamd-Queue-Id: 4680EC000B X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714120313-747926 X-HE-Meta: U2FsdGVkX1/MSzsL/SMeUSHFx5YVtO1hnNm93Gvixv9BRV1kUvMZjdcYTZmaodiFwKRctjUSYUbnGq+VTKV6bvzYVq1MixVLgDYMdxUmlo7PdDZNB7uniUxIqmuv+Kw0EmzTrnJZFUdjbhsjHA4A4bl3lLu9Q8d1CpJ2gzWVgDIlaq6YTaMRQYi6t9RZHjMK3cmKzcOv9+fu/PxC1SddL0FYUjB3L2kbKe21ir5hSgIup/0Sa1Pb0Yzt9T1O2yUMoAiHTBt2Lu5eq6t8jbVNDoKx+c0B31Yj5vD09GqGzP7gp0kW9FWUKCivo/i+VQbrxHp1Vw//ydm5pDpe/TTvjzvzWpbawHS7FzqYGMU9PExKz8Wwmd+dd8yR25Esi+6CDv2BaclVJta86H1wPXP7iQJiGpBlnyA/84QsGVUiwF08vDyZF4JKYxy01g2aXipflPTQ25rQnh0Vh5TPoC0M39jfY+FC3UKmtY/uWHSEu2NN1EOInUGkLHrQZ/6Ax+cNuRDtKD1Hp+rKTk8oLiNyPNNxukO/2WS6hrmUvB3qI6MWFjTNVTLTEixH0Lm4P+kzKFnLQA3p/9HC5FjtO7AU15nYdQTClLWaK4rxxtkiQTqSsyshk9BV8OooFCzPHGNho5Gh5YnNwQ31S+xBWYR1eR4X+uluAY38kAmKud2o18d3f2EEHEJFM7qgt8WM8stoR6FS5uKHWTRZmiYXmVDGseoF1zTKB/j/Vllz6Yp5NboO8A+SgejUCS1VZvOfTovJMl1PbMmg+FxNBW8GsDPaa71Gg3m9wz6+s/+gAwqgIkjQcgTNw218eLT+B8whSP5yFHLYcXzPVYQFdeVn51myUGqAG3vqz0hP12kyFBY8yrw+0AyiKJhcBifhW8GPHMFk9WfT95soD+Rvub01Z7cnf0oElPFfc/fKLpyfwsGgeHaub9s6L5WdJIFgQb5xyltW3KPxS4fqTWHoHFXkMy7 jC4EZmvc xUHgaObb1MOUxcgTFLAul/GtXYcpj6OUI07G3x2dVJvXMyqRNhnstTCUdrpi2sNcHsgcqS4nCqdyODdQ6oEItkR5ID3PN9OPj3ZH3h1nTxuKIQtYI34xR+mz7AqSzKMeHxaIxcPDpxa3A4YcbTldzeywd2a7izK7QP14Yi1KHxaiQ26//LCjYoflz1u3UdZKoz/ttweABOkSGABQhIzhQZJke3n0YWiWSstytiZ/gU7Wbt9WCUQ3EKZp8j8MeDNSM4nRY51+zk7HAYFWRd3F6lUzQEtDBH8nu1r3vtqsJl2RzCz9rg9n2oGpdXtM/BS2J31Fb+BWHydGHyT4m/k+MP2xn0708n+INCtWK43IvB4hZ4Ki4Wb1XAaJVp6501laVh1wp4M5lan/HFIIvb9MS9T5kFVMUR/OZJGQnpGWbvQjItzXbUKfdtzho7Q== 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;