From mboxrd@z Thu Jan 1 00:00:00 1970 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 22CA7C4345F for ; Mon, 29 Apr 2024 12:17:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59B5E6B007B; Mon, 29 Apr 2024 08:17:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54B086B0083; Mon, 29 Apr 2024 08:17:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 412CF6B0085; Mon, 29 Apr 2024 08:17:12 -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 23EBF6B007B for ; Mon, 29 Apr 2024 08:17:12 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9D3E8121AAE for ; Mon, 29 Apr 2024 12:17:11 +0000 (UTC) X-FDA: 82062469062.28.325D3E7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf10.hostedemail.com (Postfix) with ESMTP id 3B393C0039 for ; Mon, 29 Apr 2024 12:17:06 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KsxKC6Yz; 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=1714393030; 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=l9GYec3RR2i65SbIf8DaKleIk7sJSs4GgEtWMnl0BzKaKdNWRagNrFcUrp/wtOYr6zjQOs CXzshFL7ZwQv3gXFdoVcpyAPww6fxygMzlYoj7mkE7CpHhm2TwdJdol4XS6ZM67vYcxOUt 9S4D9z37fuCZ7hkf22rMMnRU2fsGUK0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KsxKC6Yz; 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=1714393030; a=rsa-sha256; cv=none; b=o4pcinOVxoAkcSLcV2QQ2c19LVJ4xnsKuPS5+w+d9ydQ/SqjGp8aLigQMwCQvcZamWxnMm V6FEsISeQPBKzq7kr1ynk5BYHbc/PViKMNq5C3i5NnIx6DQ8rkIiqPfGy9ulDhWS+fDAWn iab0xZxsEzblP38sPI3SW4XhGbx3Q7U= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 89305CE0B4E; Mon, 29 Apr 2024 12:17:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09ACBC113CD; Mon, 29 Apr 2024 12:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714393022; bh=DCxnhfiOCuZ1vbHkz6N1kzg5vD2Mqvj8bCN8VHj/6O4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KsxKC6YzbNaUXXiQDkoRm6JVpQnTPy6OTSZ67gw3RpkdBYu0swWt90uhhReS5hNcI 5Gg7D9WmrGrSpRdmpsnq+ijT+6Ktxi7QS5IwBMoCAo3CKxsTtZ/Cmp4aOqFtVKO6fM ojNfli12LUzd1JTLTrZ7bN+Pw1JALIAYYNbJM+e54De0/vtbyFB1gc1KE3jn/wReLE rUbXxw3HEVv+kgj7t3GtWsejAYlg8C2+EQ4/HxAoGFZl+5EgWo5OPio6QyMOhi+3Hy Jv3itmAPjuIm4KwRA3Id50NT77E5aKQcXu+m13EfaXR/n5ebTE4sK+CTNdXzyGmTuB jVFvQUHjG/Y9g== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexandre Ghiti , Andrew Morton , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , 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=20Mathieu-Daud=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 02/16] mips: module: rename MODULE_START to MODULES_VADDR Date: Mon, 29 Apr 2024 15:16:06 +0300 Message-ID: <20240429121620.1186447-3-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 Content-Transfer-Encoding: 8bit X-Stat-Signature: 6q6d9kagh6rcz3ac6461usugzm8r76q3 X-Rspamd-Queue-Id: 3B393C0039 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714393026-188976 X-HE-Meta: U2FsdGVkX18BMHtXngGXYqYzrBAjVu3SG38LllS6oZlLZtqL+C8IJay3/qforwL7r1v/qK1wg8B8sdotw4CT/DhmJ1Lv+m+QP66ESvl7AGnARZF0fk8ZvtiL2kWghN0HTnRV6iC6KlI2iPHB4pMzGzhC8H1c540NSHgOpv3Z8aw5SPpfCQ4m0TVLW02USg6XXlC+xjORrfYYd5m/s/7PedjY5DedUFUbKOr8Y45Eyq6oH9IDTSfztpWEeVGloGN4vF1bvjxkroXKaGCvTAeXR9H4HpQ+9gNoJEYwlnZYbOnXehSSlRTuAkpM9Rn8+FP1h41SfkRA/X1aqBRfsyj51oU1oTspj0M9t5rOcFA9SZjnC43mXzqhElmPXuj07ammUCoWphY0HzlpWgUgI/lK9NYR4Zvv1ilYgYzX/qYdMN7KhCtvF/VaCFgIbY6F6DOCyrRVICWSuRETUU9ZsuIsL14AppUyibgDO5HoBUykwhGNrY38aOaeK10xKgIiushbtaPZR3HogHl3CrI0j0z/IHNZRTuhZLBXmyUQieTVZIiiW5yTSy0M7KRsl69muZ6aWEqPxDIGQRzUJ2edMMV5iYoMcgbUArxywVi+ftRt1zqq/HNk4qKusKGQ8+8OEz7tx3Hyc0TsGIYDbihM0LUdaq2ooBAbWw1aHGnT9K2va48CyyRqIgFk/DDtEv1YsN8T+GbHKB9OCljC84ExmqSKXXdDE1W4bJ4PQRMbvAzfNnXiqn2F62Qt3XFPY0dyCDYHsAz5YBAy+9+eESALnbTKweZAJxKr/tQ0fb1RX8jRznYrzt7Yh/f6TrCDqhiGABjo1B/TvfH6lsz4jEtFa1joQ8fvbc4PLWZCUo4ov9nRvQLZu5uqQ1LCgSdJ72cjOErgQh3sBfp0sP1a/juQzlex7iTn8LtTm74a0JGjnJA9ci4aCqyeE3LxgmG8wUGZJkXoLuJBQDa3NNV4eu7S3Yr h/WgG3n5 mSS6VzPRw8nyYvRJUHvefDPPHViMrmaLcsNlVNtCzeiHoeHjWR3BdiRpb0YhEu1Q3pItVZJZWmm0bzDhdUxJOw5IbBqCcgd/GFEk2moWYIP1Qgj5+B6ScqNmndSiVUI0SQjIrwxeJB2oY/rPOwl6YUPn6YkH66iPuwQDgVDlMXm1mf267RzFTIZuTqJsF6ETFauS7vxViyc33Aav8FSGZhDE3DvXr2IqBNOwHxco/nDymfafdwcfAeNFrvEob2pv6APYxiYUoCdWIk5qtLU3urgVRcEhhC0CWV4VSjo4HGGMUwdmy1Jet60dzAd9E/vHq/3ssNmgeB/WDTfwLoE2p2fd+l0JHzFmzsEUNK6ScFAKQBBa2E+u1bHzcpcUzwRpCs86u81K8IeaWU95wyX7vNpKuOZKo4rjqvNwrrOWki/Kaq8ibklqQy59vZA== 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 -- 2.43.0