Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1021589yba; Thu, 4 Apr 2019 02:36:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYv6Q1EhpAc8VN23NoWltvrSatMSfXkAiWLfoe4hJ6TKVY2LZwkQxGU4BIJGYG/StBxuFa X-Received: by 2002:a62:1c13:: with SMTP id c19mr4756674pfc.11.1554370616948; Thu, 04 Apr 2019 02:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554370616; cv=none; d=google.com; s=arc-20160816; b=BaSZPWw+ZbqZ9NO5g+sFXSTMsp0DTtbldXUrBnhW3MPGb29aQ6WlsE+Km+sjQDoXau ZX/rKRBMgrL8y4E6LRfldxgRE1bsQmLtPajkzBLAiAiZ2qKU0nrZs+amAmcCndx3KyOD mf21NAvvcaUDmgwnegbRnl4I4+37xVWbslbqF4Z2d8/QOAs1cpbwDdw099WvlpToPI+Y p4gjhyJzTsBTlt+uGmGiaIuS634gq6IbRqvNHpc8xp5mD89m2zJwMfxlArfp7ZuGxjNo 7ma2ASOJO4BycY26o2iwKgt9dVkvIgpOS2/8/I6elaP+YGmPzTogxzqm1FYBej73WvpB MBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xxP3YUfDuIYvu2SfUKnszo1bXEMmzkuGQfvfRA4mNzQ=; b=YswY8L2QW3UoT2uKLlNXDL2pILldBEEaf4lY2V7Njm3mGdJ98wr/Tmak4ZkuXa1boa 0z2ndaGb6nBEWDZmK0opiKwhhZi7nIfKeG3QwzC9sjMXp9wp7lno8oJR5GEZvFCRqpYf YJkU+afdtCQBm1JTcIp9qObnml0Hu1r75KK35nobrlBY0WPEa29IAB0/g4iNbvWPzeXL 3oxYcUa3LC7Ihi1xzlB2alPj5K+EVrzwud0wXFZw+UeI3nRyEiCfHb/9yjReNfOo31Xk bW1+m6msHH7TNsaaLRzZnFOovD1hRysSSZ2dCaX0czhe01lSKTGgY5UFwArnn8Xx5Twe zrQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bjcR8OWr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g31si31789plg.154.2019.04.04.02.36.41; Thu, 04 Apr 2019 02:36:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bjcR8OWr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732354AbfDDJGk (ORCPT + 99 others); Thu, 4 Apr 2019 05:06:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:45134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732341AbfDDJGg (ORCPT ); Thu, 4 Apr 2019 05:06:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D336A21872; Thu, 4 Apr 2019 09:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368795; bh=5YiFH5L38o1NXDl7y5yI2kUNPsJ9MfooNVTI3JDl5ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bjcR8OWrhCJsUoKRUnckQ5a6s90IYnSZDhWRvR92KDiTXi7lKW5175ubQRpyuTZJD Tik/5WFCad/I7IacThDoNB/dGVjYCwHnePNZqYwPWcW4Pio5gLpUak2BjvZrzn1rP7 LJ0dslGKKu+AFzpEUev0WjKT1qerPyNMENJ3oSEs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Golovin , George Rimar , Tri Vo , Borislav Petkov , Nick Desaulniers , "H. Peter Anvin" , Ingo Molnar , Michael Matz , Thomas Gleixner , morbo@google.com, ruiu@google.com, x86-ml , Sasha Levin Subject: [PATCH 4.19 173/187] x86/build: Specify elf_i386 linker emulation explicitly for i386 objects Date: Thu, 4 Apr 2019 10:48:30 +0200 Message-Id: <20190404084611.243787488@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084603.119654039@linuxfoundation.org> References: <20190404084603.119654039@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 927185c124d62a9a4d35878d7f6d432a166b74e3 ] The kernel uses the OUTPUT_FORMAT linker script command in it's linker scripts. Most of the time, the -m option is passed to the linker with correct architecture, but sometimes (at least for x86_64) the -m option contradicts the OUTPUT_FORMAT directive. Specifically, arch/x86/boot and arch/x86/realmode/rm produce i386 object files, but are linked with the -m elf_x86_64 linker flag when building for x86_64. The GNU linker manpage doesn't explicitly state any tie-breakers between -m and OUTPUT_FORMAT. But with BFD and Gold linkers, OUTPUT_FORMAT overrides the emulation value specified with the -m option. LLVM lld has a different behavior, however. When supplied with contradicting -m and OUTPUT_FORMAT values it fails with the following error message: ld.lld: error: arch/x86/realmode/rm/header.o is incompatible with elf_x86_64 Therefore, just add the correct -m after the incorrect one (it overrides it), so the linker invocation looks like this: ld -m elf_x86_64 -z max-page-size=0x200000 -m elf_i386 --emit-relocs -T \ realmode.lds header.o trampoline_64.o stack.o reboot.o -o realmode.elf This is not a functional change for GNU ld, because (although not explicitly documented) OUTPUT_FORMAT overrides -m EMULATION. Tested by building x86_64 kernel with GNU gcc/ld toolchain and booting it in QEMU. [ bp: massage and clarify text. ] Suggested-by: Dmitry Golovin Signed-off-by: George Rimar Signed-off-by: Tri Vo Signed-off-by: Borislav Petkov Tested-by: Tri Vo Tested-by: Nick Desaulniers Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Michael Matz Cc: Thomas Gleixner Cc: morbo@google.com Cc: ndesaulniers@google.com Cc: ruiu@google.com Cc: x86-ml Link: https://lkml.kernel.org/r/20190111201012.71210-1-trong@android.com Signed-off-by: Sasha Levin --- arch/x86/boot/Makefile | 2 +- arch/x86/realmode/rm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 9b5adae9cc40..e2839b5c246c 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -100,7 +100,7 @@ $(obj)/zoffset.h: $(obj)/compressed/vmlinux FORCE AFLAGS_header.o += -I$(objtree)/$(obj) $(obj)/header.o: $(obj)/zoffset.h -LDFLAGS_setup.elf := -T +LDFLAGS_setup.elf := -m elf_i386 -T $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE $(call if_changed,ld) diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index 4463fa72db94..96cb20de08af 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile @@ -47,7 +47,7 @@ $(obj)/pasyms.h: $(REALMODE_OBJS) FORCE targets += realmode.lds $(obj)/realmode.lds: $(obj)/pasyms.h -LDFLAGS_realmode.elf := --emit-relocs -T +LDFLAGS_realmode.elf := -m elf_i386 --emit-relocs -T CPPFLAGS_realmode.lds += -P -C -I$(objtree)/$(obj) targets += realmode.elf -- 2.19.1