From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by sourceware.org (Postfix) with ESMTPS id 8736B3858C53 for ; Tue, 9 May 2023 08:58:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8736B3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C601863269; Tue, 9 May 2023 08:58:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39393C433EF; Tue, 9 May 2023 08:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683622733; bh=n3TfUXH1Qp8sE+oHDv5nZcWtlmtw8gj9BZcWS1Bxwq4=; h=From:To:Cc:Subject:Date:From; b=LssRVdjOTGzzvXmlKAiejG0HZHJYHzhSzQgFd9eKi1/9JhZjzo41EVDAmI7F34mV3 cYyDewP4lJGW19rEuQgrzHLvyeTirGsVVDmKLPbK+VDa75hxJh4C9HcGCpKDpNem5u Rp/YMvjLlPfzKUokwqEMR2SomUjKXJt0iO7nnn+vj03E/h3fkvkHKItQDmU9FKrlSX 3R+Uu6e/LJUbt1qRrlbxNlYyJ5NebIcuQjOtl7gTkFclutxAC+BFbpFe2zGSRfmvjl wlzTIteCozEX9OgXzS9wEpffhgocVs66X2iTNDcVJ7ltZ6FA0Vc2Oe8g/7cnY9b9xl oHIAWu5ilcj8A== From: Ard Biesheuvel To: gcc-patches@gcc.gnu.org Cc: keescook@chromium.org, Ard Biesheuvel , "H . J . Lu" , Jakub Jelinek , Richard Biener , Uros Bizjak , Hou Wenlong Subject: [PATCH] i386: Honour -mdirect-extern-access when calling __fentry__ Date: Tue, 9 May 2023 10:58:35 +0200 Message-Id: <20230509085835.1143661-1-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The small and medium PIC code models generate profiling calls that always load the address of __fentry__() via the GOT, even if -mdirect-extern-access is in effect. This deviates from the behavior with respect to other external references, and results in a longer opcode that relies on linker relaxation to eliminate the GOT load. In this particular case, the transformation replaces an indirect 'CALL *__fentry__@GOTPCREL(%rip)' with either 'CALL __fentry__; NOP' or 'NOP; CALL __fentry__', where the NOP is a 1 byte NOP that preserves the 6 byte length of the sequence. This is problematic for the Linux kernel, which generally relies on -mdirect-extern-access and hidden visibility to eliminate GOT based symbol references in code generated with -fpie/-fpic, without having to depend on linker relaxation. The Linux kernel relies on code patching to replace these opcodes with NOPs at runtime, and this is complicated code that we'd prefer not to complicate even more by adding support for patching both 5 and 6 byte sequences as well as parsing the instruction stream to decide which variant of CALL+NOP we are dealing with. So let's honour -mdirect-extern-access, and only load the address of __fentry__ via the GOT if direct references to external symbols are not permitted. Note that the GOT reference in question is in fact a data reference: we explicitly load the address of __fentry__ from the GOT, which amounts to eager binding, rather than emitting a PLT call that could bind eagerly, lazily or directly at link time. gcc/ChangeLog: * config/i386/i386.cc (x86_function_profiler): Take ix86_direct_extern_access into account when generating calls to __fentry__() Cc: H.J. Lu Cc: Jakub Jelinek Cc: Richard Biener Cc: Uros Bizjak Cc: Hou Wenlong --- gcc/config/i386/i386.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index b1d08ecdb3d44729..69b183abb4318b0a 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -21836,8 +21836,12 @@ x86_function_profiler (FILE *file, int labelno ATTRIBUTE_UNUSED) break; case CM_SMALL_PIC: case CM_MEDIUM_PIC: - fprintf (file, "1:\tcall\t*%s@GOTPCREL(%%rip)\n", mcount_name); - break; + if (!ix86_direct_extern_access) + { + fprintf (file, "1:\tcall\t*%s@GOTPCREL(%%rip)\n", mcount_name); + break; + } + /* fall through */ default: x86_print_call_or_nop (file, mcount_name); break; -- 2.39.2