From patchwork Tue Jun 5 17:05:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10448817 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 006C060375 for ; Tue, 5 Jun 2018 17:15:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E070F29A8D for ; Tue, 5 Jun 2018 17:15:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4F1329A8C; Tue, 5 Jun 2018 17:15:34 +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 43E0329A8D for ; Tue, 5 Jun 2018 17:15:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753405AbeFERFw (ORCPT ); Tue, 5 Jun 2018 13:05:52 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:41673 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbeFERFs (ORCPT ); Tue, 5 Jun 2018 13:05:48 -0400 Received: by mail-pg0-f68.google.com with SMTP id l65-v6so1515979pgl.8 for ; Tue, 05 Jun 2018 10:05:47 -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=9zOV1Lm8yBfzOD6BkXbj3feuYdmVno248aTMQeEN3Ag=; b=OOPC4S/TxVI2XHb/85EJBGocaF4z68q2iE643r4cbeIScB/P9ZEnqaasub4sv51lla GS39yhRT00lGJ8stvVEE8PqmKmZZs4FQRQ7r6jhS7JxsBZqMpgQ255V8hoMjekO2hd3z h51PcEdAf6P3ChoZsh86WfBsSaFi2UxXqPn/4fTKm05IYYTKbypXdNn/0JP6usOzrQ/b eB+Ob0x7B730Zw7Q5dEOvy75GaVYvDLTgiOvnP7DbDX9D+efsSUCLhkWfSYtig31JIzA HS30zHga8dRE+dl/fjBHUp0D4vVahQiN9SGX98+gow7ufDlz+H+bV2fKg7He4JNB8xUz Wb/g== 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=9zOV1Lm8yBfzOD6BkXbj3feuYdmVno248aTMQeEN3Ag=; b=pJzaFYqPnsTZbDOgNPE6/4kmxAiUCiQRsJw5AGbgi44fAO96nreJoEEdjgUKOQxEpK Y0b4mhedVTT+9lYhk7OwFN9vB6xrDXSsM+wOVQJORvPd6xkPSy+E5dUi7ZH2GPBb0BjO zQ47kbF44+Y3/BOTm19lKLffGjCr5V7ewvy+E767gPm6Qlaqly/KQQlHz9JFyrWBRAXJ WrFI4IZJD5ee0nEqp6IyO08y3VUboMnUqIgX5tqRaShdzo1S33YAYmNRmKkNInpP1g1E 08X6HWT+CAxAjIaVrlNraZghdiOgNE4ADWogPq872psAwm4PfM10+d41cd0RDIF0FJpI cXPw== X-Gm-Message-State: ALKqPwfw7JlfBfPR2qzl2TyVR+diFlS5pPoTjtTCuR4zoyuPfVkRBnps nT08ERiVQ5nS2k7nbxL47X8nPg== X-Google-Smtp-Source: ADUXVKJxnSSTUPTiadiile5wgZeOh/BrjUAks4VS2Jlc51HzVhseutqkdGQuYB8YBioSi3pwLeY6XA== X-Received: by 2002:a62:9e88:: with SMTP id f8-v6mr26350809pfk.206.1528218347137; Tue, 05 Jun 2018 10:05:47 -0700 (PDT) Received: from ndesaulniers0.svl.corp.google.com ([2620:15c:2a3:1:d33:166f:5b79:14b3]) by smtp.gmail.com with ESMTPSA id r27-v6sm27280090pfg.94.2018.06.05.10.05.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jun 2018 10:05:46 -0700 (PDT) From: Nick Desaulniers To: akpm@linux-foundation.org, ard.biesheuvel@linaro.org, aryabinin@virtuozzo.com, akataria@vmware.com, boris.ostrovsky@oracle.com, brijesh.singh@amd.com, caoj.fnst@cn.fujitsu.com, gregkh@linuxfoundation.org, hpa@zytor.com, jan.kiszka@siemens.com, jarkko.sakkinen@linux.intel.com, jgross@suse.com, jpoimboe@redhat.com, kirill.shutemov@linux.intel.com, mingo@redhat.com, mjg59@google.com, mka@chromium.org, ndesaulniers@google.com, pombredanne@nexb.com, rostedt@goodmis.org, tglx@linutronix.de, thomas.lendacky@amd.com, tweek@google.com 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 Subject: [PATCH v2 2/2] x86: paravirt: make native_save_fl extern inline Date: Tue, 5 Jun 2018 10:05:32 -0700 Message-Id: <20180605170532.170361-3-ndesaulniers@google.com> X-Mailer: git-send-email 2.17.1.1185.g55be947832-goog In-Reply-To: <20180605170532.170361-1-ndesaulniers@google.com> References: <20180605170532.170361-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: H. Peter Anvin Suggested-by: Tom Stellar Tested-by: Sedat Dilek --- No changes in v2, but here's the discussion of v1: https://patchwork.kernel.org/patch/10444075/ 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..937bd08c3f79 --- /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) + * %rdi: flags + */ +ENTRY(native_restore_fl) + push %_ASM_DI + popf + ret +ENDPROC(native_restore_fl) +EXPORT_SYMBOL(native_restore_fl)