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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D74EC433E0 for ; Mon, 18 Jan 2021 14:49:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71D1722B40 for ; Mon, 18 Jan 2021 14:49:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405183AbhAROsX (ORCPT ); Mon, 18 Jan 2021 09:48:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405260AbhAROrU (ORCPT ); Mon, 18 Jan 2021 09:47:20 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729C9C061573 for ; Mon, 18 Jan 2021 06:46:40 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id v15so13060865wrx.4 for ; Mon, 18 Jan 2021 06:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=r5Ai3uTZhku8aQJq9tizY3Yw68CMO7+HZYlNZhw8fTCzOvdRkrOudtY5rQmIi7ikxw t/CMV2AQ9R0fhx+/EvVBN/6PDz/r4J2cG9IL2uZpAWBgipgNXe/RSD30BPRfX1cqGdmQ wTPgdP7O+Yvj5qq/deZOtP16MzHNx9iUgC5vqf5VX6yOOMbgkLbGSqrIq8oeMYZcsUqJ sR+Ko4lPjPXDEpm/0EzgFnLOW5wuLfd4s0Jkbgm6/SEK36hxDfgs2q54TNs24GvqNDMA HxuSr9PrZaaDkTrO73wzvKh2WXoyVHOnojEXP/U9RA+lfRA63YwQjmDPV62/ZjAdU9Dn 4MeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=oKnsGSrzQ9o2M4UxGE9J3eZ2xRyq5TKVIcRmFsNqVVPHLyM2tqQLs3I7V26H4kWXPs QFOSgqqR5KMdvgQk+1OHwRKYkpzHB6+IT7abdq3SABRMqEen6xKkEVIrKGadjp0uvlvx oYwfDnfeZ/+rJVBzIDzM/OvZHlwOyt1HmqQZxN1ggc/L5DElyHOCTEjv/tLtKl1a3QuL YFIFraX+eA6GbCi70+/QVaKnaSUvM0qyASWRhoLo6UB1rEm+GMK6hLaSjUD7WrPVf2EY pewiTQcOpJaMKMorv7hYmqgcNQBw910WBYjxoLCmrddKUH2HsBkO2E25M0VpuJUIvl3I 1QPQ== X-Gm-Message-State: AOAM530OZfhMKWdt2MJS4HDFmwxOWxdueA76w17naXqb+gNbSBE4ZHaj Z6Dl1noa09uU7+KS7Rj8bEWOi4JRkmMzfg== X-Google-Smtp-Source: ABdhPJwRGpx3YsnEW08CMr1seaCnvmc8zx+6grzzj7e7TtfTpL/2RgskjlYeoxYD3YtuShG9uGetYA== X-Received: by 2002:adf:e84f:: with SMTP id d15mr26439606wrn.245.1610981199072; Mon, 18 Jan 2021 06:46:39 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:3d4d:985d:87b7:4d55]) by smtp.gmail.com with ESMTPSA id g194sm27599927wme.39.2021.01.18.06.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 06:46:38 -0800 (PST) Date: Mon, 18 Jan 2021 14:46:36 +0000 From: David Brazdil To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Alexandru Elisei , Ard Biesheuvel , Jing Zhang , Ajay Patil , Prasad Sodagudi , Srinivas Ramana , James Morse , Julien Thierry , Suzuki K Poulose , kernel-team@android.com Subject: Re: [PATCH v4 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure Message-ID: <20210118144636.kysdvnmcdm7it5zp@google.com> References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-19-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210118094533.2874082-19-maz@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 18, 2021 at 09:45:30AM +0000, Marc Zyngier wrote: > Given that the early cpufeature infrastructure has borrowed quite > a lot of code from the kaslr implementation, let's reimplement > the matching of the "nokaslr" option with it. > > Signed-off-by: Marc Zyngier Acked-by: David Brazdil > --- > arch/arm64/kernel/idreg-override.c | 17 ++++++++++++++ > arch/arm64/kernel/kaslr.c | 37 +++--------------------------- > 2 files changed, 20 insertions(+), 34 deletions(-) > > diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c > index 1db54878b2c4..143fe7b8e3ce 100644 > --- a/arch/arm64/kernel/idreg-override.c > +++ b/arch/arm64/kernel/idreg-override.c > @@ -33,8 +33,24 @@ static const struct reg_desc mmfr1 __initdata = { > }, > }; > > +extern u64 kaslr_feature_val; > +extern u64 kaslr_feature_mask; > + > +static const struct reg_desc kaslr __initdata = { > + .name = "kaslr", > +#ifdef CONFIG_RANDOMIZE_BASE > + .val = &kaslr_feature_val, > + .mask = &kaslr_feature_mask, > +#endif > + .fields = { > + { "disabled", 0 }, > + {} > + }, > +}; > + > static const struct reg_desc * const regs[] __initdata = { > &mmfr1, > + &kaslr, > }; > > static const struct { > @@ -43,6 +59,7 @@ static const struct { > } aliases[] __initdata = { > { "kvm-arm.mode=nvhe", "id_aa64mmfr1.vh=0" }, > { "kvm-arm.mode=protected", "id_aa64mmfr1.vh=0" }, > + { "nokaslr", "kaslr.disabled=1" }, > }; > > static int __init find_field(const char *cmdline, const struct reg_desc *reg, > diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c > index 5fc86e7d01a1..dcc4a5aadbe2 100644 > --- a/arch/arm64/kernel/kaslr.c > +++ b/arch/arm64/kernel/kaslr.c > @@ -51,39 +51,8 @@ static __init u64 get_kaslr_seed(void *fdt) > return ret; > } > > -static __init bool cmdline_contains_nokaslr(const u8 *cmdline) > -{ > - const u8 *str; > - > - str = strstr(cmdline, "nokaslr"); > - return str == cmdline || (str > cmdline && *(str - 1) == ' '); > -} > - > -static __init bool is_kaslr_disabled_cmdline(void *fdt) > -{ > - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { > - int node; > - const u8 *prop; > - > - node = fdt_path_offset(fdt, "/chosen"); > - if (node < 0) > - goto out; > - > - prop = fdt_getprop(fdt, node, "bootargs", NULL); > - if (!prop) > - goto out; > - > - if (cmdline_contains_nokaslr(prop)) > - return true; > - > - if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) > - goto out; > - > - return false; > - } > -out: > - return cmdline_contains_nokaslr(CONFIG_CMDLINE); > -} > +u64 kaslr_feature_val __initdata; > +u64 kaslr_feature_mask __initdata; > > /* > * This routine will be executed with the kernel mapped at its default virtual > @@ -126,7 +95,7 @@ u64 __init kaslr_early_init(void) > * Check if 'nokaslr' appears on the command line, and > * return 0 if that is the case. > */ > - if (is_kaslr_disabled_cmdline(fdt)) { > + if (kaslr_feature_val & kaslr_feature_mask & 0xf) { nit: Isn't the 0xf redundant here? You don't re-mask for VH either. > kaslr_status = KASLR_DISABLED_CMDLINE; > return 0; > } > -- > 2.29.2 > 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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28EBFC433E6 for ; Mon, 18 Jan 2021 14:46:44 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 9725222BE9 for ; Mon, 18 Jan 2021 14:46:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9725222BE9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E04224B29C; Mon, 18 Jan 2021 09:46:42 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0r0k2uDg-5Nc; Mon, 18 Jan 2021 09:46:41 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CC1B14B2A2; Mon, 18 Jan 2021 09:46:41 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 6A7204B29E for ; Mon, 18 Jan 2021 09:46:41 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mNjPMvaiKIMQ for ; Mon, 18 Jan 2021 09:46:40 -0500 (EST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 345344B294 for ; Mon, 18 Jan 2021 09:46:40 -0500 (EST) Received: by mail-wr1-f49.google.com with SMTP id 7so9470547wrz.0 for ; Mon, 18 Jan 2021 06:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=r5Ai3uTZhku8aQJq9tizY3Yw68CMO7+HZYlNZhw8fTCzOvdRkrOudtY5rQmIi7ikxw t/CMV2AQ9R0fhx+/EvVBN/6PDz/r4J2cG9IL2uZpAWBgipgNXe/RSD30BPRfX1cqGdmQ wTPgdP7O+Yvj5qq/deZOtP16MzHNx9iUgC5vqf5VX6yOOMbgkLbGSqrIq8oeMYZcsUqJ sR+Ko4lPjPXDEpm/0EzgFnLOW5wuLfd4s0Jkbgm6/SEK36hxDfgs2q54TNs24GvqNDMA HxuSr9PrZaaDkTrO73wzvKh2WXoyVHOnojEXP/U9RA+lfRA63YwQjmDPV62/ZjAdU9Dn 4MeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=iZW6K+n+jc4exdA7ZYDl87OZ+3q7N8RW3cQnTHycMoK9o0O13+WI0IB4DAZPwMrbnp ewBbmUcItFfGX/S0HNNeAuQICFL8RiG8oinpQPMRJy/uEfohPg/zlZ+P7CcgkEOQPZRG cz8IEknUHPAMdPr5na9ear0YkkPJxGtov/bqFXVrGNx1Z9ryrRhohORUvtlb3Yc0fCJF jMKThdXKqmR8WX2GdM4PRLmfnaaNjp8qfgctXMJT672JEC62yw2eOz/pcI4mmgDG0sBn spGMYOVARE+JqZkt5VjHFC7eSyGk0H3/NQthqaiP0iphywtbBiVuhkHc3H6O82/TXpnk QbTg== X-Gm-Message-State: AOAM530vzy9SgLzeDTcNW7k22q44wBjTG7c+y3ucNsYrVfSX3elDg/wh AOz+qpvdS+NCk6fpKa+rxvnilw== X-Google-Smtp-Source: ABdhPJwRGpx3YsnEW08CMr1seaCnvmc8zx+6grzzj7e7TtfTpL/2RgskjlYeoxYD3YtuShG9uGetYA== X-Received: by 2002:adf:e84f:: with SMTP id d15mr26439606wrn.245.1610981199072; Mon, 18 Jan 2021 06:46:39 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:3d4d:985d:87b7:4d55]) by smtp.gmail.com with ESMTPSA id g194sm27599927wme.39.2021.01.18.06.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 06:46:38 -0800 (PST) Date: Mon, 18 Jan 2021 14:46:36 +0000 From: David Brazdil To: Marc Zyngier Subject: Re: [PATCH v4 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure Message-ID: <20210118144636.kysdvnmcdm7it5zp@google.com> References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-19-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210118094533.2874082-19-maz@kernel.org> Cc: kernel-team@android.com, Srinivas Ramana , Catalin Marinas , linux-kernel@vger.kernel.org, Ard Biesheuvel , Ajay Patil , Prasad Sodagudi , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Mon, Jan 18, 2021 at 09:45:30AM +0000, Marc Zyngier wrote: > Given that the early cpufeature infrastructure has borrowed quite > a lot of code from the kaslr implementation, let's reimplement > the matching of the "nokaslr" option with it. > > Signed-off-by: Marc Zyngier Acked-by: David Brazdil > --- > arch/arm64/kernel/idreg-override.c | 17 ++++++++++++++ > arch/arm64/kernel/kaslr.c | 37 +++--------------------------- > 2 files changed, 20 insertions(+), 34 deletions(-) > > diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c > index 1db54878b2c4..143fe7b8e3ce 100644 > --- a/arch/arm64/kernel/idreg-override.c > +++ b/arch/arm64/kernel/idreg-override.c > @@ -33,8 +33,24 @@ static const struct reg_desc mmfr1 __initdata = { > }, > }; > > +extern u64 kaslr_feature_val; > +extern u64 kaslr_feature_mask; > + > +static const struct reg_desc kaslr __initdata = { > + .name = "kaslr", > +#ifdef CONFIG_RANDOMIZE_BASE > + .val = &kaslr_feature_val, > + .mask = &kaslr_feature_mask, > +#endif > + .fields = { > + { "disabled", 0 }, > + {} > + }, > +}; > + > static const struct reg_desc * const regs[] __initdata = { > &mmfr1, > + &kaslr, > }; > > static const struct { > @@ -43,6 +59,7 @@ static const struct { > } aliases[] __initdata = { > { "kvm-arm.mode=nvhe", "id_aa64mmfr1.vh=0" }, > { "kvm-arm.mode=protected", "id_aa64mmfr1.vh=0" }, > + { "nokaslr", "kaslr.disabled=1" }, > }; > > static int __init find_field(const char *cmdline, const struct reg_desc *reg, > diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c > index 5fc86e7d01a1..dcc4a5aadbe2 100644 > --- a/arch/arm64/kernel/kaslr.c > +++ b/arch/arm64/kernel/kaslr.c > @@ -51,39 +51,8 @@ static __init u64 get_kaslr_seed(void *fdt) > return ret; > } > > -static __init bool cmdline_contains_nokaslr(const u8 *cmdline) > -{ > - const u8 *str; > - > - str = strstr(cmdline, "nokaslr"); > - return str == cmdline || (str > cmdline && *(str - 1) == ' '); > -} > - > -static __init bool is_kaslr_disabled_cmdline(void *fdt) > -{ > - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { > - int node; > - const u8 *prop; > - > - node = fdt_path_offset(fdt, "/chosen"); > - if (node < 0) > - goto out; > - > - prop = fdt_getprop(fdt, node, "bootargs", NULL); > - if (!prop) > - goto out; > - > - if (cmdline_contains_nokaslr(prop)) > - return true; > - > - if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) > - goto out; > - > - return false; > - } > -out: > - return cmdline_contains_nokaslr(CONFIG_CMDLINE); > -} > +u64 kaslr_feature_val __initdata; > +u64 kaslr_feature_mask __initdata; > > /* > * This routine will be executed with the kernel mapped at its default virtual > @@ -126,7 +95,7 @@ u64 __init kaslr_early_init(void) > * Check if 'nokaslr' appears on the command line, and > * return 0 if that is the case. > */ > - if (is_kaslr_disabled_cmdline(fdt)) { > + if (kaslr_feature_val & kaslr_feature_mask & 0xf) { nit: Isn't the 0xf redundant here? You don't re-mask for VH either. > kaslr_status = KASLR_DISABLED_CMDLINE; > return 0; > } > -- > 2.29.2 > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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 X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C100DC433E0 for ; Mon, 18 Jan 2021 14:48:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AB9722B40 for ; Mon, 18 Jan 2021 14:48:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AB9722B40 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject: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=W0k+wymOvcEtPPBCRwgcps4LM7AUPfQB0Lz7YubI4aY=; b=whjea30F4OYeltuWnf5a8nQs9 OlTISlcudJ9UCWMlbdwbj7WeS7FULXJrAUvy5FtIx8qlDcbKGBvGchNBHwFn/VbRI2EVHw9ycZ/OP pixNOSePtw1DsndGhAqH9S8FAFtukOaAYsbEoZnrDDXbV4Ueb3t+x8MDwevUM4br3wogc34dFCeZR bGU4AKk4LLgj3IT07TywY5kKe0ARNvwpMdfAZfKhWeta3j7Or5AaNWIJftbh7L24esWEC7D6q2eao G5pGUjtgsrJ2x1IcG29AP5Xc9P2BR5RNT7I9MPDgiKVHc3rs3yzpU4maGkRxQ3CbVQqB2fuayFTMy tPEZuGyTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Vnn-0008NU-8t; Mon, 18 Jan 2021 14:46:43 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Vnk-0008Mr-Fm for linux-arm-kernel@lists.infradead.org; Mon, 18 Jan 2021 14:46:41 +0000 Received: by mail-wr1-x42f.google.com with SMTP id a9so13257696wrt.5 for ; Mon, 18 Jan 2021 06:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=r5Ai3uTZhku8aQJq9tizY3Yw68CMO7+HZYlNZhw8fTCzOvdRkrOudtY5rQmIi7ikxw t/CMV2AQ9R0fhx+/EvVBN/6PDz/r4J2cG9IL2uZpAWBgipgNXe/RSD30BPRfX1cqGdmQ wTPgdP7O+Yvj5qq/deZOtP16MzHNx9iUgC5vqf5VX6yOOMbgkLbGSqrIq8oeMYZcsUqJ sR+Ko4lPjPXDEpm/0EzgFnLOW5wuLfd4s0Jkbgm6/SEK36hxDfgs2q54TNs24GvqNDMA HxuSr9PrZaaDkTrO73wzvKh2WXoyVHOnojEXP/U9RA+lfRA63YwQjmDPV62/ZjAdU9Dn 4MeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XW5nfZgpoFkc4MpoG+G2l89kBAOPYjtlcQxlsdxxH1M=; b=PJHX6Q3L19kbSOvLD3RVQQL9fXl3gYesoaXkT1OtR16LD6zedlsWO9HnCibz6bA/fn ZAioFqaKHWVIF0okRfRxNUIUo4Xzzj7oHp+bMUOA1CwTteQrOz4xPVDOzsgWmGD/YnSE Rjyt5GgQw5yZx7TgOi9th8z8uOB4ueU5nE71Wsbf6XSsmRA3h7O2LevBhBCAKIm7Uxtw oOz3L24fPS84HLeLXEnSHMDbYTJ50xsrOI4UZ8FAdyXXNFcrfgLgLQpTHNqoHE7eXlrh jaUWWNdBwh+5Dx4mA9cIPCgRTQsgaAD/CvdWHxGPN40Qun8idw2JuFfurpxkN03ODCzN tMUA== X-Gm-Message-State: AOAM532wN6ntjx/bQJ2k7U8WpdfK/n0nBNiGVXzVDkM4zcQcj5WLtiaE tV0NbEcn+TP4nzq36Ujj44y5Tw== X-Google-Smtp-Source: ABdhPJwRGpx3YsnEW08CMr1seaCnvmc8zx+6grzzj7e7TtfTpL/2RgskjlYeoxYD3YtuShG9uGetYA== X-Received: by 2002:adf:e84f:: with SMTP id d15mr26439606wrn.245.1610981199072; Mon, 18 Jan 2021 06:46:39 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:3d4d:985d:87b7:4d55]) by smtp.gmail.com with ESMTPSA id g194sm27599927wme.39.2021.01.18.06.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 06:46:38 -0800 (PST) Date: Mon, 18 Jan 2021 14:46:36 +0000 From: David Brazdil To: Marc Zyngier Subject: Re: [PATCH v4 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure Message-ID: <20210118144636.kysdvnmcdm7it5zp@google.com> References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-19-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210118094533.2874082-19-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210118_094640_581698_E2455097 X-CRM114-Status: GOOD ( 24.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Jing Zhang , kernel-team@android.com, Srinivas Ramana , Suzuki K Poulose , Catalin Marinas , Alexandru Elisei , linux-kernel@vger.kernel.org, Ard Biesheuvel , James Morse , Julien Thierry , Ajay Patil , Prasad Sodagudi , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org 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 Mon, Jan 18, 2021 at 09:45:30AM +0000, Marc Zyngier wrote: > Given that the early cpufeature infrastructure has borrowed quite > a lot of code from the kaslr implementation, let's reimplement > the matching of the "nokaslr" option with it. > > Signed-off-by: Marc Zyngier Acked-by: David Brazdil > --- > arch/arm64/kernel/idreg-override.c | 17 ++++++++++++++ > arch/arm64/kernel/kaslr.c | 37 +++--------------------------- > 2 files changed, 20 insertions(+), 34 deletions(-) > > diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c > index 1db54878b2c4..143fe7b8e3ce 100644 > --- a/arch/arm64/kernel/idreg-override.c > +++ b/arch/arm64/kernel/idreg-override.c > @@ -33,8 +33,24 @@ static const struct reg_desc mmfr1 __initdata = { > }, > }; > > +extern u64 kaslr_feature_val; > +extern u64 kaslr_feature_mask; > + > +static const struct reg_desc kaslr __initdata = { > + .name = "kaslr", > +#ifdef CONFIG_RANDOMIZE_BASE > + .val = &kaslr_feature_val, > + .mask = &kaslr_feature_mask, > +#endif > + .fields = { > + { "disabled", 0 }, > + {} > + }, > +}; > + > static const struct reg_desc * const regs[] __initdata = { > &mmfr1, > + &kaslr, > }; > > static const struct { > @@ -43,6 +59,7 @@ static const struct { > } aliases[] __initdata = { > { "kvm-arm.mode=nvhe", "id_aa64mmfr1.vh=0" }, > { "kvm-arm.mode=protected", "id_aa64mmfr1.vh=0" }, > + { "nokaslr", "kaslr.disabled=1" }, > }; > > static int __init find_field(const char *cmdline, const struct reg_desc *reg, > diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c > index 5fc86e7d01a1..dcc4a5aadbe2 100644 > --- a/arch/arm64/kernel/kaslr.c > +++ b/arch/arm64/kernel/kaslr.c > @@ -51,39 +51,8 @@ static __init u64 get_kaslr_seed(void *fdt) > return ret; > } > > -static __init bool cmdline_contains_nokaslr(const u8 *cmdline) > -{ > - const u8 *str; > - > - str = strstr(cmdline, "nokaslr"); > - return str == cmdline || (str > cmdline && *(str - 1) == ' '); > -} > - > -static __init bool is_kaslr_disabled_cmdline(void *fdt) > -{ > - if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { > - int node; > - const u8 *prop; > - > - node = fdt_path_offset(fdt, "/chosen"); > - if (node < 0) > - goto out; > - > - prop = fdt_getprop(fdt, node, "bootargs", NULL); > - if (!prop) > - goto out; > - > - if (cmdline_contains_nokaslr(prop)) > - return true; > - > - if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) > - goto out; > - > - return false; > - } > -out: > - return cmdline_contains_nokaslr(CONFIG_CMDLINE); > -} > +u64 kaslr_feature_val __initdata; > +u64 kaslr_feature_mask __initdata; > > /* > * This routine will be executed with the kernel mapped at its default virtual > @@ -126,7 +95,7 @@ u64 __init kaslr_early_init(void) > * Check if 'nokaslr' appears on the command line, and > * return 0 if that is the case. > */ > - if (is_kaslr_disabled_cmdline(fdt)) { > + if (kaslr_feature_val & kaslr_feature_mask & 0xf) { nit: Isn't the 0xf redundant here? You don't re-mask for VH either. > kaslr_status = KASLR_DISABLED_CMDLINE; > return 0; > } > -- > 2.29.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel