From patchwork Tue Sep 12 14:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381788 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 4BBB3CA0EEC for ; Tue, 12 Sep 2023 14:19:32 +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=drWD3p6gd3obIzDtlAMfGgPmbCz27KxPQfpaWn724/E=; b=Ac6jrl34hh1eg0226BIvAkIyQm df5ignN0HWn2JFWKKNfFq5Wi7kLt/VGr0w+EXLi3L9DjmyJd+xHb6DP1+fPEqzyQESQY47QjYZw49 /ucxhTzCO5BxzCtiSi12aVW4TPdzwk94CwjcdsloevL3c7F/CtMvSqB0M/fwlcv8AiLEaO+bYx9fs H6BMEJAFeyOFZtIeFEY/e+sf1mvQid6WV/19784/RECBEz60PYrK+7AUrWPzJUXTUaIJoOS5mekRt 3U8HU5Mcg3Vtpj2C0EoTTLBEPhb9980sROr5xEb9DftcVdEWy01Aeog+pBnTMTPkNNUAeNyAiGhm5 XSaLG9Lw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4ED-003X43-2O; Tue, 12 Sep 2023 14:18:57 +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 1qg4Dn-003WhY-1Z for linux-arm-kernel@bombadil.infradead.org; Tue, 12 Sep 2023 14:18:31 +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=7FjEszfzmjc49IhSXGtGPOxjDnI19WOUkMh6yagrzHg=; b=GXDunKdjAd67o4+UkTN/U37/HE cilCux6lDF2Ju81dThjzXnIMimqbdvG9YYfvYXgmEJIC5ihqGffIC4R4HvGsqpVlngQyUu6RKpme+ iA+7veqNvDAl0PdrYJxvlt4q4zV0cilP3gx8VF3lQhkLLH1MFSZon5UnmkyvsD+QjR0F3oCruNI+n mx4wl5/by55O/7Xjb2j2/wJx+7MhmEQa4+gd+yVePJITZhMWRQ1sfF0T/9VoLL1Q8foLU54c9SQ57 WWPq0rAzqjBIcs5RlVVsj/nN96CE7ZufU43DwTMf8KLBv5yrWG6uHNiY+pwZDhHizK+ZN518PnncB hwRTjTPw==; Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4De-0069yB-1Z for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:18:29 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-31400956ce8so3739496f8f.3 for ; Tue, 12 Sep 2023 07:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528301; x=1695133101; 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=7FjEszfzmjc49IhSXGtGPOxjDnI19WOUkMh6yagrzHg=; b=qIKXX4dNw3mWO3JG7NqEYotCtR1A1Pxi+QNP4aV/57h8a3q0WWOkzQ5m/C+yDf7lBr JxeX+p2KhOzMxMIWPTomRHbjyyQyrDWhcrlZjKFgvrHwolVQRXA9cRdaVARrFf0s0oZV bIE0vPecdGbk6mqUdWYAyPeGALP51iTMLJHSBaIR6DtGftvk//I7o3p30RVNyJ1jPc+E Vhz7wWELYeOxqxEF7T8zDk4TmkvKkQwdLEp0vbvo7YCUSunssYf0LFnGhXaxFQlznRuW CKxMCQFRwUQSsIDEfXCvu/gi47jOxMr7bAlFQF5q3wEp+CY0lsigCjP5lGZKugi/EDrT 74zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528301; x=1695133101; 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=7FjEszfzmjc49IhSXGtGPOxjDnI19WOUkMh6yagrzHg=; b=f/C7uaKn1a8bJc+o2EXoqweTeiAi46EkSyVwgOr3yjOiE4qrgrqrdwXKGQZkRV0mkf yjNjxGOi7gi6cG4HFlukQeWU1m8oNM61SiDnZlzrj3E/uPbqvxQDVNgbWvRaySfKDrTp TmRZI4YfxGUUIDxMVGL/Xkewc56QJJPo1VaGpJsMgDgpau9GUhcNZykYr7ZD0lJHxM7+ +nx8DZbKj5Gztl/F0waxGYyG/f0nxgJZGzrPkaUOOxQhZx9/94XWRAcdHiPZE8vq1EPi IT1aDJNqzBAeQLmgwo5hdXQl90rcYR6gA0buUgnVLBvlXPEE//nwUQuyHgHvgBXpJyB/ OB3w== X-Gm-Message-State: AOJu0YwcdiY0HV88ngTOYv4HEGkasKq3aSm4d4lD+Ltyh7f+tQLQePkl EAnWnQbXIeVhDeId+2ad2+szQZizS9GObb/5V6fjaTSYBPNLGVFmd860nTAVJggCKlpS2nSO0so JcQNBVICTtYedJ++cinDuNGm2F3Fa9Ru2YouXEuZnDKbsgYPfpiPmFbfnPC6sXeO34QKePmnSzZ 0= X-Google-Smtp-Source: AGHT+IES5PWxRLxFG++NigTsupuiwB7aNqkQlV9xhobHaaVpD4feQ1bs8SqxcCDxDc4okiqzfv/QnGnQ X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5d:4111:0:b0:317:6846:2347 with SMTP id l17-20020a5d4111000000b0031768462347mr145463wrp.7.1694528300805; Tue, 12 Sep 2023 07:18:20 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:17 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1572; i=ardb@kernel.org; h=from:subject; bh=OWBJokslpSrgiYKe3RTxMg3fV08KqjDzi3T5U/y/rqk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaNOZrXIOMvctfh6awSMjrv1S7E7qtnu5c1efWyrUV fHCYe/XjlIWBjEOBlkxRRaB2X/f7Tw9UarWeZYszBxWJpAhDFycAjARpkyG/56v2U79qSyTW3T/ dMvElZOXlKzYGSrxbL0P35xzc5+cOqbNyPArfWWT8KyFQT0XT+6XfvnG4kjT7r+RC0/t1Fi1ewO /rxcLAA== X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-90-ardb@google.com> Subject: [PATCH v4 27/61] 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 , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_151824_177872_3374E6A0 X-CRM114-Status: GOOD ( 13.57 ) 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: , 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/kaslr.c | 7 +++++++ arch/arm64/kernel/pi/idreg-override.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index efbeb8356769..1da3e25f9d9e 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -34,3 +34,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); diff --git a/arch/arm64/kernel/pi/idreg-override.c b/arch/arm64/kernel/pi/idreg-override.c index bcba0ce71af0..26961e0f94b7 100644 --- a/arch/arm64/kernel/pi/idreg-override.c +++ b/arch/arm64/kernel/pi/idreg-override.c @@ -198,13 +198,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