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 B5F9BC07CB1 for ; Wed, 29 Nov 2023 11:19:42 +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=2tR9Q5nbkYNE4/IYRkz1c9n8u/ 0dAtI4otbyvbyIMTfKsBmVxfiuFgWErKTn5rFPw8beaioe7tjDX5cqcugHcpwHT9NTUCSpRrTiCQg b5iX/kOBEcu2dlxxAa9FhYnvG+Nrulkgzi0P9zW63otXgvVXm81Xgbq10uIpSA0BASxGvRI/2yQYs RIYny2txI2FigZtCPYmxSOXKeNUDfhXtdeAFlUXwiyopPPhHRd4eU3QY/AALgA38HgBvWJ+BY3OMi YG/KFXGk+wYaadWiCsxQ03Y7e20Z0w7O1zEky5luVN9dpyyq/T67eOI9ZSIX8opZxlG8DC7GR7FEW jYqRrSYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Iax-0080UC-27; Wed, 29 Nov 2023 11:19:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IaU-00803z-0i for linux-arm-kernel@bombadil.infradead.org; Wed, 29 Nov 2023 11:18:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=8x+lhCJ8yCfvO8YybIBpJCwOL4gY19sphz3/zZeACpQ=; b=AtWFrtz7+BVxRpCo5YKi0ow9bq ddwAZJHy1DjFprbvDS26duyHp5gDyECO3fpcsucGWzwB816s3SkcjtRDs3YASwbQ8I2Hsl3vbj+3W JiTpQFCc2GID4o2BUPJw7qsQbctxtpq3aPE1h3OlqSzHprsHqqjA8DB10Iv1F+aLB1h8luLZ+bLJT pBI34xtqlbovHZfXalt/RmP5QuCYsdpzCjst1ShZssOntDRsa21troxDfGmWtSus5YU3Gb15ZyX// 8WkQSldIBHIaROlukpDd1RPkiZdDdWAV6/0obgwfbPTPq+twNgQo86f+qnijaVNNcchgd/A+p5su0 aOHF0CIw==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1r8IaP-00DKQ2-4N for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:18:36 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-da033914f7cso8011084276.0 for ; Wed, 29 Nov 2023 03:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256709; x=1701861509; 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=qqnHwRDK9lwYDnqk+NcstPmek9GFsqRDGgu0AOnX8LGAeNsjXs+GfBSzudRQiodkfJ OOR1+eO1HVERTT/ssxz6fXcm0LGluJXESwk/9UNgfR+ZWbqdOZxnKvL9/YAvGQnVhNI2 HcDJlpVZfycwZ/d+JOJrfhhehjVk0O5MYXS/lhO7/JskQX3tnyJY3B2ENyhBSqVFcjl4 KzloXwhm7eI3+4tRGsVf7AdBBsZXwvbEqQsQ8iw9hWn1WalAv1bqC2WvZ3UWf1fdPXEC NBd9+d9UgWEIiBDIO3IOAUsJyHiQ+fknkVsVOHO39lgLMbqjbXzy5XMQkJa61JP8F907 YeGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256709; x=1701861509; 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=XmT1xPRiv720JPnqpbdTqM3innWcUrGTBlYR/Oz7qkmOSl4vg4tgIMRbb7ygQduGc/ 4N0DbbJytyZBOOk4RT8uFYya8uCoHRP+vgP1OgZBa1UjaRmbOzNi4OCrLxIoeUO2q5hP eWBnr9ZuYYvFS4XM7Wgxq4DK5RffE4d2CK45jWUZIwOOl3qRjva9dDQS4U2XF07ZDAJ+ B7pjlQjwvmKAnZUYjtqRG0nNruhp1oFsTsm3vq3WtVmXDvfv777niIOvEuS9dhQZgnvE In8CX2ZjfM0d1TBr1p8iH2546CxppwUjIXogZXl6otIMPzyu+L9V/00Px+JVgZ5StQiZ 8s9g== X-Gm-Message-State: AOJu0Yx6GU3wXvzjAOQrBUANtL4AtTXEdGuVspDGyk6+6L7+7/Nny9Xj /zqrKI0OSU4aFw4ulfj05Rn1eQchJ7E6XZjI3IYxIjS18F8rFqgllRxgviH/YfAXY0pMyL5nNUB JidRozAgGkl26k16QN5ZPx9F6uQsIcpwgN0/Uc/HYWwPZzwdoDREf7DNAua6KexQbXJBTM2vATK o= X-Google-Smtp-Source: AGHT+IFDwYXoOtj/x9K9yDaHZNXQSPOc94RDydi66LbscTxyukhEpG3DJGkDhiLWbTGrpSlfVX0PhWmV X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:e91:b0:db4:5e66:98fe with SMTP id dg17-20020a0569020e9100b00db45e6698femr458602ybb.11.1701256709254; Wed, 29 Nov 2023 03:18:29 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:28 +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=3181; i=ardb@kernel.org; h=from:subject; bh=rA2xvJle278NGePfBuK4ULUQimFQTpGFGVXHAgHwJXY=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVddoLHvYk7J95ICpi9zGrXus/9nnJPO41PzuOXuiYc2 Mla+mlDRykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZjItFmMDH0/Du7Ll303K2th SFFft7PBAQGxnIdqKtuXlCaqr1tfJsfwP2Cnj/fpTelnXSfZH1O8t/Zf+vsfBndMj8+5MeflZO7 cQwwA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-75-ardb@google.com> Subject: [PATCH v6 32/41] 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-20231129_111833_238154_0781C384 X-CRM114-Status: GOOD ( 12.40 ) 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 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 -- 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