From patchwork Tue Aug 1 10:47:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2623139vqg; Tue, 1 Aug 2023 05:11:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlHLuDMrIPSL4W8/PSmsbsWLgSxoVzQ6f9DEadoIZh3fY2aEv4DPWKi6svxon4RgLPMViLbI X-Received: by 2002:a05:6512:214a:b0:4f8:631b:bf77 with SMTP id s10-20020a056512214a00b004f8631bbf77mr2055717lfr.22.1690891874342; Tue, 01 Aug 2023 05:11:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690891874; cv=none; d=google.com; s=arc-20160816; b=dZMLZ4rr7vs2LA+KPSPsAPEcB/DHl6qxLdBewYVxe9jFtjk3N6QcxMkXlaYSEkRGob iqWINPnghZmcpEYiB9P5PRRM3drhUF+qy2fyvSCAO7uQiIyfByg7UuOGQtVIFK8U2b6U EhT+tz4WXE7ZsH/N+17CqXPswnApkK7eK7+1/22biPB1+8FjHI95kBid+TEsfxAdIBm0 Tl2aT64b7ilqXBZqdbMLKHvsweYnq/S9F9aDU71lkLuTkDcUZa5knXgjfxqsRaaPlhS9 VXArqDzx89j/ZWgsi99pQy04QzNaSkv4QYuhak0XdogBD5TzHuJ72AMA0XJx4pqC/irU A5vQ== 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=4thjqk06PAC51pOMOTPF8ETngeGfrVOo3TNMYdEenIA=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=JJWOsl9bLp2cJUQZPlJPVmEPE3A4aHzgkbzSwZmDDVvhKNbpa1COg+etCS8w63OYfp 6MJslD4pZdiCctQVc4rkQRWgI2eEHw9Vi4EH4GjlHH2RDLKa7e56JqgQ1P1BakDZY1Zo b0retS2BV5nIBjtWsINabT/Q89ucaCxGzoeh9GzDJt6mcXwJlRSQ9Bs9NncM1Sh0+MZT vbvmsiCvCdFVSOzymsEc4A8UxaQF6FOvxWyRjTYMLHpCXQnworRSE52M+Zx4j/YjrDHr 4oWhmNgj1y8gozZ1q/j/Ax0Vcs8PeOPHEwwXsYDclLjdjdZZIocTl1t7yNS9Oq8lbtP2 WxYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hYq2NTJt; 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 e4-20020a056402148400b00522216849ebsi4970813edv.280.2023.08.01.05.10.50; Tue, 01 Aug 2023 05:11:14 -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=hYq2NTJt; 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 S232685AbjHAKwB (ORCPT + 99 others); Tue, 1 Aug 2023 06:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233939AbjHAKvZ (ORCPT ); Tue, 1 Aug 2023 06:51:25 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C212B49FF for ; Tue, 1 Aug 2023 03:48:54 -0700 (PDT) Message-ID: <20230801103818.426750252@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886875; 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=4thjqk06PAC51pOMOTPF8ETngeGfrVOo3TNMYdEenIA=; b=hYq2NTJtqwAScfWO5/gnhubO+QfkSxyd+M/MkH18g+s6QzqQGLTr5NHI0VHPb5aCP48OHg PpFQ8uBWK69rIEQUX9eEzC+eLRpzJVjLEBImVvvEQ7v1znmeLMMmRoL+HBZ7VfYabF8IHW d/yZJvuNJoGMSpysSpkj5wFNo9pruXInHmrCKN9uNsehrbrRWHHpoqTvwXP4KgS5Vvp0Ph TiqYD2eADMpQWdWOSsXmFnkTZJ771S/W3bC6akAMIpwLLpxVdXLODTabWDHBGoKGjADFm/ TqNLXZ6uAIYiJNdr5payrEJHQebxL2Zz0E1WconNHVWwdkhAe9oSo+fSAKunmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886875; 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=4thjqk06PAC51pOMOTPF8ETngeGfrVOo3TNMYdEenIA=; b=QUEU8Xbzi99gYLvCQ3CQp5znOVPD5tJCENMJ/3H3hk/jTPMYFYqu2vwt8AKRepk5KCjcaC Uu1eIqlbQyhCFLDA== 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 V3 60/60] x86/apic: Turn on static calls References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:47:55 +0200 (CEST) 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,T_SCC_BODY_TEXT_LINE,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: INBOX X-GMAIL-THRID: 1773028638291976648 X-GMAIL-MSGID: 1773028638291976648 Convert all the APIC callback inline wrappers from apic->foo() to static_call(apic_call_foo)(), except for the safe_wait_icr_idle() one which is only used during SMP bringup when sending INIT/SIPI. That really can do the conditional callback. The regular wait_icr_idle() matters as it is used in irq_work_raise(), so X2APIC machines spare the conditional. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/apic.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -394,68 +394,67 @@ DECLARE_APIC_CALL(write); static __always_inline u32 apic_read(u32 reg) { - return apic->read(reg); + return static_call(apic_call_read)(reg); } static __always_inline void apic_write(u32 reg, u32 val) { - apic->write(reg, val); + static_call(apic_call_write)(reg, val); } static __always_inline void apic_eoi(void) { - apic->eoi(); + static_call(apic_call_eoi)(); } static __always_inline void apic_native_eoi(void) { - apic->native_eoi(); + static_call(apic_call_native_eoi)(); } static __always_inline u64 apic_icr_read(void) { - return apic->icr_read(); + return static_call(apic_call_icr_read)(); } static __always_inline void apic_icr_write(u32 low, u32 high) { - apic->icr_write(low, high); + static_call(apic_call_icr_write)(low, high); } static __always_inline void __apic_send_IPI(int cpu, int vector) { - apic->send_IPI(cpu, vector); + static_call(apic_call_send_IPI)(cpu, vector); } static __always_inline void __apic_send_IPI_mask(const struct cpumask *mask, int vector) { - apic->send_IPI_mask(mask, vector); + static_call_mod(apic_call_send_IPI_mask)(mask, vector); } static __always_inline void __apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) { - apic->send_IPI_mask_allbutself(mask, vector); + static_call(apic_call_send_IPI_mask_allbutself)(mask, vector); } static __always_inline void __apic_send_IPI_allbutself(int vector) { - apic->send_IPI_allbutself(vector); + static_call(apic_call_send_IPI_allbutself)(vector); } static __always_inline void __apic_send_IPI_all(int vector) { - apic->send_IPI_all(vector); + static_call(apic_call_send_IPI_all)(vector); } static __always_inline void __apic_send_IPI_self(int vector) { - apic->send_IPI_self(vector); + static_call_mod(apic_call_send_IPI_self)(vector); } static __always_inline void apic_wait_icr_idle(void) { - if (apic->wait_icr_idle) - apic->wait_icr_idle(); + static_call_cond(apic_call_wait_icr_idle)(); } static __always_inline u32 safe_apic_wait_icr_idle(void)