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 0CBCEC4167B for ; Wed, 29 Nov 2023 11:19:31 +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=dAqTVs6qkpbybXo+jzUPY/ia4nEWn8bhY5yulGqU1WY=; b=NGW+lKkzLM2ru7I3z6+9MF+Ht8 KP5390Tud2IGA0iDOeVrBx3e/imyJwEdlQvgUy0aq4vIN8T6y4LWaqgTo/W8+oEMleBQ+EzO2D3+m NkWwKVkZkCdSp0BFCf00sQXTCW4q7ldRjsgfeRUJduxnQ6w/j1U+OI7WkHKtmYXTf+/emW4zoq+m3 5kH4nwTwRf29Ww7F4z73pQLWVc/j7Yro1bo0rKb6oRfjLXcPlA4gaNkcUqqXms/t/JV104o6erpmM e1w6VypBlujnBm0twlLloOHuqERXUfTUZZO+433PVmCeE5BACn2i/bPFli+PkVGNCGoenQi/J5BWN 8VbuVQCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Iat-0080QP-15; Wed, 29 Nov 2023 11:19:03 +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 1r8IaH-007zrx-2e for linux-arm-kernel@bombadil.infradead.org; Wed, 29 Nov 2023 11:18:25 +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=QAitDWvsO4x4NNf/wlVcnNC1eSSmxTwrqQ+KT+7V4Z0=; b=CviOBrZSIQtNpQs6FscH4fZCmY IDuFQXDg0McnhH1JCyBiT+cZk59Ep3oteq/mT7GN9l1OLQiuOGhu/rN5rOi5MLuP6Dbwa37xQW8tI yQOQecfzp46bWXd2A1HS/hR/e85or6pNH3TDA7DQ5sJZlAVsOYN2oMJEkSfd7g+hUpOz52hXxQkum 5oNcw9M9h5btYl3x0GJsqxbGj94yBdLGrp82lTlCMpD1fvpR15T0RAVJUcLFos2xMqZfXMaBQw3y+ OrkNmq1R/mzRNxqAREbt6WNBack45ExWdrGLEeiMdzT/SAaz6isYT9TvPGVM/MtINqoxznJbdz6LI IzU/q1dQ==; 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 1r8Ia3-000KAW-1i for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:18:21 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-da31ec03186so664097276.1 for ; Wed, 29 Nov 2023 03:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256681; x=1701861481; 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=QAitDWvsO4x4NNf/wlVcnNC1eSSmxTwrqQ+KT+7V4Z0=; b=dFw9eF1umEaTy/BTNIOiVa38UHeyf7jgaJCtedBEB+TVguP1CeElrC8owh01BVrcXR gUl+NsWFe5EEZl+o2xfkeD8S1vo1GRciPojzLJde1ug2ypB6LlZwPENE9GtNhDOxMva1 cYgcv4TVCQL+Fg2UWft/Yy/e5/2tUmEpqQN1oT9zxwTc2Ay+45SF7fYMS3syjEfyVaod ZuwIOCghuqqhElSjo0kG89rVphje91ytMe4TTur428ZzJPaMN7Kx1aZIkbRU1MKqwtni eZu9r0AcKdS1Sa3+tQGMb6WUXyfbki1Ijb2SQmPKQjNh/VydbW74qhV5UlwUhITu3q// FgwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256681; x=1701861481; 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=QAitDWvsO4x4NNf/wlVcnNC1eSSmxTwrqQ+KT+7V4Z0=; b=oekKwk6et1r5ltveEqZ/1YCGnxdFdTZAxOYtlXr/HLum2gRq2cNoLcJjoQqjs81kax 33DNZOfmcuqBSrEeCL9fJ+pu0XaJn5Uo0/DejxKVaQI49tOZ8kX8ssM4fdBT2ENFq5kJ wCcSomBIjwwpnap3CcMO3YKjd4SpxSOkgfO1cl47coFHfYV3/ir7/Sprm9D5BaY10Own oOoDbvfCdjsXdk3IoOehlCPvplY0CdehD1yFqho88byXFWOfVn+XJHX8pNVajThNR5Jo Nm6jxWH2O4z1bupUnJFelvvvj0SyVWWzj4NIfw0cVRmyiGx56en0R2FQ8ch7ai/QMVgM RxzA== X-Gm-Message-State: AOJu0Yw1THOJ0vJFIZLMmfo/ojeJOPDgNwjqeEvXPj45re04frVdp2wb uCGnt3ovV9ccV0zw9C0mhJHZrjIxPutcDcRIpig4RNXyeL+xNO2G88/B1VZMJrNk/tYN6yLhxDX pVTqJjd/iOoLVnMTrARDB49l3dDnOWKaUNX64+Fe5+BgMLkul/buuyojes7rW+RelTRoidvxBWi 0= X-Google-Smtp-Source: AGHT+IEtjQLZMLtgiSUhoW0ZCmpQAVHp6lG973HXeZXqPVicE/0IKxI+41IdvqK3xjICrfmbCrPUk7gd X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:d141:0:b0:d9b:59c3:6eef with SMTP id i62-20020a25d141000000b00d9b59c36eefmr748781ybg.0.1701256681256; Wed, 29 Nov 2023 03:18:01 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:16 +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=1558; i=ardb@kernel.org; h=from:subject; bh=p8ZNT2yjkuI/hWS+08OYTYNmn52U17QjSWS15PYDAhk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtingzV+9MtsfAmesTd81Xziu6WDO1npr+cPOfZ7it spxvjUdpSwMYhwMsmKKLAKz/77beXqiVK3zLFmYOaxMIEMYuDgFYCJ8vYwM344sEk9/P9+lLTTP 69ELu1233msXS1rsmd6vunxnPs/rNwz/XQWWxs1J3KH/7YRJ0oe93doKKs0qU7q3XI6vuGDmcNq KGwA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-63-ardb@google.com> Subject: [PATCH v6 20/41] arm64/kernel: Move 'nokaslr' parsing out of early idreg code 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_111819_065581_E415C11F X-CRM114-Status: GOOD ( 12.78 ) 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 Parsing and ignoring 'nokaslr' can be done from anywhere, except from the code that runs very early and is therefore built with limitations on the kind of relocations it is permitted to use. So move it to a source file that is part of the ordinary kernel build. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/idreg-override.c | 7 ------- arch/arm64/kernel/kaslr.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 9646f94094ed..e30fd9e32ef3 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -199,13 +199,6 @@ static const struct { { "nokaslr", "arm64_sw.nokaslr=1" }, }; -static int __init parse_nokaslr(char *unused) -{ - /* nokaslr param handling is done by early cpufeature code */ - return 0; -} -early_param("nokaslr", parse_nokaslr); - static int __init parse_hexdigit(const char *p, u64 *v) { // skip "0x" if it comes next diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index 94a269cd1f07..12c7f3c8ba76 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -36,3 +36,10 @@ void __init kaslr_init(void) pr_info("KASLR enabled\n"); __kaslr_is_enabled = true; } + +static int __init parse_nokaslr(char *unused) +{ + /* nokaslr param handling is done by early cpufeature code */ + return 0; +} +early_param("nokaslr", parse_nokaslr); -- 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