From nobody Wed Jun 17 07:15:41 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F7C13B5302 for ; Mon, 27 Apr 2026 10:47:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286862; cv=none; b=FiZvX+wUn9ABxgjczmVxn/PxDtEcj17jgJOr544WkJHjTuc+7WzBBPxwkpt6FFgcKZ40okQc/6svbFdOs05Ev9/PIrg7H/y9hAoOR/3IoTFNIWC1PmLVtS5RG1m3WrRLseFWsspAbidehhaqfVxoXhI8pHtntDR2Q7HflLv55f4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286862; c=relaxed/simple; bh=gZg1LZJ8U8You+Wkevxwu5gYhMLfjULVKE+O5oAK3N8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b+dsZDFxT/I5bpb/QeaqGhUBJnDazfe09/8paHlaLGW9eeFhbjcCyHH2VYp3YUmPzy/z4XEU89TNnQ41xl0PkPo0dZ3Gasg7uUrNo+RR5CluXgLTxK3UNH1gHdDihi1qmVeh5Qh4aDm+z6eYFRe2xuH44BEKMIOYV175XvJlTKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc; spf=pass smtp.mailfrom=hev.cc; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b=gKNVwLmb; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hev.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b="gKNVwLmb" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-35da1af3e10so9312402a91.3 for ; Mon, 27 Apr 2026 03:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777286861; x=1777891661; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UhTH8c+vBFpvSOX6DMmifWKJbw9Gz0Bb3dH6yZMz4Qs=; b=gKNVwLmbkRXj3azfIqkXDR958PrnmAq7LrAkbOiOfJq9cuqFsB1d26Tlk035hO6xGt 3o8JEuTOiSF9qwH/VuXeNf31TJfgMxCt2a1+XVvQlUeCCIuxdku2muAML+BhbH2JTLiJ /c05+hHhFh0zYwen3y6MOVXam5uOyrfZvMXCcn62quqTb7TP4AfYCP36iozFs/1WiqJA pIDzkMJiD2MazrRYzDnHpLGaFCzv7lyhG5OUAXbpLj1stPzKbnL/LBhGlIds+TnAzb16 VFM72J0yjU9gr39AiD82k1lwPe4lw5LO14EFpmaMfKzEU5EamH3py3wZMKhkG934K46s jkpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777286861; x=1777891661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UhTH8c+vBFpvSOX6DMmifWKJbw9Gz0Bb3dH6yZMz4Qs=; b=EJHq44p1oqOm9seY4gMPSSjr16K5/7oHgb+rgA+GUYHT4GXaXD4og2VrduKtKjE0Yr 6TdIl/UNt8q1ZAWAcFa+G0YUy5WzvMe81UndqMiEpXbKw/zwNXyFakfNTtLhpx4ZJZr3 Mn6jcJwCH+OFE3Q+fxuzKgPPcjGnvbVOptkyioEPHI8upcoX5roE566draT6Vtxb8jnB 5B/GmSNpTXdGJf8ph8oCYJqvVVRm0COLCJc9s4jJW/lZ1goR6DVQplIgHbuccwHROqMT f8xGiUmb4ac1WYq7mzHPMv5rwITDu6pgfRH2fvZHbA17Kq8MnEImtBpO0i4b2MsiT2o4 2mHg== X-Forwarded-Encrypted: i=1; AFNElJ8s69DOWgsl/7fcRWww0F5jcy+phAGaT1Ey/aAPd+qKOtlggGV1TrC4TztVsR8krjHjn5cj7zhXbSyQl4I=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0xVTv1zAJlRKETpfQK1BuWczNdqz//Zd3larZkW+35n9BBpaF f8lBAWHOhOit8e2NqxXtu36/2fg3FAbo9KmobtJWsh8PP5QCevWQ1vHKnIkviy95hCc= X-Gm-Gg: AeBDieu65PaXsJ52Q/IgAS5Xf4W1lt2iLlR+syu2j5MDgiGIVAC86b8txdF0u8ZlY6c gBWqouC0wL4aMzCvLpvoYWq0e/1tnxg0cLsVjRCs0S5SoF/WXFnfj6MiAxAq9lO/EGeqcuX9ZHx e2T7tQUXPl5PF5I1fh8ioLKiIjndklgud5sJUGMf29tKGzMqgXb6mOyeT20t++q6AezVijwAx/u mRAD2dwwJHlNmo7ztZU9hn5IAsITTN8zJXRODGX6bJy7F0ckeBmf8UA5MzNlizCvMXIVlJNw+VR oVFQ9eHgz0/B2RfsQtLPD5I6m2CJE7c08rmya0uS1kCiRs9oGDjhax4HDQLfh9GhyM4ZsnYTQrM DBmClhjvLkcf7/ajTDWiyL69RbgS9e8FC11tDTz65IqFZU9whnvT+RolzrDEWTkvFOd3Rge8BYt QakglUud8eDcs= X-Received: by 2002:a17:90b:562b:b0:35b:929f:7e95 with SMTP id 98e67ed59e1d1-361403bdcfcmr43713580a91.4.1777286860831; Mon, 27 Apr 2026 03:47:40 -0700 (PDT) Received: from xpc ([2400:8902:e002:def5:7882:53a7:6a48:4d11]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-362dde4ccbfsm16227029a91.1.2026.04.27.03.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 03:47:40 -0700 (PDT) From: WANG Rui To: Huacai Chen , Ard Biesheuvel Cc: WANG Xuerui , Ilias Apalodimas , loongarch@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, WANG Rui Subject: [PATCH 1/3] LoongArch: Allow rdtime_h() and rdtime_l() in 64-bit builds Date: Mon, 27 Apr 2026 18:47:19 +0800 Message-ID: <20260427104721.47724-2-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260427104721.47724-1-r@hev.cc> References: <20260427104721.47724-1-r@hev.cc> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the CONFIG_32BIT guard around rdtime_h() and rdtime_l() so they can also be used in 64-bit builds. Signed-off-by: WANG Rui --- arch/loongarch/include/asm/loongarch.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/loongarch/include/asm/loongarch.h b/arch/loongarch/includ= e/asm/loongarch.h index 2a6bc99177d8..bb2da9c58411 100644 --- a/arch/loongarch/include/asm/loongarch.h +++ b/arch/loongarch/include/asm/loongarch.h @@ -1248,8 +1248,6 @@ =20 #ifndef __ASSEMBLER__ =20 -#ifdef CONFIG_32BIT - static __always_inline u32 rdtime_h(void) { u32 val =3D 0; @@ -1274,8 +1272,6 @@ static __always_inline u32 rdtime_l(void) return val; } =20 -#else - static __always_inline u64 rdtime_d(void) { u64 val =3D 0; @@ -1288,8 +1284,6 @@ static __always_inline u64 rdtime_d(void) return val; } =20 -#endif - static inline unsigned int get_csr_cpuid(void) { return csr_read32(LOONGARCH_CSR_CPUID); --=20 2.54.0 From nobody Wed Jun 17 07:15:41 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C26493B5839 for ; Mon, 27 Apr 2026 10:47:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286865; cv=none; b=X3yecqReNd6gQxM8plXGBtMuMo4JkABYzoy2YY24ZIF3+lmw28b0WvD9NWYJWl4wHb4CZXseWZqXkbI5EQErUD3yRgXJl2Qxb1EM8J4agI0HtSD9YQinx5v0MuAHSJ/qlE8V4e5knqnDjaWb7ZBtLCbs+1brY2VJlR0nK8VdP2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286865; c=relaxed/simple; bh=MK9MxhznQ/DE9fRBF+ryEug0t7fwbSkm35OOxaXAc7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0AkSH4uSgjxpTRMTOve4OmxZgIte5mMHERS3FGUzPQ3VlRwmr8j2g9fSHGc10eWdOCDJCyZ/WIz6mc7p7jl4cNutGTHZtwO3T8HGxN0ILmr6umGanT+DfN3KufQx5MSAjrqOSsLY180cyqU6Yr+mykadCAtu7i9IjWSWPl3qfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc; spf=pass smtp.mailfrom=hev.cc; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b=gAMnEAAX; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hev.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b="gAMnEAAX" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-3567e2b4159so6792649a91.0 for ; Mon, 27 Apr 2026 03:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777286863; x=1777891663; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PIBge1O7GywppeH3FxYzvTz5haKfwUyb1lL4zzJi9B4=; b=gAMnEAAX1OdDdpm68rbgotfb5OYSp8JbVpK+mHThmGyCYfq4OalfZiDkzOK6w9vP4h 15qgyOaVXOiEOg7y6zOyc+9t9kLWZm9PfUDKGXqIHm+Z1cbci7rQuCQUzsZTlYcV76xK qtobmJA1IcwYKO+KUwsk95dW6OwAsAJCPKdh+xx8leBYFGaKnLix2numQgYPFRk7aUWP M1Qhtb/gLY0irbkS0/UrrLrYuS8NwfRaivATWLdqBC2obDZdmtnEMdM1aICmcLjyiLn2 OvWx1U7BOVpNyqPIgX7i2DJdx366bGemExOZbhlc+uUB/SD369/EsDfYkgkyUD9ix/AB 50Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777286863; x=1777891663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PIBge1O7GywppeH3FxYzvTz5haKfwUyb1lL4zzJi9B4=; b=REM2UYKnH1xdp5DsvCW2XmFAQVSdCbwL1sPTmLTN6fcaPkR5rxAgByx1G8CRC90Fmb MQczA+2Xbu3t5QURLzaM36pgxRPmO/A5vqpdPi1oTBOSI+56zlV5cu7+9IBEErwoUL9Y 88zXZwBglhNvIlQOxBmYbfypi7y+axF3kM8je8ryL03pqVm9DdBg519knVRjNOUacIED ez7RDYgGaDwFqX5w1coCdWMv+P4vF8AccPTMjRmBcESe/DPoH088B23ctxTJXzcL+GUO G82nYFQw2FOeww1eU9X/dYJ2nl1KVA1MibFF3sPBOK8XGkTaRqpPOHKInpDJ1a03hTI9 kGUw== X-Forwarded-Encrypted: i=1; AFNElJ985ZWLQKY8To9DifI7+bQQYgiIVggw6kaiUzVzeBFADaOoKqdGgpv9TztRN1P6F6aZopn28nqCoXnHDh8=@vger.kernel.org X-Gm-Message-State: AOJu0YwcnHJ2lw59J0OYVk8A1xizO43E2wYlZMHLzKwnZioF1CH+p0xS l7QCDNb1p9KLpq8oempHVcDNfPrDzOGSkuTG5YjY+LRYXAZOeIPl72kjxBf37yJm+8A= X-Gm-Gg: AeBDietblGVDynLT58rdvm1HRtEyTMeaTmo1N1Cfp7vkFosb4lUJYwJuu5C8WUMZ+BS FvhP0t0AX3EqE/fbLWo3BUXW+CDwptasOO07bVAN9/KGB5zY1VkrZowWTJX4xX9/VAM8/L6zkQS o949bynZgeqYJBEzCneZI2t93tW1R++IDaIeSX3JxCjS4m+iy7FSEVnlCh0xtJLeatVe+F7Mg/h mVemx7a5VF9R317o232Eu0cJsqS170JWuftSggMgfUg+WmvHLW3LCixNk/3ufPmNufjcKfilEl5 aZhc7AD8LrxGNfH8YhPc8ENr6PLLWwgCuUh8+4zjeUFaV/RuRGjvcwzx4LgAFDCoSQ1VJWRYVmz 6dSEiBo3aatboa8gm71S9hDsGt1Rgd8tq7GIHrkqqAfdb16+/OQ8/Co1bTw9v1WcLteb2UBSHf4 4sgiF74xsLN0M= X-Received: by 2002:a17:90b:2e46:b0:359:8dfd:64c8 with SMTP id 98e67ed59e1d1-361404a81e0mr41584514a91.24.1777286863074; Mon, 27 Apr 2026 03:47:43 -0700 (PDT) Received: from xpc ([2400:8902:e002:def5:7882:53a7:6a48:4d11]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-362dde4ccbfsm16227029a91.1.2026.04.27.03.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 03:47:42 -0700 (PDT) From: WANG Rui To: Huacai Chen , Ard Biesheuvel Cc: WANG Xuerui , Ilias Apalodimas , loongarch@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, WANG Rui Subject: [PATCH 2/3] efi/loongarch: Randomize kernel preferred address for KASLR Date: Mon, 27 Apr 2026 18:47:20 +0800 Message-ID: <20260427104721.47724-3-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260427104721.47724-1-r@hev.cc> References: <20260427104721.47724-1-r@hev.cc> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce efi_get_kimg_kaslr_address() to compute the preferred kernel image address dynamically when CONFIG_RANDOMIZE_BASE is enabled. The function derives a random offset using EFI-provided randomness combined with the timer value, and constrains it within CONFIG_RANDOMIZE_BASE_MAX_OFFSET. Update EFI_KIMG_PREFERRED_ADDRESS to call this helper so that the EFI stub can select a randomized load address when KASLR is active, while preserving the original base address behavior when KASLR is disabled or nokaslr is specified. Signed-off-by: WANG Rui --- arch/loongarch/Kconfig | 2 +- arch/loongarch/include/asm/efi.h | 4 +++- drivers/firmware/efi/libstub/loongarch.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 3b042dbb2c41..a5afb70f73d9 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -730,7 +730,7 @@ config RANDOMIZE_BASE config RANDOMIZE_BASE_MAX_OFFSET hex "Maximum KASLR offset" if EXPERT depends on RANDOMIZE_BASE - range 0x0 0x10000000 + range 0x20000 0x10000000 default "0x01000000" help When KASLR is active, this provides the maximum offset that will diff --git a/arch/loongarch/include/asm/efi.h b/arch/loongarch/include/asm/= efi.h index eddc8e79b3fa..f831320efd41 100644 --- a/arch/loongarch/include/asm/efi.h +++ b/arch/loongarch/include/asm/efi.h @@ -30,6 +30,8 @@ static inline unsigned long efi_get_kimg_min_align(void) return SZ_2M; } =20 -#define EFI_KIMG_PREFERRED_ADDRESS PHYSADDR(VMLINUX_LOAD_ADDRESS) +unsigned long efi_get_kimg_kaslr_address(void); + +#define EFI_KIMG_PREFERRED_ADDRESS efi_get_kimg_kaslr_address() =20 #endif /* _ASM_LOONGARCH_EFI_H */ diff --git a/drivers/firmware/efi/libstub/loongarch.c b/drivers/firmware/ef= i/libstub/loongarch.c index 9825f5218137..df67ef8c68ab 100644 --- a/drivers/firmware/efi/libstub/loongarch.c +++ b/drivers/firmware/efi/libstub/loongarch.c @@ -38,6 +38,22 @@ static efi_status_t exit_boot_func(struct efi_boot_memma= p *map, void *priv) return EFI_SUCCESS; } =20 +unsigned long efi_get_kimg_kaslr_address(void) +{ + unsigned int random_offset =3D 0; + +#ifdef CONFIG_RANDOMIZE_BASE + if (!efi_nokaslr) { + efi_get_random_bytes(sizeof(random_offset), (u8 *)&random_offset); + random_offset ^=3D (rdtime_l() << 16); + random_offset &=3D (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - SZ_64K - 1); + random_offset =3D ALIGN(random_offset, SZ_64K) + SZ_64K; + } +#endif + + return PHYSADDR(VMLINUX_LOAD_ADDRESS) + random_offset; +} + unsigned long __weak kernel_entry_address(unsigned long kernel_addr, efi_loaded_image_t *image) { --=20 2.54.0 From nobody Wed Jun 17 07:15:41 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3A9D1C862F for ; Mon, 27 Apr 2026 10:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286868; cv=none; b=cOOU1ZFJihIjU9TH7zt9F+06B9n0Mm8H1pnYDIpdzCqE81OM2El+vFwrDmwj7hdn//T8+XSq1dLpDIyq0hiorcRW2EHpR8riWKVP+eJRd8HAUvYKVuRi0a18LvXcZRf3JSfJtki/ezgDdB065DBlQT8cHNpYpzuH6RCEmWbtguk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777286868; c=relaxed/simple; bh=AFxDVPfqDD1fX+0U3m7t2OJUKJfWgyTTwFDtosrykxU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vF2Hlv7nQmJN+f1N7jAXurWPHTeEUHv+46OPyldznlusDLPet/Uf+9yDGHyb/5r++p7dnnl6F2gWCW3lfRa5MKg9rx5YsXO4bJfsibvGNetNEk0iAKRkSaIJDmxtR2u+k1FGps5wM1l4wpIgQno0buk96gYHGA5p80vvFG/DwF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc; spf=pass smtp.mailfrom=hev.cc; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b=tS93o6KD; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hev.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b="tS93o6KD" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-362bb3260f1so4525837a91.2 for ; Mon, 27 Apr 2026 03:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777286865; x=1777891665; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s1M23bGh5Hxam/8XaoRaHHo8c9kozCZBAlQpB9hznRA=; b=tS93o6KDEYVOUtMDWnfVwMOXoCuQGs7UcyUTBuP/j3bjP7BO1BzDRUT7k5/hJRAGpj ZXfdbYm8v41TMOGcnzNIAp6kd5BRE30wZzJCFh22apQrpE/kvm/ZL/5t6ktVEaynpVGh tZUT/o5h7OFUL+T+VjpndJgxRV8U0MVAilM6yS8sockjdoFdLs9hEEvXayqVr+LLTqaq U+4S6x74dazVHzMAwRYEwg3KaH1HRsXtcY1SZk3g7AFEbH91Oj4NWK4C7Gwj4643GCl7 p3e1YyIdbbsS27ZpMp2yyuI8NW2h+k7yogSztLQ9+MIkXeyg6Juld3Fl+nouMLhJ6YJq 5gqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777286865; x=1777891665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s1M23bGh5Hxam/8XaoRaHHo8c9kozCZBAlQpB9hznRA=; b=mieDsRQGf0oAr66k3+LkTvdXheWWrGMm9rwKPjGWwQI2U1a1xxLFNVRgJaFXhmAYtr D1gl6qfM3L67BklWB8iZM4O31JoIjBEC9J+LBpWdfzBDdlq2Cmginpggpaq8DKhqVJI0 2rDlSyRRsLIekggnTcXnPM0oexb8L8imMWWtRRyvWOpf7EKoLI1Cww+imUyFXg/DP2kp 0wqbi0+y8rSA6FDSlvakdMqQRBtsjB4khpOzfg4mSDu0Ws/MAePNBgifi1lR5D1yVStq slWklCDQ0Kdp4PtyCTTnNzMCbxBySsD+wWqjsX7WkgNow6HuYW627I2MNWIrMQ2IUOw2 vqHw== X-Forwarded-Encrypted: i=1; AFNElJ/l83Mv7AugHBYiMR/izGy27Zd86dkAQpexv8Od5MGPmUo1P87beeFk8XwjVm7PuyOJgbsYfGgkGC8yedk=@vger.kernel.org X-Gm-Message-State: AOJu0YxXOL4HWJUR4N9dVr0/vSC7CEHe44fouNUBuPANnSuG9M5P7Pjf zvVXVjeWPcaE27EDi9J8ySM+DKiHxedqS0VKJChEQHBKUbPDet1wWOr89e+T59YPaoU= X-Gm-Gg: AeBDieuZc4phi3TMOy1a75DSBcNvVzjPUUMSC1o3SIejH0tyW6nvnQwNhJjFwys4S47 v+mICIoYW6437GNo3LNAu5q0sYCDhrtzO3fiVcNBoymp2SloNjlEsYiW7gATfcx4zu5TL0s9TPS N5QpsGH0TH8/f1eO2cg/+p8L+ytC64R5NX6g5SCsTCNGgyku5w4yFLlvdlo2lEvRYOBvcQbwqMD mrHi263H2TlAS9PgLkgsz0onuYpSvgMexiip+/KBO1/3TLOHDdUlT/uIwniJVoHnvT6cqiighyg b3EhcPnaB3BG6YXT85gbQssYAzAFG24L5H4AVBbZyRvzWyO0C6JSzbsT7vZpXOB7YdZVng0w9bE X0JYXfVSQbB6fJOoFc0oPgEp+xXH6kKV404eoOm32h3CR86cF0tlred533JGE6lR/DLt84YlROU eaWPIqSxx1n1SnrySUUfPV5g== X-Received: by 2002:a17:90b:38c9:b0:35b:97ba:acee with SMTP id 98e67ed59e1d1-36140465451mr42503043a91.17.1777286865144; Mon, 27 Apr 2026 03:47:45 -0700 (PDT) Received: from xpc ([2400:8902:e002:def5:7882:53a7:6a48:4d11]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-362dde4ccbfsm16227029a91.1.2026.04.27.03.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 03:47:44 -0700 (PDT) From: WANG Rui To: Huacai Chen , Ard Biesheuvel Cc: WANG Xuerui , Ilias Apalodimas , loongarch@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, WANG Rui Subject: [PATCH 3/3] LoongArch: Skip relocation-time KASLR if it has already been applied Date: Mon, 27 Apr 2026 18:47:21 +0800 Message-ID: <20260427104721.47724-4-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260427104721.47724-1-r@hev.cc> References: <20260427104721.47724-1-r@hev.cc> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the kernel is relocated during early boot, a randomized load address may already have been selected and applied. In this case, performing KASLR again in relocate.c is unnecessary. Signed-off-by: WANG Rui --- arch/loongarch/kernel/relocate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/loongarch/kernel/relocate.c b/arch/loongarch/kernel/reloc= ate.c index 16f6a9b39659..c36604a81d08 100644 --- a/arch/loongarch/kernel/relocate.c +++ b/arch/loongarch/kernel/relocate.c @@ -139,6 +139,10 @@ static inline __init bool kaslr_disabled(void) char *str; const char *builtin_cmdline =3D CONFIG_CMDLINE; =20 + /* KASLR is performed during early boot. */ + if (kaslr_offset()) + return true; + str =3D strstr(builtin_cmdline, "nokaslr"); if (str =3D=3D builtin_cmdline || (str > builtin_cmdline && *(str - 1) = =3D=3D ' ')) { pr_info(KASLR_DISABLED_MESSAGE, "\'nokaslr\'", "built-in"); --=20 2.54.0