From patchwork Fri Apr 28 18:28:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 13226672 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 848DDC77B61 for ; Fri, 28 Apr 2023 18:29:40 +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: Mime-Version:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=eae96xCvVuETcUpFzu9nc+fDmhgoaN20LuYkZML0bJk=; b=M+o zQwbUhxm1nAji/okpHGUW/Gxk6XfJwqCUYLsogndNx9EAkMeOYpbFxlxVl3+5OYvc45qj7DcONll+ nFj/IenMVhqOeAWYAr2g9a25JCy6n8mHwCTnvP6HXwTA0zLCt41NQRzeBGNplCtjJ9o16PXmsuljd 9IB+sN7L9uBy+4bknaP0PY99ewzPp3a+jP5CA80H/gGHUxNAVs4HIUoXZQyLAFMHQ2CjI4SQr249u cuZ32FoUBb1kl5u3cwomntYje57CxHtFBIIswIBODXxpSqC6ROjECt2j5Gy84jxkNDTGi7TMiqFe6 Mmr98LvBvj1zZS6b1oJFOJJ7fbMyeow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1psSpr-00BVCy-1s; Fri, 28 Apr 2023 18:28:47 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1psSpo-00BVCF-2T for linux-arm-kernel@lists.infradead.org; Fri, 28 Apr 2023 18:28:46 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a75194eebso38787276.1 for ; Fri, 28 Apr 2023 11:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682706522; x=1685298522; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=6QMZhDexxfLA2RQm0j2+ddKdXUKAWu/zoiDOxn4nNp0=; b=eGuGclpc9YdkQ55iylhcpFpKDIDB1qtK+qNyaGX+Zrug29FfoCVq1V4jOJjTnEFQvC YYmyGGwqYf/O/NMyOjjDNnMSa32sEzYlpgPM16T9wInkHaSj42BRPPDeaUXuYkRyLT5f rFGnGA77a2skM9iKQPI4F0+0ZVnGdY2/oJMD7HBscHhC/XzNOERZ9WIWIiuBlu7NNV3L i8KDtNOzE/V2ddHpOC5BSL4qvkxMDF+P/Oea+7d4d+iX9nLr8TsjMU08fTVRPaxnnHQg Hs4hEx4TVEnJmvPHVn7uSXXsScegWDkY7Gpx1iHfRKbDuKVOSMecmZTlJtUUHYGz1kAK e7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682706522; x=1685298522; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6QMZhDexxfLA2RQm0j2+ddKdXUKAWu/zoiDOxn4nNp0=; b=dG/5C6cm5GLLgjovlmtn5qk2uxLtmEZGr+AXm14hFDp5pCyvg6hRoYIf+GEPDsC6zQ mzJW5GPHqA34xkFeG3FnnY1GpK/Z2gD8Hnfw5Z8tVYGhqYVTe1HXm/v1ude8El8FYELk eQPMl6Hm8s+zYUaJvIs5QfdDQ2ruDbQXVRa6EDbwqvNavOEAczSWHvpf3TZwYEO6T9O6 OTtoNI0duiEEqGanPaXxPV5De7tA/1c39elokmVHCDizpci54EZX2uSHU9LcyjP2AN5w NSMU3kVFAVMkDx7k3lq03CiIUxFC7xYjnqTOrKTVpIIgYFyup0JXDqwTfhW9SjFfCbh+ A9LQ== X-Gm-Message-State: AC+VfDwl0aavCA1PRXJ9VWARiVWhWjUuxGtkvN5/3glwVf6PMfW99foy p4nS16HCnkoA7iOVtFDp7dteA1wUc1Doc4zWKR0= X-Google-Smtp-Source: ACHHUZ5idZkiCKz1EASMYbM/j7+zkwXFRJf1BxJBqhW+ZeS3z8V2nM2ANgbXZ3SvrzrKtWFu8y+4WqTlKCaaigOgti8= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:15c:2d1:203:7fbc:5712:e6b1:f733]) (user=ndesaulniers job=sendgmr) by 2002:a25:c04b:0:b0:b8f:4696:8fa1 with SMTP id c72-20020a25c04b000000b00b8f46968fa1mr3494622ybf.10.1682706522647; Fri, 28 Apr 2023 11:28:42 -0700 (PDT) Date: Fri, 28 Apr 2023 11:28:17 -0700 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAEAQTGQC/1WNzQ6DIBCEX8XsuTSKxJ+e+h6NB8BVSSqYxVAbw 7sXvDVz+mYmMyd4JIMeHsUJhMF442wCfitAL9LOyMyYGHjJ61LwjsnPwXRbT0KN2PZaQGoq6ZE pklYvubtKvyPlYCOczHHNv4bEi/G7o+/1Fqrs/g+HiiVNoi951yjZ8Ofs3PzGu3YrDDHGH5o7+ 2OwAAAA X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1682706521; l=2902; i=ndesaulniers@google.com; s=20220923; h=from:subject:message-id; bh=dTA9ynq73YQ/e9h+i1pEgv2IYWGxww8jCupOBbep0Wk=; b=5emz5BsCicOnQUdl7fVcK6+ZNZyTu3YFpE7YTmPGddTU7ZbUO8M6Hke1drny3VKssnBapXLq7qqK bSVTFj/TAKr79xqt9rrUkE94aToiU0IpJJor4JUFOMxTLyp7YaGL X-Mailer: b4 0.12.2 Message-ID: <20230428-awx-v2-1-b197ffa16edc@google.com> Subject: [PATCH v2] arm64: kernel: remove SHF_WRITE|SHF_EXECINSTR from .idmap.text From: ndesaulniers@google.com To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Ard Biesheuvel , Fangrui Song , Greg Thelen , Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230428_112844_822088_AE5A4A4C X-CRM114-Status: GOOD ( 11.92 ) 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 commit d54170812ef1 ("arm64: fix .idmap.text assertion for large kernels") modified some of the section assembler directives that declare .idmap.text to be SHF_ALLOC instead of SHF_ALLOC|SHF_WRITE|SHF_EXECINSTR. This patch fixes up the remaining stragglers that were left behind. Add Fixes tag so that this doesn't precede related change in stable. Fixes: d54170812ef1 ("arm64: fix .idmap.text assertion for large kernels") Reported-by: Greg Thelen Reviewed-by: Ard Biesheuvel Signed-off-by: Nick Desaulniers --- Changes in v2: - Drop irrelevant paragraph. - Pick up Ard's RB tag. - Link to v1: https://lore.kernel.org/r/20230428-awx-v1-1-1f490286ba62@google.com --- arch/arm64/kernel/cpu-reset.S | 2 +- arch/arm64/kernel/sleep.S | 2 +- arch/arm64/mm/proc.S | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) --- base-commit: 22b8cc3e78f5448b4c5df00303817a9137cd663f change-id: 20230428-awx-c73f4bde79c4 Best regards, diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index 6b752fe89745..c87445dde674 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -14,7 +14,7 @@ #include .text -.pushsection .idmap.text, "awx" +.pushsection .idmap.text, "a" /* * cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index 2ae7cff1953a..2aa5129d8253 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -97,7 +97,7 @@ SYM_FUNC_START(__cpu_suspend_enter) ret SYM_FUNC_END(__cpu_suspend_enter) - .pushsection ".idmap.text", "awx" + .pushsection ".idmap.text", "a" SYM_CODE_START(cpu_resume) mov x0, xzr bl init_kernel_el diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 91410f488090..c2cb437821ca 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -167,7 +167,7 @@ alternative_else_nop_endif SYM_FUNC_END(cpu_do_resume) #endif - .pushsection ".idmap.text", "awx" + .pushsection ".idmap.text", "a" .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 adrp \tmp1, reserved_pg_dir @@ -201,7 +201,7 @@ SYM_FUNC_END(idmap_cpu_replace_ttbr1) #define KPTI_NG_PTE_FLAGS (PTE_ATTRINDX(MT_NORMAL) | SWAPPER_PTE_FLAGS) - .pushsection ".idmap.text", "awx" + .pushsection ".idmap.text", "a" .macro kpti_mk_tbl_ng, type, num_entries add end_\type\()p, cur_\type\()p, #\num_entries * 8 @@ -400,7 +400,7 @@ SYM_FUNC_END(idmap_kpti_install_ng_mappings) * Output: * Return in x0 the value of the SCTLR_EL1 register. */ - .pushsection ".idmap.text", "awx" + .pushsection ".idmap.text", "a" SYM_FUNC_START(__cpu_setup) tlbi vmalle1 // Invalidate local TLB dsb nsh