From patchwork Mon Jul 24 13:35:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 124965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1806488vqg; Mon, 24 Jul 2023 06:39:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0z/DLuDB9uiDemYe0RrN3ikiJ4Ih5pfNvMvBj/QcZ4R3nnrkXqa5if/FQnRLGour9dcYX X-Received: by 2002:adf:f703:0:b0:314:50d:4540 with SMTP id r3-20020adff703000000b00314050d4540mr7512582wrp.18.1690205969631; Mon, 24 Jul 2023 06:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690205969; cv=none; d=google.com; s=arc-20160816; b=SYDD/cYRUtxHwGQjCbTo3fC3HDtix1Om6eierISfT1xxD3IPalCgKneAJtd/IwLH/4 0pyGTy+T8Df/03r1NmE982ZfE6MFanAQkFFkrAcQxa++nZ3RPe+DsfPUhhgEGyyA7/W6 wVrEYNycLPcZJsSXPL20DqkpwzKllj6EmqNboobQlQ6QDRYeoqb+Em1Qw7LXXar7u58O CIh+7aMwi/72Lz5Tt+q1xv5Xnj5gz5jvIlm5ZbHG4DV0aNXdSJ4DDc6aNOF2e+KLsq6g +vFOzAjh7xNzeeh9gwc9PYYjHE0blXSZFj+MgsreVjCwHb4u7sPIDw/gu3jVMNfGrXG1 eUlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=CpgDO7ZbLfJdlLPlI0db0hJw7XEH0Imhn7HEF8CCLXo=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=elv3TK+Bly3KU3OpY49aM2zjewOig/stcTe5ZgiY5YgDFtnjCjEu+HO5RyZ/PwemCp fCdi9m5teuAs2XFr2X1o2pdb7SOGUzADpXWJB1S4PIJdLqPANiLhP4kSR2IPqqEOxwRp ufRLq1Z+pQ5vbyRXLK9oadqzt+Eg+Cu8pLUUc9/vPlGENmY7rjPO0HdBM4C1o6WTw7rx xLAC39ATshKPlq+awAq9fcxA9QKyS1NLLDEcmiSgziLrSZzLqSV1WeCz4k8R4nboxUaQ cwycThWmtQBzS7K3PiQNQZvUwbu9fnmcCYDXr3hDgDw0RMTJIR7mLGFHX7gOy77hL0Dj QGFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GydzcP+5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v13-20020a056402184d00b00521a9d1c843si6468145edy.251.2023.07.24.06.39.05; Mon, 24 Jul 2023 06:39:29 -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=@linutronix.de header.s=2020 header.b=GydzcP+5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231715AbjGXNhk (ORCPT + 99 others); Mon, 24 Jul 2023 09:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231627AbjGXNhH (ORCPT ); Mon, 24 Jul 2023 09:37:07 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA850E77 for ; Mon, 24 Jul 2023 06:35:59 -0700 (PDT) Message-ID: <20230724132047.495400662@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CpgDO7ZbLfJdlLPlI0db0hJw7XEH0Imhn7HEF8CCLXo=; b=GydzcP+5vv/kl7uKcPVlMMHLpmFD0l8nXi6AMWbNDi03/b1r7uTw6+Rj0WT6ik1Gr+Mdn7 QqZAaWdLfW+DZDMhWZMc58HWU/EmG2a9cRMQIAfCvdMNTHtqG461NdclZbNOun2Vlg4vCg gW4aktHMqF7+I0/MngG8yzbUzNUob/dlHfe7aET2wTYqjPjsD7kTiasySw6AI7TAUKDMWW GDdpgt+dQ5YJ1yKEVFA3ojt+lPjH0S6Q98YooDOzc/C/1cesJoAiNlcznJakLWxI+W6Iu9 eA1xGKWfQ/Kxw6eYWkYuIi9PPlaZKPb+hG8o31oVo+rNgk67j4cFKe2a9Dt5YA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=CpgDO7ZbLfJdlLPlI0db0hJw7XEH0Imhn7HEF8CCLXo=; b=AG/UIE0EkiquUTMu1w3y0vyIvTuJykviy1LEKtkbdoPjLBwokYbvyva3kSOAV0qSknBlwb 2wA2HMxwVy1p73BA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross , Michael Kelley , Peter Keresztes Schmidt , "Peter Zijlstra (Intel)" Subject: [patch V2 49/58] x86/apic: Wrap apic->native_eoi() into a helper References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:35:09 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772309414582119992 X-GMAIL-MSGID: 1772309414582119992 Prepare for converting the hotpath APIC callbacks to static calls. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/apic.h | 6 ++++++ arch/x86/kernel/kvm.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -359,6 +359,11 @@ static inline void apic_eoi(void) apic->eoi(); } +static inline void apic_native_eoi(void) +{ + apic->native_eoi(); +} + static inline u64 apic_icr_read(void) { return apic->icr_read(); @@ -397,6 +402,7 @@ static inline void apic_icr_write(u32 lo static inline void apic_wait_icr_idle(void) { } static inline u32 safe_apic_wait_icr_idle(void) { return 0; } static inline void apic_set_eoi_cb(void (*eoi)(void)) {} +static inline void apic_native_eoi(void) { WARN_ON_ONCE(1); } #endif /* CONFIG_X86_LOCAL_APIC */ --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -343,7 +343,7 @@ static notrace void kvm_guest_apic_eoi_w */ if (__test_and_clear_bit(KVM_PV_EOI_BIT, this_cpu_ptr(&kvm_apic_eoi))) return; - apic->native_eoi(); + apic_native_eoi(); } static void kvm_guest_cpu_init(void)