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 9B363C61DF4 for ; Fri, 24 Nov 2023 11:31:52 +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=TgQX1g53M4tLZd8X7EtiH8g/GHkop4FNSdTN5XfOnP8=; b=OG5aCqJb2LeUkMTStmRlwrcQPX 7H/4XbZ6pL1k++7tXEj+Kf3SzhrQjklnNaOFGCwSSDVG2Df2BMTU5EyXSBmM5knnm9xJFHwayBVEy RUd/p7OuaywY2yvjAaV3Cbh16vBLEZRCD7kn8UgR3b82iJT4W0AaQZTvOhnkIXe/2uhxx1mIjmHal 16CDuLDe0SpTbuaNwci2KXc5AZODgZdNoz3kavM6jgQSGG3TEb7vSGf2YS1zGPFrW/b8KigrFVFWT K2minoz+aeci/ZburZl+MNbgb5txcOurFJhYeGJegluKEz3MjEPSJOIEvHmAc/SjRe1DFz4swt5Wl jA2LdOtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6UPT-006ySB-2S; Fri, 24 Nov 2023 11:31:47 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIg-006od2-2P for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:20:44 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-db3ef4c7094so1902474276.1 for ; Fri, 24 Nov 2023 02:20:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821241; x=1701426041; 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=4Z62d9o+cY1n/Rvw0hfzV44XBFWrFN972rVNZfEcjMs=; b=eizRHP+8J10+9LhvB+++kLp7mD5PYE62xlVDWX4IPKBJtfCakq1o8Tg/Rwwre58ZCH X1HGj4vImoq/hX+LxPYKl+lc2SEno0GEajkwKOJZxjV6ZFoHrjEL0rZmb10019rhGf1s +Uj/XUfxVPu40PPD5apJGVVfiGgSw/n4j52zaMVYrr2sl35090PlRLE2sKiFkXeaRCAA xRZJVSCdZRQ+CnzNQn/Otua8h+jEc+kdSGdLDHQrMOJs24tqkfvXz+w6EWShsmGqV+b/ RBBCe0TAPdWgG7aHzp0dK1Sp1zDzXb3sgVT/oa4tVA0FVaQZ0VlcUpG9dLv9JAOeIYNC uUyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821241; x=1701426041; 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=4Z62d9o+cY1n/Rvw0hfzV44XBFWrFN972rVNZfEcjMs=; b=PGABOcxzSL+rGXkJO6n6GpvT/lI9IJOcPlyRel95u1hVdTZ8eVHkIMqiaeNyMLUIPb llZ+/YXGzlIjrctqY95H45aRJ442qlkarYbvMtT3V7xYWi1KiJ3acp4s/k/aNGxPJDHX jZ2bJVg/wJUk9DFHsrcRJEOyjuL7G6i5BL9WEbDIcD3+u9mv+s89BB8pytPSnfUUX9sm QQAxFRsdENAkfjxmTaNyZ7Aivjd7EiEkP7mTIytpxcJUF4NYEp75lEDXkSr99Smt9NQg Jphb3+H2Ek9xa11D1sltupTJgMiLqnSVsS3vnRh9lauwmpOyMcyFySGyQUCnE7ZylgZF 9BKQ== X-Gm-Message-State: AOJu0YwMRDfsccO3mb21Zo6Kbc8UFvs5cZAoOO6YBGfLvbf11mWdZHtg bHBGQsRK7mHUyVBPJU7wqRrdPtx6u6c/sMM4tuRdsPHzSj6/9ApzmzpBvzTvpNQWMVIcjrGJuH5 shgd9ElSmViq56nZ2gtSVd1sePd18AByir9VUyb0ijT1GSP3IjLZBXaDca7QYSFEDv0J0fPuE2r 0= X-Google-Smtp-Source: AGHT+IGJUGb0nqwq2a63gUogmCplOh6FPttRC5y6N+Q8Qjch2JHlRrMYOfM97ERQhEozqxkC4MFiJ2g4 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:ab8b:0:b0:db4:5dc7:1aea with SMTP id v11-20020a25ab8b000000b00db45dc71aeamr55028ybi.6.1700821241123; Fri, 24 Nov 2023 02:20:41 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:52 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3215; i=ardb@kernel.org; h=from:subject; bh=fPQie6cXvO/xVNq+vsDwiE5UF5vcdZhEaJpXnkvDOvk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhou/Rju3/PMvtpr2fz+11eWnrzRNl396XxJ/l9Vbfs Z43YWVyRykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZhI3kdGhh2TP5b++DP9fl2O vdWxD7X+G489/rXnWEh8Q5HykhM1O2UYGT7sYl9vHHbm5sf+by1RbE/y3gUuM162dNalU3+Pxl5 atosFAA== X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-53-ardb@google.com> Subject: [PATCH v5 12/39] arm64: kernel: Don't rely on objcopy to make code under pi/ __init 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-20231124_022042_789590_6CDBC919 X-CRM114-Status: GOOD ( 12.40 ) 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 We will add some code under pi/ that contains global variables that should not end up in __initdata, as they will not be writable via the initial ID map. So only rely on objcopy for making the libfdt code __init, and use explicit annotations for the rest. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/pi/Makefile | 6 ++++-- arch/arm64/kernel/pi/kaslr_early.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/pi/Makefile b/arch/arm64/kernel/pi/Makefile index bc32a431fe35..2bbe866417d4 100644 --- a/arch/arm64/kernel/pi/Makefile +++ b/arch/arm64/kernel/pi/Makefile @@ -28,11 +28,13 @@ quiet_cmd_piobjcopy = $(quiet_cmd_objcopy) cmd_piobjcopy = $(cmd_objcopy) && $(obj)/relacheck $(@) $(<) $(obj)/%.pi.o: OBJCOPYFLAGS := --prefix-symbols=__pi_ \ - --remove-section=.note.gnu.property \ - --prefix-alloc-sections=.init + --remove-section=.note.gnu.property $(obj)/%.pi.o: $(obj)/%.o $(obj)/relacheck FORCE $(call if_changed,piobjcopy) +# ensure that all the lib- code ends up as __init code and data +$(obj)/lib-%.pi.o: OBJCOPYFLAGS += --prefix-alloc-sections=.init + $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE $(call if_changed_rule,cc_o_c) diff --git a/arch/arm64/kernel/pi/kaslr_early.c b/arch/arm64/kernel/pi/kaslr_early.c index b9e0bb4bc6a9..167081b30a15 100644 --- a/arch/arm64/kernel/pi/kaslr_early.c +++ b/arch/arm64/kernel/pi/kaslr_early.c @@ -17,7 +17,7 @@ #include /* taken from lib/string.c */ -static char *__strstr(const char *s1, const char *s2) +static char *__init __strstr(const char *s1, const char *s2) { size_t l1, l2; @@ -33,7 +33,7 @@ static char *__strstr(const char *s1, const char *s2) } return NULL; } -static bool cmdline_contains_nokaslr(const u8 *cmdline) +static bool __init cmdline_contains_nokaslr(const u8 *cmdline) { const u8 *str; @@ -41,7 +41,7 @@ static bool cmdline_contains_nokaslr(const u8 *cmdline) return str == cmdline || (str > cmdline && *(str - 1) == ' '); } -static bool is_kaslr_disabled_cmdline(void *fdt) +static bool __init is_kaslr_disabled_cmdline(void *fdt) { if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) { int node; @@ -67,17 +67,19 @@ static bool is_kaslr_disabled_cmdline(void *fdt) return cmdline_contains_nokaslr(CONFIG_CMDLINE); } -static u64 get_kaslr_seed(void *fdt) +static u64 __init get_kaslr_seed(void *fdt) { + static char const chosen_str[] __initconst = "chosen"; + static char const seed_str[] __initconst = "kaslr-seed"; int node, len; fdt64_t *prop; u64 ret; - node = fdt_path_offset(fdt, "/chosen"); + node = fdt_path_offset(fdt, chosen_str); if (node < 0) return 0; - prop = fdt_getprop_w(fdt, node, "kaslr-seed", &len); + prop = fdt_getprop_w(fdt, node, seed_str, &len); if (!prop || len != sizeof(u64)) return 0; @@ -86,7 +88,7 @@ static u64 get_kaslr_seed(void *fdt) return ret; } -asmlinkage u64 kaslr_early_init(void *fdt) +asmlinkage u64 __init kaslr_early_init(void *fdt) { u64 seed, range; -- 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