From: "Jan Beulich" Subject: [PATCH] x86/cpufreq: don't use static array for large per-CPU data structures Date: Fri, 19 Sep 2008 14:09:50 +0100 Message-ID: <48D3C0BE.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org ... as this is rather wasteful when Xen is configured to support many CPUs but is running on systems having only a few. Signed-off-by: Jan Beulich Index: 2008-09-19/xen/arch/x86/acpi/cpufreq/cpufreq.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/acpi/cpufreq/cpufreq.c 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/arch/x86/acpi/cpufreq/cpufreq.c 2008-09-19 = 14:32:34.000000000 +0200 @@ -389,12 +389,15 @@ static int acpi_cpufreq_target(struct cp =20 static int acpi_cpufreq_verify(struct cpufreq_policy *policy) { - struct acpi_cpufreq_data *data =3D drv_data[policy->cpu]; - struct processor_performance *perf =3D &processor_pminfo[policy->cpu].= perf; + struct acpi_cpufreq_data *data; + struct processor_performance *perf; =20 - if (!policy || !data) + if (!policy || !(data =3D drv_data[policy->cpu]) || + !processor_pminfo[policy->cpu]) return -EINVAL; =20 + perf =3D &processor_pminfo[policy->cpu]->perf; + cpufreq_verify_within_limits(policy, 0,=20 perf->states[perf->platform_limit].core_frequency * 1000); =20 @@ -447,7 +450,7 @@ acpi_cpufreq_cpu_init(struct cpufreq_pol =20 drv_data[cpu] =3D data; =20 - data->acpi_data =3D &processor_pminfo[cpu].perf; + data->acpi_data =3D &processor_pminfo[cpu]->perf; =20 perf =3D data->acpi_data; policy->shared_type =3D perf->shared_type; @@ -580,11 +583,11 @@ static struct cpufreq_driver acpi_cpufre =20 int cpufreq_limit_change(unsigned int cpu) { - struct processor_performance *perf =3D &processor_pminfo[cpu].perf; + struct processor_performance *perf =3D &processor_pminfo[cpu]->perf; struct cpufreq_policy *data =3D cpufreq_cpu_policy[cpu]; struct cpufreq_policy policy; =20 - if (!cpu_online(cpu) || !data) + if (!cpu_online(cpu) || !data || !processor_pminfo[cpu]) return -ENODEV; =20 if ((perf->platform_limit < 0) ||=20 @@ -607,10 +610,10 @@ int cpufreq_add_cpu(unsigned int cpu) unsigned int j; struct cpufreq_policy new_policy; struct cpufreq_policy *policy; - struct processor_performance *perf =3D &processor_pminfo[cpu].perf; + struct processor_performance *perf =3D &processor_pminfo[cpu]->perf; =20 /* to protect the case when Px was not controlled by xen */ - if (!(perf->init & XEN_PX_INIT)) + if (!processor_pminfo[cpu] || !(perf->init & XEN_PX_INIT)) return 0; =20 if (cpu_is_offline(cpu) || cpufreq_cpu_policy[cpu]) @@ -683,10 +686,10 @@ int cpufreq_del_cpu(unsigned int cpu) { unsigned int dom; struct cpufreq_policy *policy; - struct processor_performance *perf =3D &processor_pminfo[cpu].perf; + struct processor_performance *perf =3D &processor_pminfo[cpu]->perf; =20 /* to protect the case when Px was not controlled by xen */ - if (!(perf->init & XEN_PX_INIT)) + if (!processor_pminfo[cpu] || !(perf->init & XEN_PX_INIT)) return 0; =20 if (cpu_is_offline(cpu) || !cpufreq_cpu_policy[cpu]) Index: 2008-09-19/xen/arch/x86/acpi/cpufreq/powernow.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/acpi/cpufreq/powernow.c 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/arch/x86/acpi/cpufreq/powernow.c 2008-09-19 = 13:44:18.000000000 +0200 @@ -49,9 +49,6 @@ #define MSR_PSTATE_CTRL 0xc0010062 /* Pstate control MSR */ #define MSR_PSTATE_CUR_LIMIT 0xc0010061 /* pstate current limit MSR */ =20 -extern struct processor_pminfo processor_pminfo[NR_CPUS]; -extern struct cpufreq_policy *cpufreq_cpu_policy[NR_CPUS]; - struct powernow_cpufreq_data { struct processor_performance *acpi_data; struct cpufreq_frequency_table *freq_table; @@ -149,7 +146,7 @@ static int powernow_cpufreq_cpu_init(str =20 drv_data[cpu] =3D data; =20 - data->acpi_data =3D &processor_pminfo[cpu].perf; + data->acpi_data =3D &processor_pminfo[cpu]->perf; =20 perf =3D data->acpi_data; policy->shared_type =3D perf->shared_type; @@ -257,8 +254,8 @@ int powernow_cpufreq_init(void) } if (ret) return ret; - if (max_dom < processor_pminfo[i].perf.domain_info.domain) - max_dom =3D processor_pminfo[i].perf.domain_info.domain; + if (max_dom < processor_pminfo[i]->perf.domain_info.domain) + max_dom =3D processor_pminfo[i]->perf.domain_info.domain; } max_dom++; =20 @@ -274,13 +271,13 @@ int powernow_cpufreq_init(void) =20 /* get cpumask of each psd domain */ for_each_online_cpu(i) { - __set_bit(processor_pminfo[i].perf.domain_info.domain, dom_mask); - cpu_set(i, pt[processor_pminfo[i].perf.domain_info.domain]); + __set_bit(processor_pminfo[i]->perf.domain_info.domain, dom_mask);= + cpu_set(i, pt[processor_pminfo[i]->perf.domain_info.domain]); } =20 for_each_online_cpu(i) - processor_pminfo[i].perf.shared_cpu_map =3D=20 - pt[processor_pminfo[i].perf.domain_info.domain]; + processor_pminfo[i]->perf.shared_cpu_map =3D + pt[processor_pminfo[i]->perf.domain_info.domain]; =20 cpufreq_driver =3D &powernow_cpufreq_driver; =20 Index: 2008-09-19/xen/arch/x86/acpi/cpufreq/utility.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/acpi/cpufreq/utility.c 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/arch/x86/acpi/cpufreq/utility.c 2008-09-19 = 13:54:43.000000000 +0200 @@ -32,8 +32,8 @@ #include =20 struct cpufreq_driver *cpufreq_driver; -struct processor_pminfo processor_pminfo[NR_CPUS]; -struct cpufreq_policy *cpufreq_cpu_policy[NR_CPUS]; +struct processor_pminfo *__read_mostly processor_pminfo[NR_CPUS]; +struct cpufreq_policy *__read_mostly cpufreq_cpu_policy[NR_CPUS]; =20 /********************************************************************* * Px STATISTIC INFO * @@ -47,11 +47,14 @@ void px_statistic_update(cpumask_t cpuma now =3D NOW(); =20 for_each_cpu_mask(i, cpumask) { - struct pm_px *pxpt =3D &px_statistic_data[i]; - uint32_t statnum =3D processor_pminfo[i].perf.state_count; + struct pm_px *pxpt =3D px_statistic_data[i]; + struct processor_pminfo *pmpt =3D processor_pminfo[i]; uint64_t total_idle_ns; uint64_t tmp_idle_ns; =20 + if ( !pxpt || !pmpt ) + continue; + total_idle_ns =3D get_cpu_idle_time(i); tmp_idle_ns =3D total_idle_ns - pxpt->prev_idle_wall; =20 @@ -61,7 +64,7 @@ void px_statistic_update(cpumask_t cpuma pxpt->u.pt[from].residency +=3D now - pxpt->prev_state_wall; pxpt->u.pt[from].residency -=3D tmp_idle_ns; =20 - (*(pxpt->u.trans_pt + from*statnum + to))++; + (*(pxpt->u.trans_pt + from * pmpt->perf.state_count + to))++; =20 pxpt->prev_state_wall =3D now; pxpt->prev_idle_wall =3D total_idle_ns; @@ -71,11 +74,23 @@ void px_statistic_update(cpumask_t cpuma int px_statistic_init(unsigned int cpuid) { uint32_t i, count; - struct pm_px *pxpt =3D &px_statistic_data[cpuid]; - struct processor_pminfo *pmpt =3D &processor_pminfo[cpuid]; + struct pm_px *pxpt =3D px_statistic_data[cpuid]; + const struct processor_pminfo *pmpt =3D processor_pminfo[cpuid]; =20 count =3D pmpt->perf.state_count; =20 + if ( !pmpt ) + return -EINVAL; + + if ( !pxpt ) + { + pxpt =3D xmalloc(struct pm_px); + if ( !pxpt ) + return -ENOMEM; + memset(pxpt, 0, sizeof(*pxpt)); + px_statistic_data[cpuid] =3D pxpt; + } + pxpt->u.trans_pt =3D xmalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) return -ENOMEM; @@ -103,8 +118,10 @@ int px_statistic_init(unsigned int cpuid =20 void px_statistic_exit(unsigned int cpuid) { - struct pm_px *pxpt =3D &px_statistic_data[cpuid]; + struct pm_px *pxpt =3D px_statistic_data[cpuid]; =20 + if (!pxpt) + return; xfree(pxpt->u.trans_pt); xfree(pxpt->u.pt); memset(pxpt, 0, sizeof(struct pm_px)); @@ -113,9 +130,13 @@ void px_statistic_exit(unsigned int cpui void px_statistic_reset(unsigned int cpuid) { uint32_t i, j, count; - struct pm_px *pxpt =3D &px_statistic_data[cpuid]; + struct pm_px *pxpt =3D px_statistic_data[cpuid]; + const struct processor_pminfo *pmpt =3D processor_pminfo[cpuid]; =20 - count =3D processor_pminfo[cpuid].perf.state_count; + if ( !pxpt || !pmpt ) + return; + + count =3D pmpt->perf.state_count; =20 for (i=3D0; i < count; i++) { pxpt->u.pt[i].residency =3D 0; Index: 2008-09-19/xen/arch/x86/acpi/cpu_idle.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/acpi/cpu_idle.c 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/arch/x86/acpi/cpu_idle.c 2008-09-19 13:51:21.0000000= 00 +0200 @@ -64,7 +64,7 @@ static void (*pm_idle_save) (void) __rea unsigned int max_cstate __read_mostly =3D 2; integer_param("max_cstate", max_cstate); =20 -static struct acpi_processor_power processor_powers[NR_CPUS]; +static struct acpi_processor_power *__read_mostly processor_powers[NR_CPUS= ]; =20 static void print_acpi_power(uint32_t cpu, struct acpi_processor_power = *power) { @@ -93,8 +93,11 @@ static void print_acpi_power(uint32_t cp =20 static void dump_cx(unsigned char key) { - for( int i =3D 0; i < num_online_cpus(); i++ ) - print_acpi_power(i, &processor_powers[i]); + unsigned int cpu; + + for_each_online_cpu ( cpu ) + if (processor_powers[cpu]) + print_acpi_power(cpu, processor_powers[cpu]); } =20 static int __init cpu_idle_key_init(void) @@ -195,14 +198,12 @@ static struct { =20 static void acpi_processor_idle(void) { - struct acpi_processor_power *power =3D NULL; + struct acpi_processor_power *power =3D processor_powers[smp_processor_= id()]; struct acpi_processor_cx *cx =3D NULL; int next_state; int sleep_ticks =3D 0; u32 t1, t2 =3D 0; =20 - power =3D &processor_powers[smp_processor_id()]; - /* * Interrupts must be disabled during bus mastering calculations and * for C2/C3 transitions. @@ -215,7 +216,7 @@ static void acpi_processor_idle(void) return; } =20 - next_state =3D cpuidle_current_governor->select(power); + next_state =3D power ? cpuidle_current_governor->select(power) : -1; if ( next_state > 0 ) { cx =3D &power->states[next_state]; @@ -670,7 +671,15 @@ long set_cx_pminfo(uint32_t cpu, struct=20 return -EFAULT; } =20 - acpi_power =3D &processor_powers[cpu_id]; + acpi_power =3D processor_powers[cpu_id]; + if ( !acpi_power ) + { + acpi_power =3D xmalloc(struct acpi_processor_power); + if ( !acpi_power ) + return -ENOMEM; + memset(acpi_power, 0, sizeof(*acpi_power)); + processor_powers[cpu_id] =3D acpi_power; + } =20 init_cx_pminfo(acpi_power); =20 @@ -708,18 +717,25 @@ long set_cx_pminfo(uint32_t cpu, struct=20 =20 uint32_t pmstat_get_cx_nr(uint32_t cpuid) { - return processor_powers[cpuid].count; + return processor_powers[cpuid] ? processor_powers[cpuid]->count : 0; } =20 int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) { - struct acpi_processor_power *power =3D &processor_powers[cpuid]; + const struct acpi_processor_power *power =3D processor_powers[cpuid]; struct vcpu *v =3D idle_vcpu[cpuid]; uint64_t usage; int i; =20 + if ( unlikely(!power) ) + { + stat->last =3D 0; + stat->nr =3D 0; + stat->idle_time =3D 0; + return 0; + } stat->last =3D (power->last_state) ? power->last_state->type : 0; - stat->nr =3D processor_powers[cpuid].count; + stat->nr =3D power->count; stat->idle_time =3D v->runstate.time[RUNSTATE_running]; if ( v->is_running ) stat->idle_time +=3D NOW() - v->runstate.state_entry_time; Index: 2008-09-19/xen/arch/x86/acpi/pmstat.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/acpi/pmstat.c 2008-09-19 14:28:30.0000000= 00 +0200 +++ 2008-09-19/xen/arch/x86/acpi/pmstat.c 2008-09-19 13:36:55.0000000= 00 +0200 @@ -40,7 +40,7 @@ #include #include =20 -struct pm_px px_statistic_data[NR_CPUS]; +struct pm_px *__read_mostly px_statistic_data[NR_CPUS]; =20 extern uint32_t pmstat_get_cx_nr(uint32_t cpuid); extern int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat); @@ -49,15 +49,14 @@ extern int pmstat_reset_cx_stat(uint32_t int do_get_pm_info(struct xen_sysctl_get_pmstat *op) { int ret =3D 0; - struct pm_px *pxpt =3D &px_statistic_data[op->cpuid]; - struct processor_pminfo *pmpt =3D &processor_pminfo[op->cpuid]; + const struct processor_pminfo *pmpt =3D processor_pminfo[op->cpuid]; =20 /* to protect the case when Px was not controlled by xen */ - if ( (!(pmpt->perf.init & XEN_PX_INIT)) &&=20 + if ( (!pmpt || !(pmpt->perf.init & XEN_PX_INIT)) && (op->type & PMSTAT_CATEGORY_MASK) =3D=3D PMSTAT_PX ) return -EINVAL; =20 - if ( !cpu_online(op->cpuid) ) + if ( op->cpuid >=3D NR_CPUS || !cpu_online(op->cpuid) ) return -EINVAL; =20 switch( op->type ) @@ -73,6 +72,10 @@ int do_get_pm_info(struct xen_sysctl_get uint64_t now, ct; uint64_t total_idle_ns; uint64_t tmp_idle_ns; + struct pm_px *pxpt =3D px_statistic_data[op->cpuid]; + + if ( !pxpt ) + return -ENODATA; =20 total_idle_ns =3D get_cpu_idle_time(op->cpuid); tmp_idle_ns =3D total_idle_ns - pxpt->prev_idle_wall; Index: 2008-09-19/xen/arch/x86/platform_hypercall.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/arch/x86/platform_hypercall.c 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/arch/x86/platform_hypercall.c 2008-09-19 = 13:36:55.000000000 +0200 @@ -380,8 +380,19 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe ret =3D -EINVAL; break; } - pmpt =3D &processor_pminfo[cpuid]; - pxpt =3D &processor_pminfo[cpuid].perf; + pmpt =3D processor_pminfo[cpuid]; + if ( !pmpt ) + { + pmpt =3D xmalloc(struct processor_pminfo); + if ( !pmpt ) + { + ret =3D -ENOMEM; + break; + } + memset(pmpt, 0, sizeof(*pmpt)); + processor_pminfo[cpuid] =3D pmpt; + } + pxpt =3D &pmpt->perf; pmpt->acpi_id =3D xenpmpt->id; pmpt->id =3D cpuid; =20 Index: 2008-09-19/xen/include/acpi/cpufreq/processor_perf.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2008-09-19.orig/xen/include/acpi/cpufreq/processor_perf.h 2008-09-19 = 14:28:30.000000000 +0200 +++ 2008-09-19/xen/include/acpi/cpufreq/processor_perf.h 2008-09-19 = 13:36:55.000000000 +0200 @@ -41,7 +41,7 @@ struct processor_pminfo { struct processor_performance perf; }; =20 -extern struct processor_pminfo processor_pminfo[NR_CPUS]; +extern struct processor_pminfo *processor_pminfo[NR_CPUS]; =20 struct px_stat { uint8_t total; /* total Px states */ @@ -58,6 +58,6 @@ struct pm_px { uint64_t prev_idle_wall; }; =20 -extern struct pm_px px_statistic_data[NR_CPUS]; +extern struct pm_px *px_statistic_data[NR_CPUS]; =20 #endif /* __XEN_PROCESSOR_PM_H__ */