[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen staging] x86/cpuidle: patch some indirect calls to direct ones
commit 51efb4d8f2c1d08bf53c1ba8acdfcb58caeb9d65 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Fri May 17 14:39:38 2019 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Fri May 17 14:39:38 2019 +0200 x86/cpuidle: patch some indirect calls to direct ones For now only the ones used during entering/exiting of idle states are converted. Additionally pm_idle{,_save} and lapic_timer_{on,off} can't be converted, as they may get established rather late (when Dom0 is already active). Note that for patching to be deferred until after the pre-SMP initcalls (from where cpuidle_init_cpu() runs the first time) the pointers need to start out as NULL. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- xen/arch/x86/acpi/cpu_idle.c | 38 +++++++++++++++++++++++--------------- xen/arch/x86/cpu/mwait-idle.c | 4 ++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 654de24f40..cc388a27cc 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -102,8 +102,6 @@ bool lapic_timer_init(void) return true; } -static uint64_t (*__read_mostly tick_to_ns)(uint64_t) = acpi_pm_tick_to_ns; - void (*__read_mostly pm_idle_save)(void); unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER - 1; integer_param("max_cstate", max_cstate); @@ -289,9 +287,9 @@ static uint64_t acpi_pm_ticks_elapsed(uint64_t t1, uint64_t t2) return ((0xFFFFFFFF - t1) + t2 +1); } -uint64_t (*__read_mostly cpuidle_get_tick)(void) = get_acpi_pm_tick; -static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t) - = acpi_pm_ticks_elapsed; +uint64_t (*__read_mostly cpuidle_get_tick)(void); +static uint64_t (*__read_mostly tick_to_ns)(uint64_t); +static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t); static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) { @@ -548,7 +546,7 @@ void update_idle_stats(struct acpi_processor_power *power, struct acpi_processor_cx *cx, uint64_t before, uint64_t after) { - int64_t sleep_ticks = ticks_elapsed(before, after); + int64_t sleep_ticks = alternative_call(ticks_elapsed, before, after); /* Interrupts are disabled */ spin_lock(&power->stat_lock); @@ -556,7 +554,8 @@ void update_idle_stats(struct acpi_processor_power *power, cx->usage++; if ( sleep_ticks > 0 ) { - power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; + power->last_residency = alternative_call(tick_to_ns, sleep_ticks) / + 1000UL; cx->time += sleep_ticks; } power->last_state = &power->states[0]; @@ -636,7 +635,7 @@ static void acpi_processor_idle(void) if ( cx->type == ACPI_STATE_C1 || local_apic_timer_c2_ok ) { /* Get start time (ticks) */ - t1 = cpuidle_get_tick(); + t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); @@ -645,7 +644,7 @@ static void acpi_processor_idle(void) /* Invoke C2 */ acpi_idle_do_entry(cx); /* Get end time (ticks) */ - t2 = cpuidle_get_tick(); + t2 = alternative_call(cpuidle_get_tick); trace_exit_reason(irq_traced); /* Trace cpu idle exit */ TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, @@ -667,7 +666,7 @@ static void acpi_processor_idle(void) lapic_timer_off(); /* Get start time (ticks) */ - t1 = cpuidle_get_tick(); + t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); @@ -718,7 +717,7 @@ static void acpi_processor_idle(void) } /* Get end time (ticks) */ - t2 = cpuidle_get_tick(); + t2 = alternative_call(cpuidle_get_tick); /* recovering TSC */ cstate_restore_tsc(); @@ -828,11 +827,20 @@ int cpuidle_init_cpu(unsigned int cpu) { unsigned int i; - if ( cpu == 0 && boot_cpu_has(X86_FEATURE_NONSTOP_TSC) ) + if ( cpu == 0 && system_state < SYS_STATE_active ) { - cpuidle_get_tick = get_stime_tick; - ticks_elapsed = stime_ticks_elapsed; - tick_to_ns = stime_tick_to_ns; + if ( boot_cpu_has(X86_FEATURE_NONSTOP_TSC) ) + { + cpuidle_get_tick = get_stime_tick; + ticks_elapsed = stime_ticks_elapsed; + tick_to_ns = stime_tick_to_ns; + } + else + { + cpuidle_get_tick = get_acpi_pm_tick; + ticks_elapsed = acpi_pm_ticks_elapsed; + tick_to_ns = acpi_pm_tick_to_ns; + } } acpi_power = xzalloc(struct acpi_processor_power); diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index f89c52f256..dab2be0f07 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -778,7 +778,7 @@ static void mwait_idle(void) if (!(lapic_timer_reliable_states & (1 << cstate))) lapic_timer_off(); - before = cpuidle_get_tick(); + before = alternative_call(cpuidle_get_tick); TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); update_last_cx_stat(power, cx, before); @@ -786,7 +786,7 @@ static void mwait_idle(void) if (cpu_is_haltable(cpu)) mwait_idle_with_hints(eax, MWAIT_ECX_INTERRUPT_BREAK); - after = cpuidle_get_tick(); + after = alternative_call(cpuidle_get_tick); cstate_restore_tsc(); trace_exit_reason(irq_traced); -- generated by git-patchbot for /home/xen/git/xen.git#staging _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |