From patchwork Fri Mar 17 06:33:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 71092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp178299wrt; Thu, 16 Mar 2023 23:39:12 -0700 (PDT) X-Google-Smtp-Source: AK7set9krA3ylR4GfR2Ox20qmVHjwDh6LundKN3ReU6dYjC5JHyrnpVmM63t+LqNi4r3sijtpnP7 X-Received: by 2002:a05:6a00:26e4:b0:625:a08c:a8ba with SMTP id p36-20020a056a0026e400b00625a08ca8bamr8806781pfw.1.1679035152487; Thu, 16 Mar 2023 23:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679035152; cv=none; d=google.com; s=arc-20160816; b=Ui4+MJsn3d51sGlHaWy9uqwMGjsON0vr+U4Pr43Ih82mflkQoO06laLKHFg+cr7HwO FLJg4szslZdCW+drB3tPQLULLQrrpNnq7Xqrs1PQprxiHjSjQAqUaDtGCIednzkDT10/ IpWqCw3NPLmSQ7fNgHJ62h20JKhJ12EJdM0LUv/7gGkkldxz02RpLPiwppIGjwc0O54u fhbqIazxHYT6Xz3cHdCi41CCEydZ1xweAh4jlvXR7I1ts7HwxKUl4wrQJwqcvzi70UR7 ZioKC2+I95z6V16uy5OLevqHLmIIHp7YW6ECrHXlRXb07txFrsGgTsWoBxXB9To7Vlth b+jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=OiBncbLTZGuRasTkt9MC9ORDhJhUkXWXd1OQZCJH40s=; b=a6irSrN3KqL50GuJ/ig1zJPvCSBaurqkLyaeNm79MD6NLWp5X67zpa+3MqSF51g/nh mmswNKBIyT6yxoOvy0o/5QQ9R84lFiwSa/QDJDyD8+oHWdZkkaNxjBZhpJyEOBuMWtOu ndxzRfVOpC/iAyK83BI6WzY+6MLaNiosG3w8nUL5+LskbEsru4oG05urjNNffXSvQCeJ nzbIGeYfsw8a8LbrpFbGQnfMnvv0KAG11uzcV8jzUBs67x4etBZvX98o3GY6FaWsTxSz tZgd5srBezyVP/NdO7ozjJuxgOF7lX2+ICaqWv6Ml+f9dKBIeek8VZBNN8i3xIsavlnZ KVLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=BKQjya5P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x3-20020a056a00188300b00622c8df1d7fsi1673644pfh.42.2023.03.16.23.38.59; Thu, 16 Mar 2023 23:39:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=BKQjya5P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229950AbjCQGdh (ORCPT + 99 others); Fri, 17 Mar 2023 02:33:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbjCQGdg (ORCPT ); Fri, 17 Mar 2023 02:33:36 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA1922CFCE for ; Thu, 16 Mar 2023 23:33:28 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 43C3A1FDD9; Fri, 17 Mar 2023 06:33:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679034807; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OiBncbLTZGuRasTkt9MC9ORDhJhUkXWXd1OQZCJH40s=; b=BKQjya5PqrIxb9aAn4Mz+gobbphLA6c6rel8QZXbG3+S8RkqsWNUfhi3/ErPNBCvYzDd+L lrJi3gHmwOGoF02ibKZ0S9yAnzRfWY7d4zUoSjYSb11gysxKe9FzSPMxXtdhSSBoxOEGlb AnI9HdLXrMAWTYasMTpqMPjKX3jqdyU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DDF8E13428; Fri, 17 Mar 2023 06:33:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SVayNLYJFGTGfAAAMHmgww (envelope-from ); Fri, 17 Mar 2023 06:33:26 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: Juergen Gross , "Srivatsa S. Bhat (VMware)" , Alexey Makhalov , VMware PV-Drivers Reviewers , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v2] x86/paravirt: convert simple paravirt functions to asm Date: Fri, 17 Mar 2023 07:33:25 +0100 Message-Id: <20230317063325.361-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759815476145344478?= X-GMAIL-MSGID: =?utf-8?q?1760595964152464140?= All functions referenced via __PV_IS_CALLEE_SAVE() need to be assembler functions, as those functions calls are hidden from gcc. In case the kernel is compiled with "-fzero-call-used-regs" the compiler will clobber caller-saved registers at the end of C functions, which will result in unexpectedly zeroed registers at the call site of the related paravirt functions. Replace the C functions with DEFINE_PARAVIRT_ASM() constructs using the same instructions as the related paravirt calls in the PVOP_ALT_[V]CALLEE*() macros. Signed-off-by: Juergen Gross --- V2: - use noinstr section (Peter Zijlstra, Andrew Cooper) --- arch/x86/include/asm/paravirt_types.h | 8 +++++++- arch/x86/kernel/paravirt.c | 27 ++++++--------------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 8c1da419260f..49f5c6955229 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -562,8 +562,14 @@ void paravirt_flush_lazy_mmu(void); void _paravirt_nop(void); void paravirt_BUG(void); -u64 _paravirt_ident_64(u64); unsigned long paravirt_ret0(void); +#ifdef CONFIG_PARAVIRT_XXL +u64 _paravirt_ident_64(u64); +unsigned long pv_native_save_fl(void); +void pv_native_irq_disable(void); +void pv_native_irq_enable(void); +unsigned long pv_native_read_cr2(void); +#endif #define paravirt_nop ((void *)_paravirt_nop) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 42e182868873..5ec2071570a4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -64,11 +64,11 @@ static unsigned paravirt_patch_call(void *insn_buff, const void *target, } #ifdef CONFIG_PARAVIRT_XXL -/* identity function, which can be inlined */ -u64 notrace _paravirt_ident_64(u64 x) -{ - return x; -} +DEFINE_PARAVIRT_ASM(_paravirt_ident_64, "mov %rdi, %rax", .text); +DEFINE_PARAVIRT_ASM(pv_native_save_fl, "pushf; pop %rax", .noinstr.text); +DEFINE_PARAVIRT_ASM(pv_native_irq_disable, "cli", .noinstr.text); +DEFINE_PARAVIRT_ASM(pv_native_irq_enable, "sti", .noinstr.text); +DEFINE_PARAVIRT_ASM(pv_native_read_cr2, "mov %cr2, %rax", .noinstr.text); #endif DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key); @@ -197,11 +197,6 @@ void paravirt_end_context_switch(struct task_struct *next) arch_enter_lazy_mmu_mode(); } -static noinstr unsigned long pv_native_read_cr2(void) -{ - return native_read_cr2(); -} - static noinstr void pv_native_write_cr2(unsigned long val) { native_write_cr2(val); @@ -222,16 +217,6 @@ noinstr void pv_native_wbinvd(void) native_wbinvd(); } -static noinstr void pv_native_irq_enable(void) -{ - native_irq_enable(); -} - -static noinstr void pv_native_irq_disable(void) -{ - native_irq_disable(); -} - static noinstr void pv_native_safe_halt(void) { native_safe_halt(); @@ -298,7 +283,7 @@ struct paravirt_patch_template pv_ops = { .cpu.end_context_switch = paravirt_nop, /* Irq ops. */ - .irq.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), + .irq.save_fl = __PV_IS_CALLEE_SAVE(pv_native_save_fl), .irq.irq_disable = __PV_IS_CALLEE_SAVE(pv_native_irq_disable), .irq.irq_enable = __PV_IS_CALLEE_SAVE(pv_native_irq_enable), .irq.safe_halt = pv_native_safe_halt,