From nobody Fri Jun 19 07:46:22 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 ECF3F35AC01 for ; Sun, 26 Apr 2026 12:02:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204975; cv=none; b=YAs/SAgS5J2TeeA2Xtg/cR+worWYFvniXszLFlBrkHnh32n7qfIIu+puAG0ELNODJ+QJUW8yG2XDvjfBjbp0Ntz4MjziBbdGV/2xZ4RJ8cVU60z9BDrGCSCQKbENWQ+kSMWGwQGZWM6v0v580blshku5sV5RBX8866VvauYZy2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204975; c=relaxed/simple; bh=gZg1LZJ8U8You+Wkevxwu5gYhMLfjULVKE+O5oAK3N8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BBcxx8W7pXoj99FDnWSPffnNrsYLlVRexQnOtWcibBS0+UaKu22cEl5cslaUB8XhNU6Q8cx1i+ny/mTCcG2z+g026oCpkXDNGmK2iJMNhWaQHRrQ6UVsVdfYDYKEUdB2q8UhiHrmglM5tFfgFNyhvUjVv4sAliI8es3ukDCGj38= 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=JPhfCkr0; arc=none smtp.client-ip=209.85.214.169 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="JPhfCkr0" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b458ca2296so57571515ad.0 for ; Sun, 26 Apr 2026 05:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777204973; x=1777809773; 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=JPhfCkr06MJFNDM3yrbd0UyZSrVbNnbislx0lXDBpt8BuBw3iyfq3/qsxxai6BaaAD F8m/EwBPalP8tBtb0FUu0GhcuziiGLdjERjQMv1yE8OlMzUnVSHudr96D6wwv5X+6NRy fh5KfhsoCHNo09mWDH2ayKlXn/GdW3om0iD0zPQFdJKJZTpruFKsdhO7u0aXlYy2W9JE hsQqpdsKCyI2GQvu95kHocSrKcJHmvJCP1LTZ2HBYJ+3XbhjYot7uUDCYM5UyHmM900O rhddvCm+I+aQwXy6x23ExUGvRUqN5+E1Kek9j5oX7twjubKbit9J+iIh2RT55YcOCjWV Ylfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777204973; x=1777809773; 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=bf3QB9mgRd3hEJsu7CMzgQ/pUmV3cnvKceZAzHiOZ/oGhuyaANz8t86BznBmBMz6U6 2FxOg4yq7fKF9s5lL3v7RLNSUKd4/TzktA6XxEd23wmSQX6iUPjNhNLSVIFke/bMmXw/ CJB/+pjk9HokpVeyHivDB/8VGLIJ+DeKP5qbkPHnjSsvdHuXgXiqjbZQy/qvhk93KyTX MG34RNZn5juFbCJ2Gg9HDdg9i96qdWMBZHyYmmDhwCw91Zn+brKtyKLb4ugvg4+ceyUg XDJmpnFdqijmwzuPt7yPWiLYo/2q3MPGaVTPqpt54wYZ1+wdkcNpcyjDQ/tS1pb54F6b tLSw== X-Forwarded-Encrypted: i=1; AFNElJ9qhj3hBzd6SfcLrNxyPTeDbEsf0eQKvsFZk2INrAbVuL0UpbgCMrBYStjbe9ZJpM7dfxniiY19gj3A05A=@vger.kernel.org X-Gm-Message-State: AOJu0Yxj9CgHxq3FN3p4qNGfbDf3cse3VK7TorQkPNRMr9+D8ZS2BpOl cZp9guVGaQWAut3x8Tl/d1KcCsMlXDCQePm/j0xVRy0+ZVIpAE/bIaBG2YZIXWor7KIYJZ59J1a /dd+H X-Gm-Gg: AeBDiesw2qeKVmc7cFPCYxoIN6EBECZoHu4RZsN14EpskD0XeCkxnQxZaEZ4c53r9RX wkAShbQup+sQ9J807VRl89UuOppx36FsITwoX7hmETSUkGA+e4jDNqek852QH2XEP9I4KIwQzp9 /57rWGzSmX1IiqbwCBNmk1cxEEXXSn0Nfh2E0PzpmwZAxriWsTO9/w4JMd2Y9M2A8+dZvq9JNaj JPYrMEGUlemjzbtfa2n7Cq6BPb1hVhyzokNqtC4xccqYqLsfdmI0UxDmjsmWLWJXQkA5az/PL3o NKkpljEj/W4YnYH8tiF0DBFVj0k3fltc9takhxPF2zCqKmDUFa69UBBMoxULsjkpl7LNQ1n14AU n3QvKZQYc4JEnV2eJSEPm6KANrIPtepDb62pJcOPUKiif3D6xNIUFTcftbb7h090RVhUfIq9Jiw v/QLxq8Rego8gm+Y+2PyjwdAE0+63Dhg== X-Received: by 2002:a17:903:2ecc:b0:2b4:6022:bf8c with SMTP id d9443c01a7336-2b5f9f52984mr430205845ad.22.1777204973336; Sun, 26 Apr 2026 05:02:53 -0700 (PDT) Received: from localhost ([2400:8902:e002:de3c:3085:4d80:3614:2212]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab297c8sm263413965ad.67.2026.04.26.05.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 05:02:53 -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: [RFC PATCH 1/3] LoongArch: Allow rdtime_h and rdtime_l in 64-bit builds Date: Sun, 26 Apr 2026 20:02:29 +0800 Message-ID: <20260426120231.532644-2-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426120231.532644-1-r@hev.cc> References: <20260426120231.532644-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 Fri Jun 19 07:46:22 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 869D83368A2 for ; Sun, 26 Apr 2026 12:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204977; cv=none; b=YocMRL5LEMIrsJSobapEPYJI52z4WAZAefOitaP22A3ZaO0KtNu4ujrdHwXk6MpzmtK8IEgTe+4wowvfDHERU86agW4P48/wln59XW+P/QABMjpJ0Xe8B5NGVROu4NL6IEdexhR+g8mb9zzIp0l8pTqMOYfMEuOcteVpupBU3Q0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204977; c=relaxed/simple; bh=qQCPWEhONCN/TKigEaYuGrNcB33stTCwU1/MF1UQ6tc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GOOF8xTtKgeQSPof8pbLDK50ajptA6A+kwtMLU7CMarS6Yen/82QeHlhYhcdHj2zJE8HXttY2+oa/NAYRssi9LCH+ezlpPqmKPrqtcI53BugqUaL5clEtS3htoyZGCvHjUYklV+ZsdcDiszynl4ILmdDbw504Rb92NJyFFjQYv8= 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=WOKiuyl3; arc=none smtp.client-ip=209.85.214.172 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="WOKiuyl3" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2b23fcf90b2so88729965ad.3 for ; Sun, 26 Apr 2026 05:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777204976; x=1777809776; 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=YymJ79SCPZTf+NPdeESDccb+VxFojDPK0l67eRMH4Fg=; b=WOKiuyl3GFRj8GkTYGKAnR40iMv81zlM2f+aDKgveIVxmsBbyxX9fWV6cLKzuBZ55T b9sV3nORqTfkdK78mslxW9bKm628nCO9YJxLF5H1EIuKejAOzq/tUI9Gum5G5exaTfnG wzFjVQ8HRSFjHtu335ki+KtieKPr+W1nwJrzI5iUK4lR/P2eIonL7raPpOcCjR80oSKz /MrLmklscBShP2k6YmB5Q186ImeTLDe8xyOuuDik3hmReyUqMQv5nsrLFxqMCqtWwUY0 2EEkQBjmMpB/l9tmJ5Pt/q+ub7wiKJoSi36onXIVDPYdtFh9Cr/QyJgCtwb6FXn0y0FI YOCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777204976; x=1777809776; 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=YymJ79SCPZTf+NPdeESDccb+VxFojDPK0l67eRMH4Fg=; b=mnldfkqDlollicTCi5IhoZ4W0WMPshS8PKDh+Max8p7xm8X7s17UDZd4EfucIF0tnZ X+tncJZO0ltz4dwYH819NLA3TFgJpeh+R5TceikVzDVrrRvcqIaQgDEkPsaGV2oO8zxv B7JiDC6bwUFWtCq/3KPf0Uvhd/bwlxs4QlXmMDT1JtVngcofX7Z+k2WJsmB1JVJvmFfo 26n2b3YaJOb3ndtjPja51smsx0UmrgosfdGAWedpFnrrd7wxiCdDvJ2ayYrYg57TyjoE CLYmjjKD4IP3TfSG9mo6ZjxqzZvZcDomKpVaVNl+jO61+ElWg7BGQO44/knjaZNf+zIc j7oQ== X-Forwarded-Encrypted: i=1; AFNElJ/1pyp2PnYZlCdwtrEgTDPD0CyI7h5/XaWFndEm8M6+cp6kL/JxdtslntLBYPMmWKb1jDBliupFW+D/sJ0=@vger.kernel.org X-Gm-Message-State: AOJu0YwnrAQwp7FDMfFqB8uhuxgyI2HQeKwfHF4Ru0QRPuEKMGW8hVjb FzSbja11/et8bonebpZUjWIvk4Wp7wlaEV0XeeUl67uZ+GP4LB7Y05KsPBYfmCPR4Pg= X-Gm-Gg: AeBDietfYY1/52NQK1huMGHKue7kF38w/dfEwF3J3l/rMTN2wgYL5JbtzCOF/nZ+gLx TPSAnL42lKnwXX7G8Q2wyfv2CEZf14KoP/c+T8fpHWbGirpiJoiXoafSTdUXR0g2+jYa462k7HP 2gYDaiSQ9eJbdrhAozTZhaxOxsxPL5Yju5oI0KFntKPVCWK8SBHCvYlz52PfS2nP+MjfSmsUXgJ yk+lRMflO4KjlqgYCU2Y28zq/n/qypAFFAmzRzzw3rQCVvc73ud5O4Yd/Pz86g7/iqUBozVKcNj C/kmTcD4HElAHe2+G8VKTlvypiXu+hQITNUB39+Z8fpQaTwjL5M5NhsGJ5QJo71txsuTUrg5Kim 24MtXeRGV+0Y2xKySu5o52FmwDsPek0FlWyBbIqMrr3EZ8xusPE37HDioLDe3vUx4/QmI7e0bBh ROAE3ZIMePBETlptgLtIye7YTbeag15w== X-Received: by 2002:a17:902:d58e:b0:2b2:5c31:24bf with SMTP id d9443c01a7336-2b5f9f1b8d7mr389958585ad.19.1777204975949; Sun, 26 Apr 2026 05:02:55 -0700 (PDT) Received: from localhost ([2400:8902:e002:de3c:3085:4d80:3614:2212]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab297c8sm263413965ad.67.2026.04.26.05.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 05:02:55 -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: [RFC PATCH 2/3] efi/loongarch: Randomize kernel preferred address for KASLR Date: Sun, 26 Apr 2026 20:02:30 +0800 Message-ID: <20260426120231.532644-3-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426120231.532644-1-r@hev.cc> References: <20260426120231.532644-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/include/asm/efi.h | 4 +++- drivers/firmware/efi/libstub/loongarch.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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..80ba7d69e1b3 100644 --- a/drivers/firmware/efi/libstub/loongarch.c +++ b/drivers/firmware/efi/libstub/loongarch.c @@ -38,6 +38,21 @@ 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 - 1); + } +#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 Fri Jun 19 07:46:22 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 9B68735A393 for ; Sun, 26 Apr 2026 12:02:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204981; cv=none; b=kYDkTlLLNpv7DGEbN1aRJ4tVMnhIdKcv91qqtIavDXYIOrCIA8yQZCHPMupWpya6pC71G3i6MssY5Xa3sNgQnt6DdyevqAobDQ0z/uS0Bkgv2awul2v9bcWBE5KXMNchQt6UoTUs4WTetjDAf8xLhh/UmlunSlYP6U5WDdqkook= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777204981; c=relaxed/simple; bh=x1m0TD4Z4bsNO+SOJ0ZCm0OpkLXRv7657OfoURIS1Mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UDE9ShlwOTdFanGR3l6nJdH9St/4SNeDyhrO5hIUK9fqIvT8vHi9DANOnomfx0jrKrJgyAM9weBSLBDAaTzOE5GMDe4d+JV9ZEOs2CvJESmdDSi+j6zZkg5nFo1cglDVFvGCLxtXo4QUAbGx8V+hRTb7njMCAi9BAih64mUxGcA= 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=D4ttSUYw; arc=none smtp.client-ip=209.85.216.53 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="D4ttSUYw" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-358ed696623so4149522a91.0 for ; Sun, 26 Apr 2026 05:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777204979; x=1777809779; 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=m/smLlR9zOWQ43zNvq5xtCfeY8/G1pmsrzt92d3svcU=; b=D4ttSUYwZoM3vtlW1sGIC8AB2ZPRz1xpnpDua36Bn1dPifKkhjdmOt9fgSjWtX9ytI wAZ+eG7LPTFaNmI9V/2AhIXmb+0alrWrDss806y+PuV+2OYUwb6JyqjcjEjLfaSL9u3r +Jsj/8sBieU5XDGGXn20GlNqWzRktR7otEhTl2pVf0z+WMcnvBkcapRilf3NS/faUYwT 1llclx/RS2aUHIJU0BF+JpbzLCypXi7BGUW7qZqXqfqWX2AONMcDGF3KXATiXj4YErTC TGGev57NB5bPHUt4WDtz5tBdayZ9ZxXEFJ6CXYSlAnWwtl7pQKFPv5jslLGhIhM0tdaQ zCXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777204979; x=1777809779; 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=m/smLlR9zOWQ43zNvq5xtCfeY8/G1pmsrzt92d3svcU=; b=cogpkFRLBJOmcoX7mepLGB2N+S4fMiwt/ggp+NeDyWCm0JereZUoahU6Kcg12pqibE 1Keoc8wqUkkvHfpp3PLfYkdtnXHq3trYYDAnixp8kouSKkNSXfPukYBE0mLFIrnu5i7x eY7MMYMD7clZk6JqDWAPRbbPCBmOIog0tap93uoMuBP8UiCTv1mnYqiMsyuUjNVxUpkG b6zxLDJJSpZgN5YGGqC8+u7w+EQ258b/qOZlZC9dv9gatNRpNaC457qFNNYxOEncKpY/ jH6h6c2WW8QcISEOxo539wd/myPaAyBTHOBXgeXhHcpdcFjpv41/slCIKP3pHvT/7h9S 0lqg== X-Forwarded-Encrypted: i=1; AFNElJ/RZoJiBznKuPWrTG3cUH3r359wkilBv9m+CMDtmSAZ26PiXRk4SlOoqcWc8ImQzDolngTW1jAn4BCBpn8=@vger.kernel.org X-Gm-Message-State: AOJu0YxTBdwnevB7TuPjvo78+UvBuo5cUyanQgHzmdcZau/C4SPbdJlz BGlzyauf/96EFsKjwQzOPYmnI+89rxBNksg2Cv3c8W2OU3iGeIGPShI3R0ueKyHOITQ= X-Gm-Gg: AeBDiev1qtFziY2oH/s3U1BXDNpiVWcaxXLqFEbmJMVoMoo6HuqiGiXxPFdUaWpnQPk cQdajdg3Uy+o7NZs1uhWy3UmwN8T4h06ghvpC4HWaRTnsG3WV0dkrIUzyW+bgLAq3cAMzaAeXK7 yd6VkLvksOhgYVsUDYPsHWwGElUtv/06PMIsZKmkdN9Zjc6kcUp0RLR6FraMPvLTt8F3fTJ222F Whq/AURihVi+ML9MTD2OOvDbuexAe+6TXBJQQjlgtIX5wp64G4YACWPHUn45gxsjERc0oDDGUom 07uk6Pk7jnJWiH+iJqrgqJRMWn1o/DoL5+EMuxhAEDURc0GAb2xtFUn8jgth1Z8kq4tzHe8Bppu GpjUhRxeiIHKssYCs4QPttU1eLSmHRso6TnLmXRt5nmdSGw9oNROvG5QWgXhtgtjbH3nOhu61De cz6SbH0NIf75QJjBjOGFU= X-Received: by 2002:a17:90b:4e85:b0:35f:bf23:bd78 with SMTP id 98e67ed59e1d1-36140461d2dmr39745018a91.16.1777204978741; Sun, 26 Apr 2026 05:02:58 -0700 (PDT) Received: from localhost ([2400:8902:e002:de3c:3085:4d80:3614:2212]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab297c8sm263413965ad.67.2026.04.26.05.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 05:02:58 -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: [RFC PATCH 3/3] LoongArch: Remove KASLR handling from relocate_kernel Date: Sun, 26 Apr 2026 20:02:31 +0800 Message-ID: <20260426120231.532644-4-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260426120231.532644-1-r@hev.cc> References: <20260426120231.532644-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" With KASLR address selection handled earlier in the boot flow, the in-kernel relocation logic is no longer needed. Remove the code that determines a randomized relocation address and copies the kernel image at runtime. relocate_kernel() is simplified to apply relocation fixups only, and its return type is updated to void since no offset is returned anymore. Signed-off-by: WANG Rui --- arch/loongarch/include/asm/setup.h | 2 +- arch/loongarch/kernel/head.S | 12 -- arch/loongarch/kernel/relocate.c | 182 +---------------------------- 3 files changed, 6 insertions(+), 190 deletions(-) diff --git a/arch/loongarch/include/asm/setup.h b/arch/loongarch/include/as= m/setup.h index f81375e5e89c..7e427484834d 100644 --- a/arch/loongarch/include/asm/setup.h +++ b/arch/loongarch/include/asm/setup.h @@ -42,7 +42,7 @@ extern long __relr_dyn_begin; extern long __relr_dyn_end; #endif =20 -extern unsigned long __init relocate_kernel(void); +extern void __init relocate_kernel(void); =20 #endif =20 diff --git a/arch/loongarch/kernel/head.S b/arch/loongarch/kernel/head.S index 4eed7bc312a8..e134f8b084a9 100644 --- a/arch/loongarch/kernel/head.S +++ b/arch/loongarch/kernel/head.S @@ -84,18 +84,6 @@ SYM_CODE_START(kernel_entry) # kernel entry point =20 bl relocate_kernel =20 -#ifdef CONFIG_RANDOMIZE_BASE - /* Repoint the sp into the new kernel */ - PTR_LI sp, (_THREAD_SIZE - PT_SIZE) - PTR_ADD sp, sp, tp - set_saved_sp sp, t0, t1 - - /* Jump to the new kernel: new_pc =3D current_pc + random_offset */ - pcaddi t0, 0 - PTR_ADD t0, t0, a0 - jirl zero, t0, 0xc -#endif /* CONFIG_RANDOMIZE_BASE */ - #endif /* CONFIG_RELOCATABLE */ =20 #ifdef CONFIG_KASAN diff --git a/arch/loongarch/kernel/relocate.c b/arch/loongarch/kernel/reloc= ate.c index 16f6a9b39659..a9273c80a9bf 100644 --- a/arch/loongarch/kernel/relocate.c +++ b/arch/loongarch/kernel/relocate.c @@ -18,7 +18,6 @@ #include =20 #define RELOCATED(x) ((void *)((long)x + reloc_offset)) -#define RELOCATED_KASLR(x) ((void *)((long)x + random_offset)) =20 static unsigned long reloc_offset; =20 @@ -58,13 +57,13 @@ static inline void __init relocate_relative(void) #endif } =20 -static inline void __init relocate_absolute(long random_offset) +static inline void __init relocate_absolute(void) { void *begin, *end; struct rela_la_abs *p; =20 - begin =3D RELOCATED_KASLR(&__la_abs_begin); - end =3D RELOCATED_KASLR(&__la_abs_end); + begin =3D &__la_abs_begin; + end =3D &__la_abs_end; =20 for (p =3D begin; (void *)p < end; p++) { long v =3D p->symvalue; @@ -90,190 +89,19 @@ static inline void __init relocate_absolute(long rando= m_offset) } } =20 -#ifdef CONFIG_RANDOMIZE_BASE -static inline __init unsigned long rotate_xor(unsigned long hash, - const void *area, size_t size) +void __init relocate_kernel(void) { - size_t i, diff; - const typeof(hash) *ptr =3D PTR_ALIGN(area, sizeof(hash)); - - diff =3D (void *)ptr - area; - if (size < diff + sizeof(hash)) - return hash; - - size =3D ALIGN_DOWN(size - diff, sizeof(hash)); - - for (i =3D 0; i < size / sizeof(hash); i++) { - /* Rotate by odd number of bits and XOR. */ - hash =3D (hash << ((sizeof(hash) * 8) - 7)) | (hash >> 7); - hash ^=3D ptr[i]; - } - - return hash; -} - -static inline __init unsigned long get_random_boot(void) -{ - unsigned long hash =3D 0; - unsigned long entropy =3D random_get_entropy(); - - /* Attempt to create a simple but unpredictable starting entropy. */ - hash =3D rotate_xor(hash, linux_banner, strlen(linux_banner)); - - /* Add in any runtime entropy we can get */ - hash =3D rotate_xor(hash, &entropy, sizeof(entropy)); - - return hash; -} - -static int __init nokaslr(char *p) -{ - return 0; /* Just silence the boot warning */ -} -early_param("nokaslr", nokaslr); - -#define KASLR_DISABLED_MESSAGE "KASLR is disabled by %s in %s cmdline.\n" - -static inline __init bool kaslr_disabled(void) -{ - char *str; - const char *builtin_cmdline =3D CONFIG_CMDLINE; - - 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"); - return true; - } - - str =3D strstr(boot_command_line, "nokaslr"); - if (str =3D=3D boot_command_line || (str > boot_command_line && *(str - 1= ) =3D=3D ' ')) { - pr_info(KASLR_DISABLED_MESSAGE, "\'nokaslr\'", "bootloader"); - return true; - } - -#ifdef CONFIG_HIBERNATION - str =3D strstr(builtin_cmdline, "nohibernate"); - if (str =3D=3D builtin_cmdline || (str > builtin_cmdline && *(str - 1) = =3D=3D ' ')) - return false; - - str =3D strstr(boot_command_line, "nohibernate"); - if (str =3D=3D boot_command_line || (str > boot_command_line && *(str - 1= ) =3D=3D ' ')) - return false; - - str =3D strstr(builtin_cmdline, "noresume"); - if (str =3D=3D builtin_cmdline || (str > builtin_cmdline && *(str - 1) = =3D=3D ' ')) - return false; - - str =3D strstr(boot_command_line, "noresume"); - if (str =3D=3D boot_command_line || (str > boot_command_line && *(str - 1= ) =3D=3D ' ')) - return false; - - str =3D strstr(builtin_cmdline, "resume=3D"); - if (str =3D=3D builtin_cmdline || (str > builtin_cmdline && *(str - 1) = =3D=3D ' ')) { - pr_info(KASLR_DISABLED_MESSAGE, "\'resume=3D\'", "built-in"); - return true; - } - - str =3D strstr(boot_command_line, "resume=3D"); - if (str =3D=3D boot_command_line || (str > boot_command_line && *(str - 1= ) =3D=3D ' ')) { - pr_info(KASLR_DISABLED_MESSAGE, "\'resume=3D\'", "bootloader"); - return true; - } -#endif - - str =3D strstr(boot_command_line, "kexec_file"); - if (str =3D=3D boot_command_line || (str > boot_command_line && *(str - 1= ) =3D=3D ' ')) { - pr_info(KASLR_DISABLED_MESSAGE, "\'kexec_file\'", "bootloader"); - return true; - } - - return false; -} - -/* Choose a new address for the kernel */ -static inline void __init *determine_relocation_address(void) -{ - unsigned long kernel_length; - unsigned long random_offset; - void *destination =3D _text; - - if (kaslr_disabled()) - return destination; - - kernel_length =3D (unsigned long)_end - (unsigned long)_text; - - random_offset =3D get_random_boot() << 16; - random_offset &=3D (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - 1); - if (random_offset < kernel_length) - random_offset +=3D ALIGN(kernel_length, 0xffff); - - return RELOCATED_KASLR(destination); -} - -static inline int __init relocation_addr_valid(void *location_new) -{ - if ((unsigned long)location_new & 0x00000ffff) - return 0; /* Inappropriately aligned new location */ - - if ((unsigned long)location_new < (unsigned long)_end) - return 0; /* New location overlaps original kernel */ - - return 1; -} -#endif - -static inline void __init update_reloc_offset(unsigned long *addr, long ra= ndom_offset) -{ - unsigned long *new_addr =3D (unsigned long *)RELOCATED_KASLR(addr); - - *new_addr =3D (unsigned long)reloc_offset; -} - -unsigned long __init relocate_kernel(void) -{ - unsigned long kernel_length; - unsigned long random_offset =3D 0; - void *location_new =3D _text; /* Default to original kernel start */ char *cmdline =3D early_memremap_ro(fw_arg1, COMMAND_LINE_SIZE); /* Boot = command line is passed in fw_arg1 */ =20 strscpy(boot_command_line, cmdline, COMMAND_LINE_SIZE); =20 -#ifdef CONFIG_RANDOMIZE_BASE - location_new =3D determine_relocation_address(); - - /* Sanity check relocation address */ - if (relocation_addr_valid(location_new)) - random_offset =3D (unsigned long)location_new - (unsigned long)(_text); -#endif reloc_offset =3D (unsigned long)_text - VMLINUX_LOAD_ADDRESS; early_memunmap(cmdline, COMMAND_LINE_SIZE); =20 - if (random_offset) { - kernel_length =3D (unsigned long)(_end) - (unsigned long)(_text); - - /* Copy the kernel to it's new location */ - memcpy(location_new, _text, kernel_length); - - /* Sync the caches ready for execution of new kernel */ - __asm__ __volatile__ ( - "ibar 0 \t\n" - "dbar 0 \t\n" - ::: "memory"); - - reloc_offset +=3D random_offset; - - /* The current thread is now within the relocated kernel */ - __current_thread_info =3D RELOCATED_KASLR(__current_thread_info); - - update_reloc_offset(&reloc_offset, random_offset); - } - if (reloc_offset) relocate_relative(); =20 - relocate_absolute(random_offset); - - return random_offset; + relocate_absolute(); } =20 /* --=20 2.54.0