From patchwork Fri Nov 24 10:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13467454 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 6EDD8C61DF4 for ; Fri, 24 Nov 2023 10:23:41 +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=/P8uAQwn6ZJM54pinxAGNr8ZlcOcTFSdkn5I1gAz50g=; b=Lcj9ylN8wgr/DlzQOuodyPbGDj CT/dOLhSXRXWDBlV5xsSF+Cp93Zgo6UaAadQPLIgH8FN2GgaXNox01T5tZaOthVLlDie9fZGeDXGt qxtArc+NZifeiULSbsST0yLwkr8O0X6BmMJ8yrP5gbvmeVPP6TTft7uWuWqv9yvxS0Q8MTruoai0u n8DxHm/4FB71Y5cxhn7xYYEYKMcmdLgFq0+KXS5jc6t+N99jruA331QZx87gemDnaadd3lJhzV85n Z+TWvrNDDYNrAuz7jmS+rSI6ESA9fuZzPZS3vD97CVnf1L1IT5IThaBQYKDUuswQKt6G3aOeR35mv ncU4OHDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TL2-006pug-0Y; Fri, 24 Nov 2023 10:23:08 +0000 Received: from mail-wr1-f74.google.com ([209.85.221.74]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TJQ-006p8k-1z for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:21:39 +0000 Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3316945c6e5so1485869f8f.0 for ; Fri, 24 Nov 2023 02:21:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821285; x=1701426085; 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=8x+lhCJ8yCfvO8YybIBpJCwOL4gY19sphz3/zZeACpQ=; b=TAyaSDMwgI32vGLv5lOHC4caSN3XuP4nlEfse7m16FxJwokioNry8kAZU8wwqgy8Fw RABbCjxXDbeD+8xHNE7P+Wgb8P+NZXrMYcy9YMYVpY4eZD1hU3Cjfyo1kPefU6fxL6N7 ma1SbV1noyVNMMcy5LGhfQXKAJn2SCDGZEZ5GBY2/4LwEssH+pAhyq44n5lfLJXnQAEr VTkJ634EhXuHbqNF7gGlfsFs7GeEVF9WmHyLktdGDt80uoCNgjWz7V9rCr1YkBzaNDRq uq/lLJbp1YsHKjU0LoN2bjotq7xbDxIjj574FiXnKE/cdH+ZH1yr9a6O3yC3TveoJsx6 ug4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821285; x=1701426085; 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=8x+lhCJ8yCfvO8YybIBpJCwOL4gY19sphz3/zZeACpQ=; b=D0eTHjjryo/LDJuk8ssPRTfUne82csUPzNPrzWKDrRL5lVECj5bLOAQ1Bx4ATJZwHc rbQ/rrgR4xCtC7mp0nfzAnpdmKrSWTItVa1M08Ds1+z9owYJTByj95R5RAAc+8s3Rgbl jX7RSsQsV8kr8z3QH2E0tkTqpVMpLvIJ+WgPYY2XefPY/mlNxDN91AkBIo6sz5SIehtC yeeaNzPafvIisC5Xt1XlViewyaRiGRDdUDGzFFji5AwW5DOsce2qec2/wPYnv9Bf2lHX yMljmEtWDN3/oZwJrTwh2qVaZN+PHyNJbmBBkPI6tQ1y/FHa4fVJahFTPdIeLUL4q6Ag tsUQ== X-Gm-Message-State: AOJu0YwSoIdDSRS5H8jGVIsC2qfcRxWI5K7IPIoCXV6OAR4doOaYWSd9 2LKaLy05zgz75EQptDITJMMQHCFFN/J4RIjf+oYE6D2dZRVkzilG2PbcaaiWsl3P7gw7JAB/zzj E2LZgjoZ8duZ41lRkmqUqCUu0IrCOOVqGQs8TLzwqRcBt6fzhmxTZKMjwu+m89/GcuQvKm2x/Uh 4= X-Google-Smtp-Source: AGHT+IHsuBJyBn5SXiKjAa3MO4njVIWy4MrORTDuPrQ7uTqDfVvbe63HbR4np6YuoBiYd9OFl7kw/OCY X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:eaca:0:b0:32f:997c:bd2a with SMTP id o10-20020adfeaca000000b0032f997cbd2amr90460wrn.5.1700821284765; Fri, 24 Nov 2023 02:21:24 -0800 (PST) Date: Fri, 24 Nov 2023 11:19:11 +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=3181; i=ardb@kernel.org; h=from:subject; bh=rA2xvJle278NGePfBuK4ULUQimFQTpGFGVXHAgHwJXY=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhYrXHvYk7J95ICpi9zGrXus/9nnJPO41PzuOXuiYc2 Mla+mlDRykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZjImVKG/4WXMq6HXbt/3mjq duXX/s+1KuouzFrL8/0tq1gJXwbnfm9Ght9HHa6Fm7NonY0u6zFNKfe+U8DdunCKSWjMyb0piQ5 FbAA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-72-ardb@google.com> Subject: [PATCH v5 31/39] arm64: head: move memstart_offset_seed handling to C code 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_022128_671738_C16B0F75 X-CRM114-Status: GOOD ( 13.35 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Now that we can set BSS variables from the early code running from the ID map, we can set memstart_offset_seed directly from the C code that derives the value instead of passing it back and forth between C and asm code. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/head.S | 7 ------- arch/arm64/kernel/image-vars.h | 1 + arch/arm64/kernel/pi/kaslr_early.c | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b320702032a7..aa7766dc64d9 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -82,7 +82,6 @@ * x21 primary_entry() .. start_kernel() FDT pointer passed at boot in x0 * x22 create_idmap() .. start_kernel() ID map VA of the DT blob * x23 __primary_switch() physical misalignment/KASLR offset - * x24 __primary_switch() linear map KASLR seed * x25 primary_entry() .. start_kernel() supported VA size * x28 create_idmap() callee preserved temp register */ @@ -483,11 +482,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) str x25, [x8] // ... observes the correct value dc civac, x8 // Make visible to booting secondaries #endif - -#ifdef CONFIG_RANDOMIZE_BASE - adrp x5, memstart_offset_seed // Save KASLR linear map seed - strh w24, [x5, :lo12:memstart_offset_seed] -#endif #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) bl kasan_early_init #endif @@ -779,7 +773,6 @@ SYM_FUNC_START_LOCAL(__primary_switch) #ifdef CONFIG_RANDOMIZE_BASE mov x0, x22 bl __pi_kaslr_early_init - and x24, x0, #SZ_2M - 1 // capture memstart offset seed bic x0, x0, #SZ_2M - 1 orr x23, x23, x0 // record kernel offset #endif diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index eacc3d167733..8d96052079e8 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -46,6 +46,7 @@ PROVIDE(__pi_id_aa64smfr0_override = id_aa64smfr0_override); PROVIDE(__pi_id_aa64zfr0_override = id_aa64zfr0_override); PROVIDE(__pi_arm64_sw_feature_override = arm64_sw_feature_override); PROVIDE(__pi__ctype = _ctype); +PROVIDE(__pi_memstart_offset_seed = memstart_offset_seed); #ifdef CONFIG_KVM diff --git a/arch/arm64/kernel/pi/kaslr_early.c b/arch/arm64/kernel/pi/kaslr_early.c index f2305e276ec3..eeecee7ffd6f 100644 --- a/arch/arm64/kernel/pi/kaslr_early.c +++ b/arch/arm64/kernel/pi/kaslr_early.c @@ -16,6 +16,8 @@ #include #include +extern u16 memstart_offset_seed; + static u64 __init get_kaslr_seed(void *fdt) { static char const chosen_str[] __initconst = "chosen"; @@ -51,6 +53,8 @@ asmlinkage u64 __init kaslr_early_init(void *fdt) return 0; } + memstart_offset_seed = seed & U16_MAX; + /* * OK, so we are proceeding with KASLR enabled. Calculate a suitable * kernel image offset from the seed. Let's place the kernel in the