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 530EBC61DF4 for ; Fri, 24 Nov 2023 10:20:55 +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=PlHks/Fx8Gnbo4rJKeFjoQe6hG XftWLE5HOKxNV+At8oE3o2DrhMwA4l9VFPZMCf20uPYomBvEHqKQUywF3ESrVkIpge14tFdTCeCv9 dOwM5u3Djs/UIcGt1pdWoX+9x8fKnlyRsQpP3fGr8tbewHsqmT5D03Sx6x/dBHD+1MdOLtJszj+4i 6EVuIvveSvOQNhjvZSfvWk16PeJnOLaZSS43/Fq7o5ZtySXm5Id9QlyJOaZXC0yD22r7vOActuIwH OZlxhd+c5pzlAZ2KKAw3lAMoXcQdDj3UWb/oRFyHY5OnS6OcpJEe+aJBCeKVuPq7MShUs8Cqgjc4m 3m9yUU7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIR-006oXO-0y; Fri, 24 Nov 2023 10:20:27 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIN-006oVA-10 for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:20:24 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-daed1e15daeso2207503276.1 for ; Fri, 24 Nov 2023 02:20:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821220; x=1701426020; 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=bGc3IAmtLHB85aDrkzSK3E96rDwn5UC4UI62U14yitpNnlt5aKhj5xo+kFisVgwyn3 HhDlbYql1lVlpIrvBCw+cS5wM4iauj9EW63CCfGlqQfR+IALDeNq52YLI/ep0YGjopxz cd8dzqWZ97J0n5dbDiAWvzChSDzOx/9oU9ni4fRXu0rnutrxZxA1SvC6EGEWw9M0HTtK ikyUppHP+6uKO2Jcw9mgBzmThDppZGceLtyEo4lVXdz11PAXCFmIXomiAsBkCisytKCQ 0j9RusbDX0EfKL5xUUfrDQnWQ/lEiEDZOzHC2NtD/2NjaaeLq1ispwapegp4cdGZ30St y1Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821220; x=1701426020; 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=sDEQKgsSF06ZL135ySY6ljaA5ytVQiSOd7DybqZ6LK/vqfRrvVbM5alpUqpVFtLz4T Rq/VI4qSPsSYMKRY8xZbvgsFINr9UwrqW+Fy9ZQIKeLnw16o6AbXyi+nPumVCihK66Kg F2DUdE8NoBxCu7eQfkpdNgVLvIQXeFpSXcLnbfdaYTd5apbOnBPAPUJlrXImj4bEt69W YmlfIp0qYxH3xLayEc4vDtoT6NFVyOMiCCFwhcPJzr5tAeqWqOhXFn2N0xIJVJJbRVsV PeRwu3Ow4XLIKskkIiAqVEs0QPTo7ojSqlpZLoDUmTvaYMGImv2iSUznHpKW+2vuzgRm PzkQ== X-Gm-Message-State: AOJu0YxDZxeIyLmfPfuSqzoYk8zUkDouAws5akThm04TI2s2BszBHSiF LfOenQvA73+SlD/hRJ1JkiwK3XB5T94rsK43hN292R16dWYgxaWrFLZdj6yNnlp8ks0quw4QczL Ktuq39d4ywl1sbGimPbZjHhazO4c6UWDFwcVK5jVf/SvQcfe3BZeTIg2eYXF37mSDHsp5xoJ2In M= X-Google-Smtp-Source: AGHT+IFaVekewND1KIaYF14cMvl9F5vIq6DqKcV3+5z4JjEkATYJTBnRBjMdsjhv06kQ0rQoKqkxmqnA X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5b:f0b:0:b0:db4:5eed:8907 with SMTP id x11-20020a5b0f0b000000b00db45eed8907mr52424ybr.8.1700821220398; Fri, 24 Nov 2023 02:20:20 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:43 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-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=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhokVPhXdrokZKTl4r0xLPYP2TR/oyHLNrZ+u9CvqWt 6DhtWBHKQuDGAeDrJgii8Dsv+92np4oVes8SxZmDisTyBAGLk4BmEjGAUaGbZNnBV3pLLo9Y+vu I1bhun8fTz7Sff5AaW+brHzg3EiNy4wMv96dT/+/YeYltvx458bERI5Hs15xXr8cnftS0tWYwe4 hLwA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-44-ardb@google.com> Subject: [PATCH v5 03/39] 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-20231124_022023_349226_7E9536E7 X-CRM114-Status: GOOD ( 15.05 ) 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