From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227YPyl4yNOQdeKC61x+KcGNScpNHtQ2JEu681R1RTKKuiaRbfp61Y04Q0GVnBRZ3SRhPTcm ARC-Seal: i=1; a=rsa-sha256; t=1517302337; cv=none; d=google.com; s=arc-20160816; b=afJ0ZdqVT7lv+Agr2bO1UGLe+lKavimFS2uuQquvozcBKsnbJH+MrcPGL0wnQHBRRc b/45ukyMSj5r5sg4wbt8reUalmzkGDysIP67mlo4FE0v8Qd+T2dGBhrPEqFmqX4IErB1 2IhQzGdFZtGSOlGieA8k9yILPkx9WjBLVvMWKbZpKsAXn/RsZd+6+neftjjwlm4rGSPk Wu8TH9nyezdjzQkqUaXYGRiUFFxqRtw3qrzASLx1KsjJwgPivOgeOUf1Sn/l80unAC9z 2OqSKiv/v3W10gVprM9ESGFrj+mNKAl03vcgabfzVFhqHTa6J6p8Cdxoocvh8gp4lsPh t/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=precedence:content-disposition:content-transfer-encoding :mime-version:robot-unsubscribe:robot-id:git-commit-id:subject:to :references:in-reply-to:reply-to:cc:message-id:from:sender:date :arc-authentication-results; bh=wp92x7OjC/64yd/E7PwWgXP4MT6xC21+HFRBw/uJsGY=; b=gc1Lk0MTNibGEatlZ7HPu3pNOj7Ec/fjVs5YDRaxe6HwPLz56gkeUMqHOynKgt0+0y +2/xH38F7MfNxqepm2GcPm3GTefuLyFW3hvkIUb9ssE+rHjL6ruvAnK1CG3cgfjfCVVl u19ke8rIOL2qmOdKX6VzWC8Ac6Zd3NTZ/tfa+ap1zB6Cx74j9DgV9o3xbpnfYnYnydap s43hBnFZoRh5kzIEYhQwS79NPyevjTI5H4wo3GwjoNa6vx+Mj3PQ2zVVvpGvxLwa/KG0 /acka8nWgMX9nQ7kJ/vl5ONetYhfzYEuZVjMPd7yShwT8HCsrAXtDQVYxRptee+b8a3D gDow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 65.50.211.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Date: Tue, 30 Jan 2018 00:47:35 -0800 Sender: tip tree robot From: tip-bot for Josh Poimboeuf Message-ID: Cc: linux@roeck-us.net, jgross@suse.com, hpa@zytor.com, peterz@infradead.org, dwmw2@infradead.org, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, jpoimboe@redhat.com, tglx@linutronix.de, bp@alien8.de, luto@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, dave.hansen@linux.intel.com Reply-To: peterz@infradead.org, hpa@zytor.com, gregkh@linuxfoundation.org, dwmw2@infradead.org, jgross@suse.com, linux@roeck-us.net, luto@kernel.org, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jpoimboe@redhat.com, torvalds@linux-foundation.org, bp@alien8.de, tglx@linutronix.de In-Reply-To: <3788b5aec1c279184b78cdbd8b520903c0fb8a80.1517284349.git.jpoimboe@redhat.com> References: <3788b5aec1c279184b78cdbd8b520903c0fb8a80.1517284349.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] objtool: Don't print '.tmp_' prefix for .o files when CONFIG_MODVERSIONS=y Git-Commit-ID: dfcb8dae5d28b7cf259b367ed9ccbc1296284e0d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1591006816050410021?= X-GMAIL-MSGID: =?utf-8?q?1591006816050410021?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Commit-ID: dfcb8dae5d28b7cf259b367ed9ccbc1296284e0d Gitweb: https://git.kernel.org/tip/dfcb8dae5d28b7cf259b367ed9ccbc1296284e0d Author: Josh Poimboeuf AuthorDate: Mon, 29 Jan 2018 22:00:42 -0600 Committer: Ingo Molnar CommitDate: Tue, 30 Jan 2018 07:55:05 +0100 objtool: Don't print '.tmp_' prefix for .o files when CONFIG_MODVERSIONS=y With the following commit: 2a0098d70640 ("objtool: Fix seg fault with gold linker") ... objtool warnings started showing the modversions '.tmp_' prefix in the .o file name, like: arch/x86/mm/.tmp_mem_encrypt_boot.o: warning: objtool: sme_encrypt_execute()+0x48: indirect call found in RETPOLINE build The prefix is confusing. Remove it from the printed 'objname' variable. Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Dave Hansen Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Guenter Roeck Cc: H. Peter Anvin Cc: Juergen Gross Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 2a0098d70640 ("objtool: Fix seg fault with gold linker") Link: http://lkml.kernel.org/r/3788b5aec1c279184b78cdbd8b520903c0fb8a80.1517284349.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- tools/objtool/check.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 9cd028a..d45ab4d 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1978,6 +1978,25 @@ static void cleanup(struct objtool_file *file) elf_close(file->elf); } +/* + * With CONFIG_MODVERSIONS=y, the object name has '.tmp_' prepended to it. + * After the file has been opened, remove the prefix so warnings will look + * sensible. + */ +static void fix_objname(void) +{ + char *s; + + s = strstr(objname, ".tmp_"); + if (!s) + return; + + for (; s[5]; s++) + s[0] = s[5]; + + s[0] = 0; +} + int check(const char *_objname, bool _no_fp, bool no_unreachable, bool orc) { struct objtool_file file; @@ -1990,6 +2009,8 @@ int check(const char *_objname, bool _no_fp, bool no_unreachable, bool orc) if (!file.elf) return 1; + fix_objname(); + INIT_LIST_HEAD(&file.insn_list); hash_init(file.insn_hash); file.whitelist = find_section_by_name(file.elf, ".discard.func_stack_frame_non_standard");