From nobody Wed Feb 11 23:27:04 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 C459D1E7C12 for ; Sat, 3 May 2025 11:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271373; cv=none; b=JtIks2NvAMH0OazmSzDbHYvi8wiQPTE6SJCQUZFf6aXMIkRQ8mRnfYwqXyH1vDBdYNVkFjGQNhfvxK59PMpV9JRbbyAyx3L8Q2TxNgrmGGP2wR1ov/K8/EffR3F/uTtHPXZchYTjmp+R9mg3sVgi7QHs3grzkYwx6LB+ecN2ODQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271373; c=relaxed/simple; bh=SZrkBxQBIX661W5VVvcyVuJfe1U3MCxKou9uEoGpCEA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nva9lYMks0u5jrOTAdf32tYrbOj4rPakxUU0tHAnYqSqCXbLphkjMaJMjZYCy+Gfh/+C/Zb6JCy0m21MBRCz5Os/OrGC2Q5X3AnepRNG9X2ATcmf6luS06UdeN8FRitCwtyfgm5jiSx0FikFuhjE6+5d/uM+HR1APUIs0lPBFX0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1tZyDCfm; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1tZyDCfm" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-44059976a1fso12403295e9.1 for ; Sat, 03 May 2025 04:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746271370; x=1746876170; darn=vger.kernel.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=jEy2dzK1CfY22N91JTriuMXrrKPXV1plVaNkK6ipqjE=; b=1tZyDCfm++FDUK3/mA+Y2m5LvEz5IGyMOiS5o3c00Uv3lKU6hVeDjVhTzsh/Aox6AY 1h2N4prKEQD/kkubO0F6u/sWyIhxIE2vZqAYVE0oecq7pjiz/4Hplgc1G3DGEptNYaru YyAO+tTZV+ZRtM9Q/17tkBY42zWCU2J/+GLyp0NdLzhEAQxeSqI7BZJ+83F6cbDu4qPc pH/86Okj5tGUceTdcYi1U7IwauoprPtuTSct3w+dtxPwFw07+ZzHETFVqFr5Zv7YuDZd 3T1nuntQaQO2WE8LiC5nXCZV9icdMhaIJD37TCJB4pJghunYtcD5TbRz9WRYMYrEJIxe oB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746271370; x=1746876170; 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=jEy2dzK1CfY22N91JTriuMXrrKPXV1plVaNkK6ipqjE=; b=H8pKYudCGhwgoPdiEHTjMspDOFEidQQf0G3FvTYaQkshqFWb0e/j3afaE5gT8yvsSP 9kqF4hjEJ2YQXD5w0nU7BnP7/qIa6PwdS2pHVhun34LQvg2oog9FDf28uYqBu3iINB8O uF6/+tlV/4UouLZqNhYaRlTas2tCUqE1V/Zea319EWJ/1TQpLHHpz8UT/6spegtre/ID 3dibJcfoRno/cE+CMSSRNa7Tiu80AhUUS69h4DrrluTd10IYKzSMB1ebOzIRwqFDFEpY QEjsxbYJEIrW9DffxrKmtQxcE33iLsCJuyMv8hwnL5nfyPwSSM4l7PkGK03wKUTZsefY Qg0g== X-Gm-Message-State: AOJu0YzUIzKvuGjnEYVEKYsXuyVOEHIWtjxw83m3gGMyOT7G8/+M0+R9 jcaLvJqGCJW+ofy0RZNJ7SV81e1OfzZArAUJfOtVmYuHagGRH2/dPTh37gFIJAd43Y5Uaw== X-Google-Smtp-Source: AGHT+IHtyEmjTf996TScnc9rNYSDGzCIfB73VkA62s/k7MjtMyfOp3/sC6ByzFU+INk5DTveL/kLKzLT X-Received: from wmbes9.prod.google.com ([2002:a05:600c:8109:b0:43b:d523:6ad8]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:350e:b0:43c:e478:889 with SMTP id 5b1f17b1804b1-441bbe2c815mr56213835e9.0.1746271370173; Sat, 03 May 2025 04:22:50 -0700 (PDT) Date: Sat, 3 May 2025 13:21:39 +0200 In-Reply-To: <20250503112137.1962910-5-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250503112137.1962910-5-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=2602; i=ardb@kernel.org; h=from:subject; bh=3mTSEZ1dW7QwAe+xdFMTtJ+M2UkpWDSJCGZmF4mmZBs=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIUP0jzOzUaNl8abjX4L2Jb549miO1dubsc+UH3xe6nt/2 opXAg93dZSyMIhxMMiKKbIIzP77bufpiVK1zrNkYeawMoEMYeDiFICJ+GxiZDglEp+gk8UW5GyU 5tT9iP3d5zCe3nftkXYLliedOqr7wI7hf166mF62jWq3vfpcDdGrflp8v88XhBzdo7Ms543XIuZ 77AA= X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250503112137.1962910-6-ardb+git@google.com> Subject: [PATCH 1/3] arm64/boot: Move init_pgdir[] into __pi_ namespace From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, Ard Biesheuvel , Yeoreum Yun Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel init_pgdir[] is only referenced from the startup code, but lives after BSS in the linker map. Before tightening the rules about accessing BSS from startup code, move init_pgdir[] into the __pi_ namespace, so it does not need to be exported explicitly. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/pgtable.h | 2 -- arch/arm64/kernel/image-vars.h | 2 -- arch/arm64/kernel/pi/pi.h | 1 + arch/arm64/kernel/vmlinux.lds.S | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index d3b538be1500..6a040f0bbfe1 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -754,8 +754,6 @@ static inline bool pud_table(pud_t pud) { return true; } PUD_TYPE_TABLE) #endif =20 -extern pgd_t init_pg_dir[]; -extern pgd_t init_pg_end[]; extern pgd_t swapper_pg_dir[]; extern pgd_t idmap_pg_dir[]; extern pgd_t tramp_pg_dir[]; diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 5e3c4b58f279..a0977f7cd3ec 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -56,8 +56,6 @@ PROVIDE(__pi_memstart_offset_seed =3D memstart_offset_see= d); =20 PROVIDE(__pi_init_idmap_pg_dir =3D init_idmap_pg_dir); PROVIDE(__pi_init_idmap_pg_end =3D init_idmap_pg_end); -PROVIDE(__pi_init_pg_dir =3D init_pg_dir); -PROVIDE(__pi_init_pg_end =3D init_pg_end); PROVIDE(__pi_swapper_pg_dir =3D swapper_pg_dir); =20 PROVIDE(__pi__text =3D _text); diff --git a/arch/arm64/kernel/pi/pi.h b/arch/arm64/kernel/pi/pi.h index c91e5e965cd3..38a908d048e8 100644 --- a/arch/arm64/kernel/pi/pi.h +++ b/arch/arm64/kernel/pi/pi.h @@ -22,6 +22,7 @@ static inline void *prel64_to_pointer(const prel64_t *off= set) extern bool dynamic_scs_is_enabled; =20 extern pgd_t init_idmap_pg_dir[], init_idmap_pg_end[]; +extern pgd_t init_pg_dir[]; =20 void init_feature_override(u64 boot_status, const void *fdt, int chosen); u64 kaslr_early_init(void *fdt, int chosen); diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.ld= s.S index e73326bd3ff7..73fa57f341b0 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -321,9 +321,9 @@ SECTIONS BSS_SECTION(SBSS_ALIGN, 0, 0) =20 . =3D ALIGN(PAGE_SIZE); - init_pg_dir =3D .; + __pi_init_pg_dir =3D .; . +=3D INIT_DIR_SIZE; - init_pg_end =3D .; + __pi_init_pg_end =3D .; /* end of zero-init region */ =20 . +=3D SZ_4K; /* stack for the early C runtime */ --=20 2.49.0.906.g1f30a19c02-goog From nobody Wed Feb 11 23:27:04 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 CB9141F1927 for ; Sat, 3 May 2025 11:22:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271377; cv=none; b=JrjMTqgcrrcx9CKxFWJXJh5vk6GVsHnxpPP76ychqN+xjsbk/q2r7bHx+uITkdvNkJMi5HXH/r7fuRT/sbQJCCCZMftV6YbRC07osBJKjHKGU6iMpxmibsBjww5HfL7TH24460fRpTTR4VRLOhLJDW+C06nnewu7Gsd0iQJiGak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271377; c=relaxed/simple; bh=Ey1IGpeyUTEQBR1CH2WYTdzMrTDVKyzLa3v5b3Ov6+U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mFewLKkYhmRuqvSpLFfAQiPKNb6yB4uGHDgd508itN34OdWwmQZ/qvLbRD9mLiXJw7PHMXU6oyHBsW4kJPZ+v5P2ECgNtS7pjAtl01Y32vgva1mUSRnAt1SpW535KKdo99AQd/UiQlBop3lSAtvZ7Valncn367cmG2R73NNBvwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=fTqKljZf; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fTqKljZf" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43e9a3d2977so20412415e9.1 for ; Sat, 03 May 2025 04:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746271374; x=1746876174; darn=vger.kernel.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=3SSo2V5DW0c+y3j+ua7cR3q/eHybtkZ4S8xKtKJs3yI=; b=fTqKljZfr2qD0VnVxBgrEi7zA9dGPsw2NC8WSqVBT5O3ty1H3JUJzdzgMz2gxWdAjo Z7s6UnZn54ua4p7d8tDfPlK5rRYeQdExciEb/GIO+ivS26QTSYdWwL+0YuEJwx4Hrryj zWMAaRTAJF3Ytiykhs+sEOqFzUD8f7FuPOpYvQm9pR0baw5PkU0BzQIHvn5rnF926sh7 z4Lk3r08e0+x+Krkn1JyV4fkiq6ag1pJkZQD7Vmdmc4pX40+WXLFwYvFYF4GxSmGDCAl dnBV1o5gZGHWN7qbKOZW+dNfgqThcLnLd9JI2r8quDwkcZ4Dh0JSFPsB+UOJcI0wOu+N tLbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746271374; x=1746876174; 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=3SSo2V5DW0c+y3j+ua7cR3q/eHybtkZ4S8xKtKJs3yI=; b=QnFZgrHXek0ENG6OYOeF5TCIXedZSdGEnSmws2xiC8eDqhgxyVUfnAvSY+a8jRaEke VzzePb8Vn3j1h+vDHI0+m92kWEb4hddqjlDbfJT/xmtMwTUciq2SJRZjQE9nbYTH+VQb sYNm45ssiekE3bYpode3mVLPUkvqRBWyS5ubblWho2fCdrQ7ZIeGZOtMoxoszM9EsW6T Nj8V6+3HGmgYS/mqAXwV+TsWIhTiQQzvHcsRxLaH5GlO+WYTKX2NB0O07kVVvRPDjPjy t4OrRzLTJZsIBcB2jm/AYACt+EyiOZuy5GjE05bG8MwI5Mb7xbh4njqB1tiO5p/BRI91 IWxA== X-Gm-Message-State: AOJu0YyQgoCPBHGbOQ6HxxlNyLN+RkfpC5TFHoawoba7CR/mI7mqPiXt jDRlzIVohuSmGb/354LcAr/f3LaBLccHTRZPdVxwje1F03zXT5FOlUBRlXoBu9AMPOARiw== X-Google-Smtp-Source: AGHT+IF6yejisH/hDvE4jSPffTRfG+SXhs5IVajQ7lr9xpPhKHKJMphHm5b0g1Gou8Ej+L5xPw4dcEH3 X-Received: from wmbfo18.prod.google.com ([2002:a05:600c:6912:b0:43d:847a:8ccc]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3554:b0:43d:aed:f7de with SMTP id 5b1f17b1804b1-441c492371cmr5292875e9.21.1746271374100; Sat, 03 May 2025 04:22:54 -0700 (PDT) Date: Sat, 3 May 2025 13:21:41 +0200 In-Reply-To: <20250503112137.1962910-5-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250503112137.1962910-5-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=2200; i=ardb@kernel.org; h=from:subject; bh=z7mNfjQpBpv68AAd9mLqKIgg7+5n4LTGUtL+5ULXTPo=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIUP0jxvfFp07//euOxcgzJRTJtTTV6q79khId+maBWuLb R+FtTR3lLIwiHEwyIopsgjM/vtu5+mJUrXOs2Rh5rAygQxh4OIUgIkIrmRkaFycySHGGGp27+gj TW+tyNUn+/bn78zdVl2q9itT9IF+AsM/CxEdfuuHR0Olm06Z694+tckiatbUB6zLv70O2DXx8d5 sHgA= X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250503112137.1962910-8-ardb+git@google.com> Subject: [PATCH 2/3] arm64/boot: Move global CPU override variables out of BSS From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, Ard Biesheuvel , Yeoreum Yun Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel Accessing BSS will no longer be permitted form the startup code in arch/arm64/kernel/pi, as some of it executes before BSS is cleared. Clearing BSS earlier would involve managing cache coherency explicitly in software, which is a hassle we prefer to avoid. So move some variables that are assigned by the startup code out of BSS and into .data. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/cpufeature.c | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 9c4d6d552b25..4f7a8050ab85 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -758,17 +758,17 @@ static const struct arm64_ftr_bits ftr_raz[] =3D { #define ARM64_FTR_REG(id, table) \ __ARM64_FTR_REG_OVERRIDE(#id, id, table, &no_override) =20 -struct arm64_ftr_override id_aa64mmfr0_override; -struct arm64_ftr_override id_aa64mmfr1_override; -struct arm64_ftr_override id_aa64mmfr2_override; -struct arm64_ftr_override id_aa64pfr0_override; -struct arm64_ftr_override id_aa64pfr1_override; -struct arm64_ftr_override id_aa64zfr0_override; -struct arm64_ftr_override id_aa64smfr0_override; -struct arm64_ftr_override id_aa64isar1_override; -struct arm64_ftr_override id_aa64isar2_override; - -struct arm64_ftr_override arm64_sw_feature_override; +struct arm64_ftr_override __section(".data") id_aa64mmfr0_override; +struct arm64_ftr_override __section(".data") id_aa64mmfr1_override; +struct arm64_ftr_override __section(".data") id_aa64mmfr2_override; +struct arm64_ftr_override __section(".data") id_aa64pfr0_override; +struct arm64_ftr_override __section(".data") id_aa64pfr1_override; +struct arm64_ftr_override __section(".data") id_aa64zfr0_override; +struct arm64_ftr_override __section(".data") id_aa64smfr0_override; +struct arm64_ftr_override __section(".data") id_aa64isar1_override; +struct arm64_ftr_override __section(".data") id_aa64isar2_override; + +struct arm64_ftr_override __section(".data") arm64_sw_feature_override; =20 static const struct __ftr_reg_entry { u32 sys_id; --=20 2.49.0.906.g1f30a19c02-goog From nobody Wed Feb 11 23:27:04 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 C9F2A1F0991 for ; Sat, 3 May 2025 11:22:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271375; cv=none; b=MO6KwmySoFs6z1RU8/XBRVePOUWtrNswPcNuuqtW34g1fkj/OocVFcMa2PR/jUjtoeKHZUez8KiE9sL2cIkm2V6PVV975CXRepMSdIDQd7wMRusVkg3+p4R79A956hS98fYg9rcuEHhff7W6xePsPs3CdIDOcfMHyA9YFegmBqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746271375; c=relaxed/simple; bh=+VDQbT7DbDc/3D5PDwuSsfdKs0/KBM0En23dVlhtcXw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KZTgUMBlrjIr3UJeEw1R/mqbS+KSKx4QAAJf3GctLEl3gQu7WXZ5Z0ei9pWNvlCByqBPuv/iHBH0yrTSuu+OdMPt79paqYv78ERCkzkLS4n164qXb/c1Iuz5p2mn0sqeoN92xGpJodpxISEdiVlXV4V1n8sRjbXkRl4aPS4vdSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1mzddDoW; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1mzddDoW" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-44059976a1fso12403315e9.1 for ; Sat, 03 May 2025 04:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746271372; x=1746876172; darn=vger.kernel.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=Q7pRJ8N5ohYmMmQpK3FOw1IcRE7JKZ5K0Zu4pd8yknU=; b=1mzddDoWfQvFXk8GmLVVNL5wGkuznEdemWO3P459C7ZZVImyi8K1AboF+LldPbpW6M CGc1dDkGZwvg4NYn6ifymmcUCQgmxqBxmLfHiO0OnO5mXj1dsmWQnX3eP1yKqGdRy5sl trvVOQVH1rng3s5B7l9ZvP7H3w1pKCsabL/1F5pgomOfWdJqFwEOm2zz9/wtwtUTC3JH R3xDgylIfzn6tnGHHEk2sc12CoybZ5j8qANcSYFfAPITu4hP8891Wsi851zuXy7Tuvqd CQJM5K83eqTl8hRqV1g7CEL93cPh2Irc6h6oaa/XgjmT6U++LDkf/T+QClrMRNZ7dCi2 aI1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746271372; x=1746876172; 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=Q7pRJ8N5ohYmMmQpK3FOw1IcRE7JKZ5K0Zu4pd8yknU=; b=BMtjGK9kLZ3+CLWJol1fcZEO1TK6vE1opJ9H+27ZvG9cKsQ1TqKJU8UK6OZWFL9VCg v8nUFkwHmMvLnx0iTk8vzY80tLiT+QGltkxX8KhADQXA7UdtD4pgfeTY288Ujn0jfP0z NCB35FRvFX61yIMgxbdMPpksRpcrW+NPF3FJW3mg22BRroRi07DvPp4HMyeI+YRRckxg dkzmxBe9C1IHttn++rOYH41cY40PMlYug+tPLEmg8JAXj7O0OpdpXrt0hljau+9bUVAK CBOvpf/dQ+kcEHFvIgz2Dy9/+Emado3jsb4gTN02iY6uKo8eeU8aaDzwIvFjP9nHeoEC jf/Q== X-Gm-Message-State: AOJu0YwKRQMR4+jL4yOPD+sXB0kTLK20gmpZHgw3sEUfFyqA7PaUqD1b zGhjkBTAvkk2Z9UO0S2imuglvyRI8k9VmB9oRQqizLsqCNL65sESZtlNjRn8HYp39cimJg== X-Google-Smtp-Source: AGHT+IGboVfEOD8882gZCl/QlgqflxehOhB9nxaCA5MID+YskJ5d9TwwGKK3gZH+A3IjbiJJ2z9JfmFe X-Received: from wmbhh15.prod.google.com ([2002:a05:600c:530f:b0:43b:c336:7b29]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:19c6:b0:43c:e9f7:d6a3 with SMTP id 5b1f17b1804b1-441bbec2a80mr53186055e9.13.1746271372192; Sat, 03 May 2025 04:22:52 -0700 (PDT) Date: Sat, 3 May 2025 13:21:40 +0200 In-Reply-To: <20250503112137.1962910-5-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250503112137.1962910-5-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=4347; i=ardb@kernel.org; h=from:subject; bh=FO55xdVOEfcY87NzOXPLkNoCVvwAS3bVLAgszquzX5g=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIUP0j0v0th2fdRYv7OQpeHRav4OzfLFqgYBZ2bwDyi7H3 QVsK0w6SlkYxDgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwES2azEyHNzXzGsqayex1MKt RGqis3SjaVvopJir969OPyoirNAYxfCb7U6F0Q9J45j4Oj/GK+8EGE+vXP9gea6jR967Oj6h2hm 8AA== X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250503112137.1962910-7-ardb+git@google.com> Subject: [PATCH 3/3] arm64/boot: Disallow BSS exports to startup code From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, Ard Biesheuvel , Yeoreum Yun Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel BSS might be uninitialized when entering the startup code, so forbid the use of any variables that live after __bss_start in the linker map. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/image-vars.h | 66 +++++++++++--------- arch/arm64/kernel/vmlinux.lds.S | 2 + 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index a0977f7cd3ec..a70244d1aa2a 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -10,6 +10,12 @@ #error This file should only be included in vmlinux.lds.S #endif =20 +#define PI_EXPORT_SYM(sym) \ + __PI_EXPORT_SYM(sym, __pi_ ## sym, Cannot export BSS symbol sym to startu= p code) +#define __PI_EXPORT_SYM(sym, pisym, msg)\ + PROVIDE(pisym =3D sym); \ + ASSERT(sym < __bss_start, #msg) + PROVIDE(__efistub_primary_entry =3D primary_entry); =20 /* @@ -36,39 +42,37 @@ PROVIDE(__pi___memcpy =3D __pi_memcpy); PROVIDE(__pi___memmove =3D __pi_memmove); PROVIDE(__pi___memset =3D __pi_memset); =20 -PROVIDE(__pi_id_aa64isar1_override =3D id_aa64isar1_override); -PROVIDE(__pi_id_aa64isar2_override =3D id_aa64isar2_override); -PROVIDE(__pi_id_aa64mmfr0_override =3D id_aa64mmfr0_override); -PROVIDE(__pi_id_aa64mmfr1_override =3D id_aa64mmfr1_override); -PROVIDE(__pi_id_aa64mmfr2_override =3D id_aa64mmfr2_override); -PROVIDE(__pi_id_aa64pfr0_override =3D id_aa64pfr0_override); -PROVIDE(__pi_id_aa64pfr1_override =3D id_aa64pfr1_override); -PROVIDE(__pi_id_aa64smfr0_override =3D id_aa64smfr0_override); -PROVIDE(__pi_id_aa64zfr0_override =3D id_aa64zfr0_override); -PROVIDE(__pi_arm64_sw_feature_override =3D arm64_sw_feature_override); -PROVIDE(__pi_arm64_use_ng_mappings =3D arm64_use_ng_mappings); +PI_EXPORT_SYM(id_aa64isar1_override); +PI_EXPORT_SYM(id_aa64isar2_override); +PI_EXPORT_SYM(id_aa64mmfr0_override); +PI_EXPORT_SYM(id_aa64mmfr1_override); +PI_EXPORT_SYM(id_aa64mmfr2_override); +PI_EXPORT_SYM(id_aa64pfr0_override); +PI_EXPORT_SYM(id_aa64pfr1_override); +PI_EXPORT_SYM(id_aa64smfr0_override); +PI_EXPORT_SYM(id_aa64zfr0_override); +PI_EXPORT_SYM(arm64_sw_feature_override); +PI_EXPORT_SYM(arm64_use_ng_mappings); #ifdef CONFIG_CAVIUM_ERRATUM_27456 -PROVIDE(__pi_cavium_erratum_27456_cpus =3D cavium_erratum_27456_cpus); -PROVIDE(__pi_is_midr_in_range_list =3D is_midr_in_range_list); +PI_EXPORT_SYM(cavium_erratum_27456_cpus); +PI_EXPORT_SYM(is_midr_in_range_list); #endif -PROVIDE(__pi__ctype =3D _ctype); -PROVIDE(__pi_memstart_offset_seed =3D memstart_offset_seed); - -PROVIDE(__pi_init_idmap_pg_dir =3D init_idmap_pg_dir); -PROVIDE(__pi_init_idmap_pg_end =3D init_idmap_pg_end); -PROVIDE(__pi_swapper_pg_dir =3D swapper_pg_dir); - -PROVIDE(__pi__text =3D _text); -PROVIDE(__pi__stext =3D _stext); -PROVIDE(__pi__etext =3D _etext); -PROVIDE(__pi___start_rodata =3D __start_rodata); -PROVIDE(__pi___inittext_begin =3D __inittext_begin); -PROVIDE(__pi___inittext_end =3D __inittext_end); -PROVIDE(__pi___initdata_begin =3D __initdata_begin); -PROVIDE(__pi___initdata_end =3D __initdata_end); -PROVIDE(__pi__data =3D _data); -PROVIDE(__pi___bss_start =3D __bss_start); -PROVIDE(__pi__end =3D _end); +PI_EXPORT_SYM(_ctype); +PI_EXPORT_SYM(memstart_offset_seed); + +PI_EXPORT_SYM(init_idmap_pg_dir); +PI_EXPORT_SYM(init_idmap_pg_end); +PI_EXPORT_SYM(swapper_pg_dir); + +PI_EXPORT_SYM(_text); +PI_EXPORT_SYM(_stext); +PI_EXPORT_SYM(_etext); +PI_EXPORT_SYM(__start_rodata); +PI_EXPORT_SYM(__inittext_begin); +PI_EXPORT_SYM(__inittext_end); +PI_EXPORT_SYM(__initdata_begin); +PI_EXPORT_SYM(__initdata_end); +PI_EXPORT_SYM(_data); =20 #ifdef CONFIG_KVM =20 diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.ld= s.S index 73fa57f341b0..bd7626b8c7a3 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -319,6 +319,7 @@ SECTIONS =20 /* start of zero-init region */ BSS_SECTION(SBSS_ALIGN, 0, 0) + __pi___bss_start =3D __bss_start; =20 . =3D ALIGN(PAGE_SIZE); __pi_init_pg_dir =3D .; @@ -332,6 +333,7 @@ SECTIONS . =3D ALIGN(SEGMENT_ALIGN); __pecoff_data_size =3D ABSOLUTE(. - __initdata_begin); _end =3D .; + __pi__end =3D .; =20 STABS_DEBUG DWARF_DEBUG --=20 2.49.0.906.g1f30a19c02-goog