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 53C20C88CB2 for ; Mon, 12 Jun 2023 17:16:53 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lFQNKBBTXNwRliGM8zS+UaTgPBdHwN6BhNSWJojh/BQ=; b=2rZ3sXnoerWByR 3N2+4XbZ6EDbge6AzZgmMoF6bstl5xyiOZnw1qv9cy31NpmSWkEn2pIG8HAwLCsuqzeQ2R7nlKW75 pEhEDiJx1mQLMHi8td/uM9TXuW1AAk7h3J9N/yQmg+REuKwfS9wY1in95pvDUVWz9A11MbQQ1XKxz 638wQ40/N3/ezfW+Xp7QSShCPhHWIdQrAj9sGe6IRy05Ujxuft7JmT5eGHAtxNMsB4A8Q+AY0TyuB oZz2omdTQmXTz4prlsG8DbGDH5OQYb2u3CmnhUw33KnPcebtG9GOF9mIt2NrlvnDsdTDN/uqfSQle 3UA7lqAX9bjw965SEpTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8l9W-004j4d-1m; Mon, 12 Jun 2023 17:16:26 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8l9T-004j4E-23 for linux-arm-kernel@lists.infradead.org; Mon, 12 Jun 2023 17:16:25 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2F94B620E0; Mon, 12 Jun 2023 17:16:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6DA5C433D2; Mon, 12 Jun 2023 17:16:20 +0000 (UTC) Date: Mon, 12 Jun 2023 18:16:18 +0100 From: Catalin Marinas To: Marc Zyngier Cc: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Quentin Perret , Will Deacon , Fuad Tabba Subject: Re: [PATCH v3 03/17] arm64: Turn kaslr_feature_override into a generic SW feature override Message-ID: References: <20230609162200.2024064-1-maz@kernel.org> <20230609162200.2024064-4-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230609162200.2024064-4-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230612_101623_769132_4C79CA81 X-CRM114-Status: GOOD ( 17.07 ) 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 On Fri, Jun 09, 2023 at 05:21:46PM +0100, Marc Zyngier wrote: > diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c > index 370ab84fd06e..8c93b6198bf5 100644 > --- a/arch/arm64/kernel/idreg-override.c > +++ b/arch/arm64/kernel/idreg-override.c > @@ -138,15 +138,11 @@ static const struct ftr_set_desc smfr0 __initconst = { > }, > }; > > -extern struct arm64_ftr_override kaslr_feature_override; > - > -static const struct ftr_set_desc kaslr __initconst = { > - .name = "kaslr", > -#ifdef CONFIG_RANDOMIZE_BASE > - .override = &kaslr_feature_override, > -#endif > +static const struct ftr_set_desc sw_features __initconst = { > + .name = "arm64_sw", > + .override = &arm64_sw_feature_override, > .fields = { > - FIELD("disabled", 0, NULL), > + FIELD("nokaslr", ARM64_SW_FEATURE_OVERRIDE_NOKASLR, NULL), > {} > }, > }; > @@ -158,7 +154,7 @@ static const struct ftr_set_desc * const regs[] __initconst = { > &isar1, > &isar2, > &smfr0, > - &kaslr, > + &sw_features, > }; > > static const struct { > @@ -175,7 +171,7 @@ static const struct { > "id_aa64isar1.api=0 id_aa64isar1.apa=0 " > "id_aa64isar2.gpa3=0 id_aa64isar2.apa3=0" }, > { "arm64.nomte", "id_aa64pfr1.mte=0" }, > - { "nokaslr", "kaslr.disabled=1" }, > + { "nokaslr", "arm64_sw.nokaslr=1" }, > }; I think structuring it as a sw feature makes more sense and I don't think it breaks anything (as long as people only used "nokaslr"). Reviewed-by: Catalin Marinas As a side note, I was wondering if we should add a SW_FIELD macro to define width of 1 for such fields (and probably the field extraction functions need some tweaking) so that we define ARM64_SW_FEATURE_OVERRIDE_* in increments of 1 rather than 4. Anyway, that's something to worry if we get too many such software features. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel