lkml.org 
[lkml]   [2023]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch V2 53/58] x86/apic: Convert other overrides to apic_update_callback()
    Date
    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 <tglx@linutronix.de>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    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)
    \
     
     \ /
      Last update: 2023-07-24 15:46    [W:4.099 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site