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 04F89C61DF7 for ; Fri, 24 Nov 2023 10:23:37 +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=p+y9MjOGqazUYoaiAOrlIDRdmTxHit/9OGvI/DcOs6Q=; b=fMFQfExDZx6rgA5TZDw4CWwbyr YmflQTSXxxuq8k1Me9pYyAe2kyhP6TodQE2sXcCGHwDBlEl6M711VnPGhY1/1/Tymzlxj5594cpKW 8N5YggtVi75xqrxoqOg3CSyYqRChDoIw1Z+rOa5xVJ7Fn2jQgHY2SAHotYXqmV7X/yTf6mNaFKcl6 Z2bzPKblFJQffZxllYqvPBTYKblFYzuASSvqr4Eknl1iIEhM98xfgNnOQ8Ro4y3zK2cpAiCLavkAw hBVPl0fWiCu3aAo7FUvXpAMp/DzBYLIJqplGgaU0h6plK1u2sB2tZUU/pdOQ6iA4C79YVc9YIUhka OYpcyTnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TKy-006psK-1u; Fri, 24 Nov 2023 10:23:04 +0000 Received: from mail-wm1-f73.google.com ([209.85.128.73]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TJJ-006p4B-1S for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:21:34 +0000 Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-40b2977d6baso8984255e9.2 for ; Fri, 24 Nov 2023 02:21:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821278; x=1701426078; 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=l10XqWeu41AoBxa5WcSIhVpgfupQiGyV50BGL3XWLaI=; b=hEsed0A0Ec346171CcstTmcHaBRu4JBTimRg6UfXsOrerCqPRhZYLla5sjL/CR6tzG B/J4SUhaXKDbf66WY+XBnHan81gGc29s+2LL4VydXtPsQZ0JjPkbd9luWe780cvj8hx/ OCKeW+VgNSht3eX2Una3pCjGIER1WjoxV9qstBo6SCeJFP8bYVAtgJYbuA6JsWG1jJSJ b0oBskNxVtNNDmaz0XCyONTx3T+UAtMjpoS1QQIJfsJD8p/+xwOvHdVljlcNEGtzcqZs NeCrKB/8kiJXUxsxOuamKa1Cvwq/G4tBhijWj2nEc/AXIeIgn9G+qAaQzxY09FBy2E0v B89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821278; x=1701426078; 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=l10XqWeu41AoBxa5WcSIhVpgfupQiGyV50BGL3XWLaI=; b=P2uQvXMTLZh1iYH5DZm/Nf3bb0ieHpk6EybtmsDNeSPoztTg7YycCruOX0SIvXFXrB ZZeEJBDH6E8ecy4AC5ackbIdszXz70Ie13pgPp5ovOhenHvVpkG8riN5K7QLK69Msv6l w8GJ0dFh2W+aQmYc6FxWkyiayHeKKR4mRvWsSWhNYRiG1zHtHYPq5Nd2tx5bVI3pJzVT l7SzRInD6ue7364Uw4Jh6QR6dqdZs+WVklIPmhJ/ofMKdWojg7tdPFdSTWZYDXV4jVz9 9CmUQdnJe+5f1rreGRfez2oNHedznR5+AR5PRXvyFvapckf+m4s0D/7WgV4oaC67N/Ww UsAQ== X-Gm-Message-State: AOJu0YwLTA5ehICbxHKj89b48ZzD7g8aqYlPff3sw0vzTgfC7iBftK0m fSZ/n/mgRBkasqot3MdBspCnoasD9itT9iFYHRsg2PLAW5IVAXYvPuOYY6y6T+RmgDKAV3tfvNT /PdDaCOa7TCPDiECo0giUTssSirzCpnQSnEzRKryE6+3fAnSeZPtrUeAxyLm1FRfWtgywEwDFIZ w= X-Google-Smtp-Source: AGHT+IFPwX748TpU2Rpu6cal1gywIaZHHP/ikEko66D19KgzmdCoSGw6MAdO5MALjZIG1AvZ65W8mRW8 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:1c0a:b0:40b:39cf:6db3 with SMTP id j10-20020a05600c1c0a00b0040b39cf6db3mr40416wms.2.1700821277946; Fri, 24 Nov 2023 02:21:17 -0800 (PST) Date: Fri, 24 Nov 2023 11:19:08 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1650; i=ardb@kernel.org; h=from:subject; bh=5t7UnqSXZF9he1WJ0ftMHEdvuYDP8mp+eFRvxIU3k90=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhYvmbx73X5hS4WG95wvC24q2935bMpfFhqV825W+WZ NTU2FnQUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACbitYXhN1v/LGs3tiP1i5ha uI/fiTr8/dLBU5N/pFqs3fk08XnW4nqG/76NnZEZaq8j0/aEuMwriDxUNdn+J+tv7XMr1quVuQm 2MwEA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-69-ardb@google.com> Subject: [PATCH v5 28/39] arm64: idreg-override: Create a pseudo feature for rodata=off 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-20231124_022121_517089_B2C1759D X-CRM114-Status: GOOD ( 12.88 ) 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 Add rodata=off to the set of kernel command line options that is parsed early using the CPU feature override detection code, so we can easily refer to it when creating the kernel mapping. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/cpufeature.h | 1 + arch/arm64/kernel/pi/idreg-override.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 77ed3b28cbc6..99c01417e544 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -17,6 +17,7 @@ #define ARM64_SW_FEATURE_OVERRIDE_NOKASLR 0 #define ARM64_SW_FEATURE_OVERRIDE_HVHE 4 +#define ARM64_SW_FEATURE_OVERRIDE_RODATA_OFF 8 #ifndef __ASSEMBLY__ diff --git a/arch/arm64/kernel/pi/idreg-override.c b/arch/arm64/kernel/pi/idreg-override.c index 26961e0f94b7..1aa59c01ab33 100644 --- a/arch/arm64/kernel/pi/idreg-override.c +++ b/arch/arm64/kernel/pi/idreg-override.c @@ -163,6 +163,7 @@ static const struct ftr_set_desc sw_features __prel64_initconst = { .fields = { FIELD("nokaslr", ARM64_SW_FEATURE_OVERRIDE_NOKASLR, NULL), FIELD("hvhe", ARM64_SW_FEATURE_OVERRIDE_HVHE, hvhe_filter), + FIELD("rodataoff", ARM64_SW_FEATURE_OVERRIDE_RODATA_OFF, NULL), {} }, }; @@ -196,6 +197,7 @@ static const struct { { "arm64.nomops", "id_aa64isar2.mops=0" }, { "arm64.nomte", "id_aa64pfr1.mte=0" }, { "nokaslr", "arm64_sw.nokaslr=1" }, + { "rodata=off", "arm64_sw.rodataoff=1" }, }; static int __init parse_hexdigit(const char *p, u64 *v) -- 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