From patchwork Tue Sep 12 14:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381777 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 9ABC3CA0EEB for ; Tue, 12 Sep 2023 14:19:19 +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=+zxqpnQfEV9ewWDK/tBTU/Ii4iIS9fn1mbTpp+fLbLI=; b=s/PX1tX3cNU7mO3VohNPixPsNV Tk5k2aN7pMoaVH5WxxKK+ITgJk1IbPOYIuvDadZaj928Cde583urQNP2yYupX8L8/6nOGSvi4CRQx 7w10bdcdX5Jlr+pVtGm+86dHFjIDeYC65zyveP9lbY4jGIF2Y3PUD9zoBih5oQrxYwnAX6/EeTroX XRPY5Ae3D6TY2+bsmI9IlbQ/XEWAKUXjyTybmq/hvZRPkOCisYal++uz16/1US3GhCrZgBxcmcOlN vyYC+CCDfVFLri7jEI9HTxfVsQ8z/EG7F9flsxuMONIciwzqNHgT9nSJE9d9sha95khzwZ38GDw0V B7A9/FEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4E1-003WtP-0I; Tue, 12 Sep 2023 14:18:45 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4DT-003WR0-3A for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:18:22 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d8011973047so4416088276.3 for ; Tue, 12 Sep 2023 07:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528290; x=1695133090; 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=BGLA3neG+tb8jih86vno7Pk9eHTdG9q4j4NBkyiMcC0=; b=aTR5djViDm96cxObW/3Z/IOAoiV81PhBB8CN6w7o8zWPrX3r/rQg3GBlvDRluuyO4G NZ7AtFKSIp8P3Kq2KtcScyTaTGp+W36ueKLQQa5yD8qfsiqRWhXmfxA1tThRLb7isgu5 vf0gtA61LX2SwRsaeFp5bbb1KCrnAKCFbn/SGwCOSi9HYXYe6Ss2ivZxmCw2CdmJZORY lNL7D+s9OHutUOVLX1/eK1yaz2FpdJ3wBcj9M5Bv7MRlzDV339MFnPvYA76gkGGg+7rn hNzVpYJn0O3DSC15mc0Q3mrcY00sSK3odX1zGsmcmdYx2nKUngVx+92PsvtQOxC0t9jX cc2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528290; x=1695133090; 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=BGLA3neG+tb8jih86vno7Pk9eHTdG9q4j4NBkyiMcC0=; b=VjaUW2iB67b2oB2ICVe0XqSE0vln0t1CPSAjdBcb3cdfAu8dMtk0gr2Ag3Mnk4tHPM q5s3DO8LGBnvOUc638CWeiw1GXkAA5Ozjsvv5rkANlfhBAc8AUubmkbqdEiG6YiWORNA VgPqqpzfJyZnzGIQo+g4EhkniKb6Ckd3jl8omDzaVNghdaGa4KaajLt0UBE+uACuU7kK vxs1z/FwgDK8TdP073Zg0djQpVXaCX5WrsgO2rojoAUilm5INIp/clq9P4e3ZGKffqSa OiiKB3/3fO7hzqcZJ35lfAhYwQ1a7ZZ977bVejSy+Ko9ylW9AsloAqxkKkrSbRes9rxT Qd1A== X-Gm-Message-State: AOJu0YyV5Isyplx8ZTvmbH6PxmeNaZiU2vaQbvmzuAzInqWkjedubrOr iTmDK5McyyZpwISwrLZWRjdax8CPfufcj/WGKLnCz+kqA1eDG7sTXhZ3Rt18OhTchW0d1u/dlqX 2Hr9u5u4ozKAvHVEWp8QsFeAHT1S+J4GUFh1u2WVNYKySxFL6CiTVHe+jfxrcTXIIK7psFqnbhZ A= X-Google-Smtp-Source: AGHT+IEp18tK5oHipL8CLmugXbiEAd2+J6a9yLjciixnrVi+Ql1ysySd/IDjqwMAIpI4vN6iS6pK3Sal X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:ae96:0:b0:c78:c530:6345 with SMTP id b22-20020a25ae96000000b00c78c5306345mr249032ybj.7.1694528290167; Tue, 12 Sep 2023 07:18:10 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:13 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1677; i=ardb@kernel.org; h=from:subject; bh=cSiuqU58eWTFUnEgW7cbqc89QaTx9/6Ur7/IQsEMtvY=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaN29ktnfT++4d+1pDXeYkI//r68r5H8XFh9TqkqxF 171K721o5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAEzkDR/D//yLbiqTNYxO7rsp uqD+Yt+6Q0caOCX5M/9NfHTFsfBGjCXD/4yPk3mtJl0qOrb9YIul+6vgtYJnsi/3rpQqf+w7t33 xMS4A X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-86-ardb@google.com> Subject: [PATCH v4 23/61] arm64: Move feature overrides into the BSS section 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 , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_071812_062647_8EB3A1CC X-CRM114-Status: GOOD ( 12.41 ) 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 In order to allow the CPU feature override detection code to run even earlier, move the feature override global variables into BSS, which is the only part of the static kernel image that is mapped read-write in the initial ID map. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/cpufeature.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index b018ae12ff5f..bdd492cea88b 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -664,13 +664,13 @@ static const struct arm64_ftr_bits ftr_raz[] = { #define ARM64_FTR_REG(id, table) \ __ARM64_FTR_REG_OVERRIDE(#id, id, table, &no_override) -struct arm64_ftr_override __ro_after_init id_aa64mmfr1_override; -struct arm64_ftr_override __ro_after_init id_aa64pfr0_override; -struct arm64_ftr_override __ro_after_init id_aa64pfr1_override; -struct arm64_ftr_override __ro_after_init id_aa64zfr0_override; -struct arm64_ftr_override __ro_after_init id_aa64smfr0_override; -struct arm64_ftr_override __ro_after_init id_aa64isar1_override; -struct arm64_ftr_override __ro_after_init id_aa64isar2_override; +struct arm64_ftr_override id_aa64mmfr1_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;