From patchwork Mon Apr 22 09:44:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13638119 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 4F9B2C4345F for ; Mon, 22 Apr 2024 09:45:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2C1C6B00A1; Mon, 22 Apr 2024 05:45:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8DC86B00B3; Mon, 22 Apr 2024 05:45:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B08D26B00BE; Mon, 22 Apr 2024 05:45:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 87E306B00A1 for ; Mon, 22 Apr 2024 05:45:37 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 457DD1A0B13 for ; Mon, 22 Apr 2024 09:45:37 +0000 (UTC) X-FDA: 82036685514.25.91BF0A2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf19.hostedemail.com (Postfix) with ESMTP id 2EE781A0013 for ; Mon, 22 Apr 2024 09:45:34 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=X5GojG1g; spf=pass (imf19.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=1713779135; a=rsa-sha256; cv=none; b=auN9OrgOsRszMs2JpmnXlqKjL3L7JNdCYEZ6Z1dokJzq8nb3AD3unJGf3AMrw8u5rD1OVX Ulxx4NbSlyly+1H6lOmWpo2sAaA67FGXh78eRn1H5N3bjXRAwxQp2lNAX93lgR8tb6/uKT ha4mOEQLLWp7/EToWHdNsotT/8sE5oY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=X5GojG1g; spf=pass (imf19.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=1713779135; 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=2feFkw2/DNFlbT2CLv51WDiwJyrr0iuGHxvu/fZCE9Y=; b=oNebHe7P1sMqF3D3uIlcxERT92+5eiyuM4+jEJDemsHJn3c+crl/+WYpXR1ivdEerKQ1U6 1iVwWZRi1C4+vDZHdKZ8Cofrhf6zlA6Qi90jI2h3r/VT2XHqx/RgUC9bHdClkFCETFVCPW KkIEIEub6yutxEBWDSqBQw9SVqxcgMA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 92AEBCE01BE; Mon, 22 Apr 2024 09:45:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74208C113CC; Mon, 22 Apr 2024 09:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713779131; bh=Q5aCDGAMhe9LWjmBOe0KfqvsLthVcLCeaQ3ItO7ykso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X5GojG1gph9GRpOmsJOxMbuBQ++rFhmnmmmU/06agzDJciSan0vwkXO8joAhjMoi7 FJF26n4EuDQ1mAXNwbOPWMm20XTFww04QXahk7BqmPSy9Cak9a4BHwP09r6tEvf2RS Np1tOm018Wt6q70XHSTrQ8Ff9HnKecqIhQH6Xbq8Die3/oZZPFAWxpJ6OmN9qGEJpN ss/eVbqhZrJVW8BaopmdWvtRNgRA7GzNdY4deOlLoEMOTHpIQw9C7rf52fnvsyyiYF xTPpSg4E1PAh91AjKgia/0PSGyi5t4HXIoibxOlfT4FRKT5krst59XLtqKj9tj0/v1 GO3DjvCwLdnHQ== 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 v5 03/15] nios2: define virtual address space for modules Date: Mon, 22 Apr 2024 12:44:24 +0300 Message-ID: <20240422094436.3625171-4-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422094436.3625171-1-rppt@kernel.org> References: <20240422094436.3625171-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 2EE781A0013 X-Stat-Signature: se1jikx6o9jdmfpb4axjyuzy8udega6r X-Rspam-User: X-HE-Tag: 1713779134-580329 X-HE-Meta: U2FsdGVkX190uA9agJObTXxWlti2iG66UA9VQuXFG3rywSYoExhghjxcVD6dSwdnmccskwdtY/yiELNrBn7pEw6c5pXfFJVG+RL4f4AKJwyVzsgcW+FFUfhDOjntpYOTNPUblM7d6SxZ4zg3OL1dPneNid+ScM2I/UVe00szl9+kvZcrFDNRMj8XJ0mRK2QS132pbOpaqq3GNU8Yb61GsLxhO0mz3JsmW9C8yFxDkY0XN21F140mQZsCA+pAN59FfOsB37c7qnBQ41h8JXvDKLzm0tzsF7REe4tVGHEqUwzJibDqU2o+Vq5qsAxR284BNIVxAl3tdS7kUzAkPz03HNz5DE1luIr7uui9pttY+JMTqmgdBAmbc5K17sOgr1ibLa3YLTb8G+ATnAQuH86VZb2fh3yzEIuHUEUvVE+uxAAMKulyyk1ougaRFZkGODOQA9JcM9TJ8pCtpJGC6rv05vLYoyc5I9eD6K4qfF5+4dxcasP/kgqiCeUo5rB8LBwlBzp557l2TtXw2x5QWjhrGqI2JUeKZGschg1/lLQJqrXEi2ldGDeEy6lOPTHd87gktp5zNhiUAHhd9SdGkAOx5bSVKzgDy5wUG0U5BsSDnEsWUAyaZegTeYlei8zP/JircHJWxzzuTvxd4w6Fe3V7GQHmyBuj8PRtGANjlCg2cKpiM+c53QF0uIvqMUe0Zpc0dSJo5MiTtupVuTPKn+4VwnVYmpdscLMw9t0DSSvaaBNnfpmSFShjLiSqQUjOoCPcqOgzPnhPjRiBrjy9C5YZfncnhB2DsJTIfDwwwlnSpeM78Fr77Ai0KkY49rOqmFJUEdKZFiFEMGX/Qmp1u/2HIHJ5ohP2Vp0Pz6Fy9rZj4m4hlhkDNIDvvckYyiqrrFrfG2jAnovOLKNBVn/tXUZ6qXgCnhOq8/uKvz54kgoMgdOpHmC/4CnB1Sz5qv328THl2WmiAr7ymYtJn17NOs7 PTZJHaT/ oFur5MTX4DEUu8SLIJ/y5cnS1ZQ== 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)" nios2 uses kmalloc() to implement module_alloc() because CALL26/PCREL26 cannot reach all of vmalloc address space. Define module space as 32MiB below the kernel base and switch nios2 to use vmalloc for module allocations. Suggested-by: Thomas Gleixner Acked-by: Dinh Nguyen Acked-by: Song Liu Signed-off-by: Mike Rapoport (IBM) --- arch/nios2/include/asm/pgtable.h | 5 ++++- arch/nios2/kernel/module.c | 19 ++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h index d052dfcbe8d3..eab87c6beacb 100644 --- a/arch/nios2/include/asm/pgtable.h +++ b/arch/nios2/include/asm/pgtable.h @@ -25,7 +25,10 @@ #include #define VMALLOC_START CONFIG_NIOS2_KERNEL_MMU_REGION_BASE -#define VMALLOC_END (CONFIG_NIOS2_KERNEL_REGION_BASE - 1) +#define VMALLOC_END (CONFIG_NIOS2_KERNEL_REGION_BASE - SZ_32M - 1) + +#define MODULES_VADDR (CONFIG_NIOS2_KERNEL_REGION_BASE - SZ_32M) +#define MODULES_END (CONFIG_NIOS2_KERNEL_REGION_BASE - 1) struct mm_struct; diff --git a/arch/nios2/kernel/module.c b/arch/nios2/kernel/module.c index 76e0a42d6e36..9c97b7513853 100644 --- a/arch/nios2/kernel/module.c +++ b/arch/nios2/kernel/module.c @@ -21,23 +21,12 @@ #include -/* - * Modules should NOT be allocated with kmalloc for (obvious) reasons. - * But we do it for now to avoid relocation issues. CALL26/PCREL26 cannot reach - * from 0x80000000 (vmalloc area) to 0xc00000000 (kernel) (kmalloc returns - * addresses in 0xc0000000) - */ void *module_alloc(unsigned long size) { - if (size == 0) - return NULL; - return kmalloc(size, GFP_KERNEL); -} - -/* Free memory returned from module_alloc */ -void module_memfree(void *module_region) -{ - kfree(module_region); + return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, + GFP_KERNEL, PAGE_KERNEL_EXEC, + VM_FLUSH_RESET_PERMS, NUMA_NO_NODE, + __builtin_return_address(0)); } int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,