From patchwork Mon Jul 24 13:35:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 125047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1843953vqg; Mon, 24 Jul 2023 07:38:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFiLsaNlDnMiYJYaekAAJd8LomxptoIUxSH8QuugPMK8F6exoNvRJySA1Qmqrn2G4tYsR4L X-Received: by 2002:a05:6a20:324d:b0:12c:b10d:693d with SMTP id hm13-20020a056a20324d00b0012cb10d693dmr7868024pzc.6.1690209523143; Mon, 24 Jul 2023 07:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209523; cv=none; d=google.com; s=arc-20160816; b=NUga/ZgVTKKVYCXUuRB19hGC/+l+DPQUig6kGsC1fh3+RMDrW+hVV0SztvmsOHg+5W 0amHegjJNuFGEO53gcI8fkhFYXe8SpwAEulqrGJ3xXbMNtnTGu7RkfXz4dizgCIbrMai em1EmFzs+5Aojx18xt9IXzFr6cEL8aml+GJidGpLELtbA3LdhEOojNTh2oGodushrwjh mk1Fo72x1Pe+3WOZr17pK6CHBqowaYrWxSXJvla6DrtGO8VxJXApiuT0RrFxT//tcbe3 GK/UnEYgZJOxWjkTUzqZuC8UtSrhVlflmWW20SEXx2Ihf0j4SAQ54GKcxpTbXtUCewpD A9Ew== 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=TEFG8gkU/838HFgL72fmh8n+4W7BVeF0i1tCpnYKDqA=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=PYVtKyeZydgGLim7ZtSh2gZp+DpqNxtPtR+StuGw78asC+Lo5JaTeuucVMugltkQub 7v5HEF1JQPFK4eNTtWbWgCGC2/qhwsu5syaZcqY5/Im3A7SMgNF9TAK4n+mesc71j+Lt /B5TnfY/wqEFZYlOsRLcM+7eHPMAWO4hnaiGHJSlPvSsa6Tz2Gf62jAdT5hXq7wYeU01 wOMumzL6OZE9WzZp/xRMdFJVf+6Dry/3aaBMvxxyMNhomE9Miujua1/IUDkU/HIFtJI5 Un3ZbuF7f8cCD77KT8Qkh0rd0MbJWb17kXGTc9zomRiuOCbU4gQyHhWgp0x11uIwbkb2 UzsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=sKfkzUVy; dkim=neutral (no key) header.i=@linutronix.de header.b=NPI3br6i; 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 w21-20020a639355000000b00553ebb05d26si9034719pgm.108.2023.07.24.07.38.29; Mon, 24 Jul 2023 07:38:43 -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=sKfkzUVy; dkim=neutral (no key) header.i=@linutronix.de header.b=NPI3br6i; 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 S230367AbjGXNo7 (ORCPT + 99 others); Mon, 24 Jul 2023 09:44:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232412AbjGXNnv (ORCPT ); Mon, 24 Jul 2023 09:43:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D2904239 for ; Mon, 24 Jul 2023 06:42:00 -0700 (PDT) Message-ID: <20230724132047.723609015@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205716; 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=TEFG8gkU/838HFgL72fmh8n+4W7BVeF0i1tCpnYKDqA=; b=sKfkzUVy7QCHxkmEtuhjJVDzeyeCn0z1EaEmJU+lmFh5LqL2mLNOpzMfOaipdgzerFwg4I fGX6f77UuwcAoejLHAVhIKA4zshTSLZhHYez+bxyElXG0eIypueIOnJtLIrmRL0YMGEH1z X1I7V0KxX3IW9NnQPzPHGIXRGxR6I5PYwkz8NiuA55t7j55T9UcEJUff0bisB6p3alDWNT UeeUlYUP2Ucs0bUdNo07oOUl7+X3qdM/RgrHD0Y577rYHytGW30QtGUMPuzk4qtdQ/QaCf sPFTgkNK6iaivljhIy98VIleU8sA3UXEILBO8qEgjKVbqSZN1IkqMmSJ6PKFXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205716; 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=TEFG8gkU/838HFgL72fmh8n+4W7BVeF0i1tCpnYKDqA=; b=NPI3br6icwm9rdWumGYVlVEIhQxrTotmH6KhWy8D2X4suHUPgbYKW0qgcMWHbMGbUPcCJA sGMESiV7EV+NFUCQ== 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 53/58] x86/apic: Convert other overrides to apic_update_callback() References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:35:16 +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: 1772313140496238611 X-GMAIL-MSGID: 1772313140496238611 Convert all places which just assign a new function directly to the apic callback to use apic_update_callback() which prepares for using static calls. Mark snp_set_wakeup_secondary_cpu() and kvm_setup_pv_ipi() __init, as they are only invoked from init code and otherwise trigger a section mismatch as they are now invoking a __init function. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- V2: Mark snp_set_wakeup_secondary_cpu() and kvm_setup_pv_ipi() __init. --- arch/x86/hyperv/hv_apic.c | 20 ++++++++++---------- arch/x86/kernel/kvm.c | 6 +++--- arch/x86/kernel/sev.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) --- a/arch/x86/hyperv/hv_apic.c +++ b/arch/x86/hyperv/hv_apic.c @@ -288,12 +288,12 @@ void __init hv_apic_init(void) */ orig_apic = *apic; - apic->send_IPI = hv_send_ipi; - apic->send_IPI_mask = hv_send_ipi_mask; - apic->send_IPI_mask_allbutself = hv_send_ipi_mask_allbutself; - apic->send_IPI_allbutself = hv_send_ipi_allbutself; - apic->send_IPI_all = hv_send_ipi_all; - apic->send_IPI_self = hv_send_ipi_self; + apic_update_callback(send_IPI, hv_send_ipi); + apic_update_callback(send_IPI_mask, hv_send_ipi_mask); + apic_update_callback(send_IPI_mask_allbutself, hv_send_ipi_mask_allbutself); + apic_update_callback(send_IPI_allbutself, hv_send_ipi_allbutself); + apic_update_callback(send_IPI_all, hv_send_ipi_all); + apic_update_callback(send_IPI_self, hv_send_ipi_self); } if (ms_hyperv.hints & HV_X64_APIC_ACCESS_RECOMMENDED) { @@ -312,10 +312,10 @@ void __init hv_apic_init(void) */ apic_update_callback(eoi, hv_apic_eoi_write); if (!x2apic_enabled()) { - apic->read = hv_apic_read; - apic->write = hv_apic_write; - apic->icr_write = hv_apic_icr_write; - apic->icr_read = hv_apic_icr_read; + apic_update_callback(read, hv_apic_read); + apic_update_callback(write, hv_apic_write); + apic_update_callback(icr_write, hv_apic_icr_write); + apic_update_callback(icr_read, hv_apic_icr_read); } } } --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -622,10 +622,10 @@ late_initcall(setup_efi_kvm_sev_migratio /* * Set the IPI entry points */ -static void kvm_setup_pv_ipi(void) +static __init void kvm_setup_pv_ipi(void) { - apic->send_IPI_mask = kvm_send_ipi_mask; - apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; + apic_update_callback(send_IPI_mask, kvm_send_ipi_mask); + apic_update_callback(send_IPI_mask_allbutself, kvm_send_ipi_mask_allbutself); pr_info("setup PV IPIs\n"); } --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -1089,7 +1089,7 @@ static int wakeup_cpu_via_vmgexit(int ap return ret; } -void snp_set_wakeup_secondary_cpu(void) +void __init snp_set_wakeup_secondary_cpu(void) { if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) return; @@ -1099,7 +1099,7 @@ void snp_set_wakeup_secondary_cpu(void) * required method to start APs under SNP. If the hypervisor does * not support AP creation, then no APs will be started. */ - apic->wakeup_secondary_cpu = wakeup_cpu_via_vmgexit; + apic_update_callback(wakeup_secondary_cpu, wakeup_cpu_via_vmgexit); } int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)