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 2C1A1C10DC1 for ; Wed, 29 Nov 2023 12:31:45 +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=ibWMcTys4QAuWmgJzJKVa4rbXnT981Xz4fsP8QYQ05E=; b=iIHfUX1Q10+2Flbmhe0gy+F91C k+PnNig6ULBPE39mqBzgEGrFRzvVKkxyvLUJazC6lVPfB7X7oiMDBTweKFwHmDA0h/symkx7LcdiM LcIxvOGYjHnLo3MFoBIJQDh9RfP3jMCqcYP3tSE0+JF5wPg30Oa3sQhhBXlEOjz4zjZ28woANxuPB V2SQqOxNjjsGKSwsuSaMU5K5aw+y3dXoNeZTh3ZTd1d6qF6b8V6glv1vKiQ/YwTODlPOkWytRWNex zj0b7cHGHGhfJk3NLy+/2dgNpEgPPRfPxqUQ/uZu+jN84jNVfcrYNQyTfi4oIFMs9MuF81SdtpxgZ zbpnLSRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Jio-008KMA-0r; Wed, 29 Nov 2023 12:31:18 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8Iad-0080DP-2t for linux-arm-kernel@bombadil.infradead.org; Wed, 29 Nov 2023 11:18:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=sF0aoeH2ynlZwR+5IaP8QHbMd5LW3XRNGDhMp1e/C/M=; b=fhIgvyGd11vGYUL1ZfSIM8Te3n ahhT91sZnWYmsXQR8eBhZHwppguB+ya1/BSod6Mdi4/REHGzG9lm69xiL0D2s3uFHJpjzoe//w3qY PjorEYAkvWGzKG50Tjl7nWfyYUH4zW1wdpD5liDweH4x5TI1uaH19qKRRm7AaAKV12rfooWJ6a7JC OttjLvk5K9xpZdy3xIb2+O2mfT6JnPp/QqZ0uasieTmClE9q3yXoswMz3zoHplj13SEiIr/0XnTM6 wYcDS+hQ10EufvhUCxJYEC/SJ2RhTecPbteARZObf2fBtGEQ82MMdqQ4Dgh2p3EL+0FAshZaclzOp h4Bnnk5Q==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IaG-000KCD-2G for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:18:38 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-da307fb7752so8509947276.0 for ; Wed, 29 Nov 2023 03:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256702; x=1701861502; 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=sF0aoeH2ynlZwR+5IaP8QHbMd5LW3XRNGDhMp1e/C/M=; b=XhQx0UpEzR109CoKZOzvUKs47V0OKj9B+pnf3EXKrXjVdRVn25B9VyZ7yipJJ1VPhs FrmyfOZcARu7Q7Pvpj5j9EngPKqre38+BorSygpHzED5Ul7ifA75OLfZX3M2hdIEHy6w rNazligsZQyi8gm8mEp8+88VXeji51JI2gTtYJu0EAfAod9e6zXnzXmavc5YgL9rWMcU yklU3+rA0Zhho+MCR9SMRZ0QgWTGCGUh6hCjbZRwRnhu6PeXmw7m+gzbOarhbuIGFddK aaGrhK8uhc1yzcHWcQA/XzvbU2bLsaDwCRxm+3dsDaMN+OQ2cL2tdpp4Z6WzAtTayJ+V NZHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256702; x=1701861502; 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=sF0aoeH2ynlZwR+5IaP8QHbMd5LW3XRNGDhMp1e/C/M=; b=ndICE69Cgej5Fno62Sq6/P9jVBcaZxJSrv2gWxf58dzwDtkfkEOpSUqP1VZ/Y3n7ur 4aGYJNYn0q1nBc/V9j21XXBkaM2VwZIR7jngqRcfSPaynCAMolgoXZZ6TdrE9T014L0D 4cmpLip4GmyNXm0puYtdvXPTvE+fKEejQL8m5MK40zhCbTxmHepwEs+jDCtJquTUheV8 7thz4QYPenkAvcP0BfxykJaG6rLO0SUxezAT7Zss2O0spf9VR/V24zW9yaquYtsoZlE1 5xah5fs49gD8ImEiPt/EI8YUEpNl78vMOSFMQzkGdQ2E1JnNJBJkTtZYDQtw7kvHJq0J qZUw== X-Gm-Message-State: AOJu0YwwQRn7TEEzq190aP5qBffLCfRwn7PN5m6ZSKOnsdwshrsRRdDg /Z9bN5OqAefemO+0LdwgMx7fBa4kzO+LQ26mT9VSjrF9LbsVBO/8+ox0xS0tcUs94XiEIdVGT+j LdSLb20igahAYPOGuBVCUbC3pd+Wh+GCE6n0TZ4d8YjLIzcU7EWIazzs+qYv94hrJkasuvYLwyp Y= X-Google-Smtp-Source: AGHT+IHuXx3sOMuhMqaSAdTi3KrSl+flhkU5haP7gcJnAO17efhaoXfBVH7CTPBzero4P+ifsDrAdxpE X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:fb01:0:b0:db4:5f32:f0a1 with SMTP id j1-20020a25fb01000000b00db45f32f0a1mr517929ybe.9.1701256702455; Wed, 29 Nov 2023 03:18:22 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:25 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-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=ISmTG7NC9sDCXhO9Fi86yo7S9TBjglPw37NoCvX/6kI=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtufBlJbAHUctVl7J/DpfNUox01jp62q2RdmsghZHb pq+Tv3dUcrCIMbBICumyCIw+++7nacnStU6z5KFmcPKBDKEgYtTACZy8w3D/8CijduKZm/6qOx+ 9NPaad137nQKzV/zb8WWKJ24KP5bu6UYGbbaHCpbVHVa127Z4nlmn4u2WbVwtbtNtQz6seBAaYq TLx8A X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-72-ardb@google.com> Subject: [PATCH v6 29/41] 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-20231129_111824_969904_19C0EC3A X-CRM114-Status: GOOD ( 13.25 ) 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 9e8c3e345951..5e71d5ebe918 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 f9e05c10faab..e4bcabcc6860 100644 --- a/arch/arm64/kernel/pi/idreg-override.c +++ b/arch/arm64/kernel/pi/idreg-override.c @@ -159,6 +159,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), {} }, }; @@ -190,6 +191,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