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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17E57C4167B for ; Wed, 29 Nov 2023 11:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=HciSN5V7fEYdUB/CO/XmpIMTmSc6U/ODnM+0MalWNeE=; b=aFe9xPL3AnzW/tMwJlpJex1xVX 5iRZHdY62L4uislgFxDao3wB7C3xR6F6dVDUcO6R3MBuAWc+k82tjtLODAfOk6cmUqNr7QLVhcnpb C026z0tpe65DfrC0RqvzCWHZeJMEieTkpWjp9ZUWKa6sAsDb2/kBbBsFVu5xiPdkMQWpDWW2X8e/k L3j8m5GV50Wp+wmtpl3LnTUjLn0kYSFkXH1jLCNr6NBoKw9SrmQYuE6gA8SY4MUngIzbi+Df6U9Wn Orcw+dscBH4KF2Zy1HklS1ja9+jmPs7bBUCjWv/sEc9EQsupI0SyLKz3dcUlliyMda0QsHOu4oaru qyXynL+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZq-007zRg-0L; Wed, 29 Nov 2023 11:17:58 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IZN-007yyF-2K for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:17:32 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5d1b431fa7bso26280187b3.1 for ; Wed, 29 Nov 2023 03:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256645; x=1701861445; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vLytofFJeC+aEU9SPZ239oAWyj2r+ByEUn7mC6VxtZE=; b=2BfsEL//xTDZHjqvJUUIB2LP+1D0P7quxS0WLuUKtCM5Lb+RQzRJIGfa7CTt47i/g0 ulFWV9iIHBPRgy3GeRRgr7RXahkqRqBlwJBVjLd+YoMB59yypxXF1Jo0M1rMGVBW/gdD FsWGJQ4J/jS8Aq6T+mtZWJJaYzgHuFFp97EuBBzYiBC7ATny3dAF/OGmSwuxlem7LhKO Irsez0LRmC1jP+u0sntbzSXc1yBkukAMqFhOcA6VGC9WTDEdvRuW5R0HTCck3QLrUeKh x2Lcp4IHYj9/o0vtRydvd4iqx1aPHF/RckKFUUsNMxIqDQ4zzyrgFIIEw4tF97LCadEf pmVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256645; x=1701861445; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vLytofFJeC+aEU9SPZ239oAWyj2r+ByEUn7mC6VxtZE=; b=DM6dNloa7agJ8+F0aU63iPswMeHDrpFg01loBhPgvW5GoCCehiuO1iuaIc3mH5CsPc Kfm6syNkQ/qKnAwfwANii833oXVJ6iuIe7ca+I1R/1St1b85lOc7vfgy3nUjjun0RJJ4 84F0jqKnkaP+1ZcF1Ihvhc2tJ0ABlNPRsjIF7zJY12QUBe6/lzWTKR1fieoz6icao8dM SMGerZPa60oyRN8pzVQtER69Ne3Rwa1uJ7PTZC8xLEeo+vI/RsgTHHh0kN/HdT+UsI++ 9NG6X+eQvhTzZtItp24LFvqInqyJ5J0kH/1CrWZ09p3xmP/OZT3JtplxTfE9kpbtBm+F TNEA== X-Gm-Message-State: AOJu0YyiGzJwu1dBn0A5Ylg5rwFBZ+N5Pft/+9uKbiM4bJNvPO2p3zLB 8DVFF6S14LspWEC8Y7pAK8HUZPFas8WiadeYcZu5WHegS+Co7VlIFElo9DBH611it5mEC3qlpgd 2i8p4H1+42yiSHzTR/Ma9QPfeP+1jpiP0jEg89YKalxHljn1BmzOf2TQI6iknRyuerRiHNvSShA w= X-Google-Smtp-Source: AGHT+IFljdsATctNPT/K8aejTKVmlz124YcgQ0XavS1jOB4QvwswNKi2/6/e2ijv7JzXfUwBg0WLHHw0 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:690c:250d:b0:5ce:3dd9:a380 with SMTP id dt13-20020a05690c250d00b005ce3dd9a380mr437914ywb.2.1701256641090; Wed, 29 Nov 2023 03:17:21 -0800 (PST) Date: Wed, 29 Nov 2023 12:15:59 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=2455; i=ardb@kernel.org; h=from:subject; bh=y2jrY5S1I/ojQOOhnDBpbwtTbesmY9zlrLnpWZZwxOg=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdNl9PhXdrokZKTl4r0xLPYP2TR/oyHLNrZ+u9CvqWt 6DhtWBHKQuDGAeDrJgii8Dsv+92np4oVes8SxZmDisTyBAGLk4BmEhANyPDs5X2hjJuvYmdE73P V3JJnlkgm8d14AZ/YLlVx6tX1pwFDP99M7T3Sv2LdVGV+aESsdx2kruG2/Eyq5Z1as+5Q5gzhdk B X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-46-ardb@google.com> Subject: [PATCH v6 03/41] arm64: mm: get rid of kimage_vaddr global variable From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231129_031729_770985_0AFB336B X-CRM114-Status: GOOD ( 15.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel We store the address of _text in kimage_vaddr, but since commit 09e3c22a86f6889d ("arm64: Use a variable to store non-global mappings decision"), we no longer reference this variable from modules so we no longer need to export it. In fact, we don't need it at all so let's just get rid of it. Acked-by: Mark Rutland Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/memory.h | 6 ++---- arch/arm64/kernel/head.S | 2 +- arch/arm64/mm/mmu.c | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index fde4186cc387..b8d726f951ae 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -182,6 +182,7 @@ #include #include #include +#include #if VA_BITS > 48 extern u64 vabits_actual; @@ -193,15 +194,12 @@ extern s64 memstart_addr; /* PHYS_OFFSET - the physical address of the start of memory. */ #define PHYS_OFFSET ({ VM_BUG_ON(memstart_addr & 1); memstart_addr; }) -/* the virtual base of the kernel image */ -extern u64 kimage_vaddr; - /* the offset between the kernel virtual and physical mappings */ extern u64 kimage_voffset; static inline unsigned long kaslr_offset(void) { - return kimage_vaddr - KIMAGE_VADDR; + return (u64)&_text - KIMAGE_VADDR; } #ifdef CONFIG_RANDOMIZE_BASE diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 7b236994f0e1..cab7f91949d8 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -482,7 +482,7 @@ SYM_FUNC_START_LOCAL(__primary_switched) str_l x21, __fdt_pointer, x5 // Save FDT pointer - ldr_l x4, kimage_vaddr // Save the offset between + adrp x4, _text // Save the offset between sub x4, x4, x0 // the kernel virtual and str_l x4, kimage_voffset, x5 // physical mappings diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 15f6347d23b6..03c73e9197ac 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -52,9 +52,6 @@ u64 vabits_actual __ro_after_init = VA_BITS_MIN; EXPORT_SYMBOL(vabits_actual); #endif -u64 kimage_vaddr __ro_after_init = (u64)&_text; -EXPORT_SYMBOL(kimage_vaddr); - u64 kimage_voffset __ro_after_init; EXPORT_SYMBOL(kimage_voffset); -- 2.43.0.rc1.413.gea7ed67945-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel