From patchwork Thu Jun 7 20:49:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10453583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1C21A60467 for ; Thu, 7 Jun 2018 20:51:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C4762945E for ; Thu, 7 Jun 2018 20:51:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00044299EF; Thu, 7 Jun 2018 20:51:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C3A02945E for ; Thu, 7 Jun 2018 20:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932666AbeFGUug (ORCPT ); Thu, 7 Jun 2018 16:50:36 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:38507 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932641AbeFGUua (ORCPT ); Thu, 7 Jun 2018 16:50:30 -0400 Received: by mail-pg0-f65.google.com with SMTP id c9-v6so5314811pgf.5 for ; Thu, 07 Jun 2018 13:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MPtvFM9RmOmX1Ahr0Fa+Dw3BDhmehCY5YEyrPuKZw+s=; b=rw7e11NOPEN2fHvjHq8Uq5Jmk/xggXoyj9mloiRQX+ipQUAxnZGrfsP9h3t/CzEAAG 4r+M2D/VFN4ee60iXOxm6hJ6OgEsqcsLyu+nf9BoVE8QzXyZ6i5jwZ2FE4J7WIrWYHgc i8X6mvzL1ZcY+NPI5AdRxidHZGvoCNQqDqn0oEnZerQCAi9XiJVqNcdjmjmp9i+UoZdp Mx1iqU66mIUhM6RY6a7r/5Y+5/bsXKV+le2eI2doDAzhxSWt56G/tnP+Of6uYlrIJEsk VwAi2H27McjUFzyRex2eC1ne93a+kp7MGgWHD7Fyg9PlipVB7bsQh1NBUHdIJ50xuE4e eanQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MPtvFM9RmOmX1Ahr0Fa+Dw3BDhmehCY5YEyrPuKZw+s=; b=RiT7Rdrj0HRv7e+f1k5qfF1fAVGcdUOLBxHBV0IyOmko3cpkH8yISjfVtKVjxqW/qm 11Fhh2ZJ+QVN6GrmTLmt35Z+pE+92gOwAXpzE2kv2eyZQhPpP87LU/BUh3Lo0mMh7dw2 X8/USYpKFlaDZ1KkTGdM8YRivk06wHeX53t5aSkI2joenfVqnowDyjsdCdaRRz0DsT3H N+RgVFvxlvGxBrgo509itkImAG/9uaoAVfAyrnCWo/V6URTuN+oWgnWkB9fxj9I0vgfk VPEB6E82f92EwFf3UzmmyBP3ZFrOehGnsmhAwrd4SucdaCX/Ra2k7abyMlDeniEPif8w uScQ== X-Gm-Message-State: APt69E3ps/N/0xf/ZMbEJLN6y8rM2JGuE/jNuln+CDH+bffvuiqVqo3O bQd4/bvLPZmxY6OIiaWLteI9Kg== X-Google-Smtp-Source: ADUXVKJzpqGhOJG50C6Qk9TkTBZRosfdu9mPfPvtlT3vJrxkH8kwDOLJtOmOZsK3BHfzUuTrXTQoYg== X-Received: by 2002:a62:6cc4:: with SMTP id h187-v6mr3104708pfc.145.1528404629816; Thu, 07 Jun 2018 13:50:29 -0700 (PDT) Received: from ndesaulniers0.svl.corp.google.com ([2620:15c:2a3:1:d33:166f:5b79:14b3]) by smtp.gmail.com with ESMTPSA id w18-v6sm3780460pgq.1.2018.06.07.13.50.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 13:50:28 -0700 (PDT) From: Nick Desaulniers To: akpm@linux-foundation.org, hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux-foundation.org, astrachan@google.com, manojgupta@google.com, ghackmann@google.com, sedat.dilek@gmail.com, tstellar@redhat.com, keescook@google.com, yamada.masahiro@socionext.com, michal.lkml@markovi.net, linux-kbuild@vger.kernel.org, geert@linux-m68k.org, will.deacon@arm.com, mawilcox@microsoft.com, arnd@arndb.de, rientjes@google.com, acme@redhat.com, pombredanne@nexb.com, aryabinin@virtuozzo.com, kstewart@linuxfoundation.org, boris.ostrovsky@oracle.com, jan.kiszka@siemens.com, rostedt@goodmis.org, kirill.shutemov@linux.intel.com, ard.biesheuvel@linaro.org, akataria@vmware.com, brijesh.singh@amd.com, caoj.fnst@cn.fujitsu.com, gregkh@linuxfoundation.org, jarkko.sakkinen@linux.intel.com, jgross@suse.com, jpoimboe@redhat.com, mka@chromium.org, ndesaulniers@google.com, thomas.lendacky@amd.com, tweek@google.com, mjg59@google.com, joe@perches.com Subject: [PATCH v4 3/3] x86: paravirt: make native_save_fl extern inline Date: Thu, 7 Jun 2018 13:49:27 -0700 Message-Id: <20180607204927.219329-4-ndesaulniers@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog In-Reply-To: <20180607204927.219329-1-ndesaulniers@google.com> References: <20180607204927.219329-1-ndesaulniers@google.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP native_save_fl() is marked static inline, but by using it as a function pointer in arch/x86/kernel/paravirt.c, it MUST be outlined. paravirt's use of native_save_fl() also requires that no GPRs other than %rax are clobbered. Compilers have different heuristics which they use to emit stack guard code, the emittance of which can break paravirt's callee saved assumption by clobbering %rcx. Marking a function definition extern inline means that if this version cannot be inlined, then the out-of-line version will be preferred. By having the out-of-line version be implemented in assembly, it cannot be instrumented with a stack protector, which might violate custom calling conventions that code like paravirt rely on. The semantics of extern inline has changed since gnu89. This means that folks using GCC versions >= 5.1 may see symbol redefinition errors at link time for subdirs that override KBUILD_CFLAGS (making the C standard used implicit) regardless of this patch. This has been cleaned up earlier in the patch set, but is left as a note in the commit message for future travelers. Reports: https://lkml.org/lkml/2018/5/7/534 https://github.com/ClangBuiltLinux/linux/issues/16 Discussion: https://bugs.llvm.org/show_bug.cgi?id=37512 https://lkml.org/lkml/2018/5/24/1371 Thanks to the many folks that participated in the discussion. Debugged-by: Alistair Strachan Debugged-by: Matthias Kaehlcke Reported-by: Sedat Dilek Signed-off-by: Nick Desaulniers Suggested-by: Arnd Bergmann Suggested-by: H. Peter Anvin Suggested-by: Tom Stellar Tested-by: Sedat Dilek --- arch/x86/include/asm/irqflags.h | 2 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/irqflags.S | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/irqflags.S diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index 89f08955fff7..c4fc17220df9 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -13,7 +13,7 @@ * Interrupt control: */ -static inline unsigned long native_save_fl(void) +extern inline unsigned long native_save_fl(void) { unsigned long flags; diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 02d6f5cf4e70..8824d01c0c35 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -61,6 +61,7 @@ obj-y += alternative.o i8253.o hw_breakpoint.o obj-y += tsc.o tsc_msr.o io_delay.o rtc.o obj-y += pci-iommu_table.o obj-y += resource.o +obj-y += irqflags.o obj-y += process.o obj-y += fpu/ diff --git a/arch/x86/kernel/irqflags.S b/arch/x86/kernel/irqflags.S new file mode 100644 index 000000000000..ddeeaac8adda --- /dev/null +++ b/arch/x86/kernel/irqflags.S @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include +#include +#include + +/* + * unsigned long native_save_fl(void) + */ +ENTRY(native_save_fl) + pushf + pop %_ASM_AX + ret +ENDPROC(native_save_fl) +EXPORT_SYMBOL(native_save_fl) + +/* + * void native_restore_fl(unsigned long flags) + * %eax/%rdi: flags + */ +ENTRY(native_restore_fl) + push %_ASM_ARG1 + popf + ret +ENDPROC(native_restore_fl) +EXPORT_SYMBOL(native_restore_fl)