From patchwork Sun May 5 14:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13654313 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 D45BDC4345F for ; Sun, 5 May 2024 14:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B3B96B008A; Sun, 5 May 2024 10:26:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 663726B008C; Sun, 5 May 2024 10:26:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52BA96B0092; Sun, 5 May 2024 10:26:49 -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 335B36B008A for ; Sun, 5 May 2024 10:26:49 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B36E040568 for ; Sun, 5 May 2024 14:26:48 +0000 (UTC) X-FDA: 82084568496.04.C502CC7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id 1FED2A0016 for ; Sun, 5 May 2024 14:26:46 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mYafZXb+; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf15.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=1714919207; 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=re0M5P5/SqrXTut5ZFqWws3v/3aGFoOhg3MkAMHXQLM=; b=fsVQekPYBfuxtPzV+L6izGRt6qScEUceZXneXQom+krOYM3IZKlmBaG/o8iygn9ABGfFmV ywudZ5S1+lgi74lEdvrUbYghONGTzuLxdNXeuFm6MqWpxCZINfDVYlGDe48mDjxDGhNBdF LnwQz+vRne1wC5nNkHONzNeioVTP9b0= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mYafZXb+; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf15.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=1714919207; a=rsa-sha256; cv=none; b=nwArPm1cMSMJuSVsnm1TdqwTSVKY9bcv8sf/TvcP99V+DA5S69SqmL+TWIpsH/MINJBaap YeARLAmNrB7Yt6VJcuVFtU0iIBHEtm3Tt6uRy066y/aCva5sMelqG836tUslUUvM2profM w6n7gtJukrH9rhlt5F4SUJj1/rXV32E= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 294D960C4F; Sun, 5 May 2024 14:26:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64D9DC4AF18; Sun, 5 May 2024 14:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714919205; bh=DCxnhfiOCuZ1vbHkz6N1kzg5vD2Mqvj8bCN8VHj/6O4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mYafZXb+TjzYX9WOn5mklYaDb7dJnUSNc24adBjqmsO4Ag5WEgJjuidQ2NL9UYDTP 1LuO1cqjHf8Nh5dmB8++Zo0xiUMrGLJ9M8hCzooo/h0AkOLVjxiu6bF5NOZeQCjH1f T+Fh5gV5BACp2ML9bo2WV3xh/dzZUoZcK3lVV10D81C0uEhbRNkPHUUmgvf2p+O3Yw RA4Ob+Ut+3nLrtltx16rJAegZH/JngdEQb8Gdmt3PAnUSDC6qtgsus9DKIUuUhQaie sKqI6aGHZqWoPHUtkPm/mnDvpdMEcTryUwzWxeUyh+enmCdmQvd+DshDDG4LkvIUAS FbuR6GrrPxveA== 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 , Liviu Dudau , 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 v8 02/17] mips: module: rename MODULE_START to MODULES_VADDR Date: Sun, 5 May 2024 17:25:45 +0300 Message-ID: <20240505142600.2322517-3-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240505142600.2322517-1-rppt@kernel.org> References: <20240505142600.2322517-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: ujgxesdp41r1ym9izdyfkiub3i3gia85 X-Rspamd-Queue-Id: 1FED2A0016 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714919206-666213 X-HE-Meta: U2FsdGVkX1+aT+32yrCC6ot1qYMEsrcrkWoQGF8OEZ/vEi+DctCIoY+cnX/vmboax58AINpehuO+kjbpi7aSAFr8ytqxD8SGl7pIwq513r2q4YRa9HCQnInrxQPlwkgUjcI3bDPx0squACtQIznNOoTV+U0QQ6nRGcVWBao8RxKB2WyLc71CVfQ2bJ+md+HUeW6/YFlPanRfsB+TU7Q0N2ox+A0U1WslYeEI/gr731Ict9IQhvguLmFLkCJnXVh8ZLoipMWwfIQJNaN+pVabaVV0aBYm4MdD70Du318saZzkymI7JKOW6sndvTTuevC4brxozZ4LAt3saulubgsa2NvihXOwTvr8kLceqUoPVS4WvSDgK/SNaJ14h5EbTzTmLhouARhW5gzckZi1uFWf3lhOxY+kOe0gBKMzVYnkfEWbUQePto1Yo7d7BoE7g+CN7Qeqv4gaqV5nIN/Ew85ZnQqGwOetL1UF76soIzmRZqAoHaRG0rvwNBrHf9DtWW8qapn/wpW85CdMap/W/S/3iNJT0YzhGzg/hHGXSx9IMXBrUI0qAv0dY4L1PpOPYu8tTFCi7Zrc+iqR+5z8Pl2IJpJBOtP1kvbrapiGvLsKztE32soNuIinHHBHpuXGR5Numc2/y1mfbVtfSw8VkMJlyUbNYLtycEXRMk3PWkO1vceT+MwP19KZdbi1LE7GB3thjGZpgAXnutF/AQs5985yGy2IG1FWrs8LD5V4pBYvZaR7/GWZFEiwlAtl1qQs5+C9ngalDJmobXCqm++GY5iNhg1FmnaVF/SBH7IaAfqlUorsxEPLEvQBwtsrUUaxgu/UZQCJ8vRQqOSiWBuu//4KfBOBPtBJ6wggi4it0SkH1d0lvFFwRM57xlQDy44SmZIpObiafsSa6NXHxSrUBAbbuhPZ8+Bexy2CtoCV7tN3rf9Tb2YAny6kqOpUmfmtvKdKe6yeI2Pm/RdgM5PJZCK Ulp+0IK6 WfJfthVxw3W9guLC0jKQjVJR+5ZtwrylnQR6GtpjKB/jG9wp1St1m+aAmxByGNBzcvEESFvKu9qg+0F2+itmnHXAkQtbWDOAqaQ3iNqm8Ie0LXiENpqCz0rQQMRpiCvmu43K6muxiH5YFZWDZmzOjToWbDJRjLQlWob9lA4G56H1XavoiSEFaeOnCXEV7pcGi6mPmL32UAJncSiDl67dahJ0Ah+RMeqv+3ZFBUvf/K0JJO9lIGnDZDuU+IyMxx5ETAviIuKX7nPd1jV6/kh0dwJP4fZ5NGcOk2i5vJaXhSj+Tz0T9OzJXDFxvlpBQURMMykKnowd6Kp+F5PvWOsK1yFoqyRA6a5iEFYmDZHHyfvrwdnh7xPonY2D1XSfhzc0A8dTO+nUzEUJsDLO+0dJEPe07xFfXDndgNKK3pAvZi9UBM7kZWDrL79pV5Q== 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)" and MODULE_END to MODULES_END to match other architectures that define custom address space for modules. Signed-off-by: Mike Rapoport (IBM) --- arch/mips/include/asm/pgtable-64.h | 4 ++-- arch/mips/kernel/module.c | 4 ++-- arch/mips/mm/fault.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 20ca48c1b606..c0109aff223b 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h @@ -147,8 +147,8 @@ #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ VMALLOC_START != CKSSEG /* Load modules into 32bit-compatible segment. */ -#define MODULE_START CKSSEG -#define MODULE_END (FIXADDR_START-2*PAGE_SIZE) +#define MODULES_VADDR CKSSEG +#define MODULES_END (FIXADDR_START-2*PAGE_SIZE) #endif #define pte_ERROR(e) \ diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c index 7b2fbaa9cac5..9a6c96014904 100644 --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c @@ -31,10 +31,10 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); -#ifdef MODULE_START +#ifdef MODULES_VADDR void *module_alloc(unsigned long size) { - return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END, + return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, __builtin_return_address(0)); } diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index aaa9a242ebba..37fedeaca2e9 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -83,8 +83,8 @@ static void __do_page_fault(struct pt_regs *regs, unsigned long write, if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END)) goto VMALLOC_FAULT_TARGET; -#ifdef MODULE_START - if (unlikely(address >= MODULE_START && address < MODULE_END)) +#ifdef MODULES_VADDR + if (unlikely(address >= MODULES_VADDR && address < MODULES_END)) goto VMALLOC_FAULT_TARGET; #endif