linaro-dev September 2014

linaro-dev@lists.linaro.org

23 participants
34 discussions

[PATCH v2] idlestat: Allocate struct cpufreq_pstate dynamically

by pi-cheng.chen

When using intel_pstate driver, "scaling_available_freqs" attr is not exported to sysfs. It causes assertion of idlestat due to memory of struct cpufreq_pstate was not allocated. Allocate struct cpufreq_pstate dynamically when getting frequency information from trace file instead of parsing available frequencies from sysfs Changes v1 to v2: Sort the cpufreq_pstate list when parsing events Signed-off-by: Pi-Cheng Chen <pi-cheng.chen(a)linaro.org> --- idlestat.c | 118 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/idlestat.c b/idlestat.c index da615cb..d03f12e 100644 --- a/idlestat.c +++ b/idlestat.c @@ -561,8 +561,8 @@ static void release_pstate_info(struct cpufreq_pstates *pstates, int nrcpus) } /** - * build_pstate_info - parse cpufreq sysfs entries and build per-CPU - * structs to maintain statistics of P-state transitions + * build_pstate_info - allocate and initialize per-CPU structs to + * maintain statistics of P-state transitions * @nrcpus: number of CPUs * * Return: per-CPU array of structs (success) or NULL (error) @@ -578,55 +578,8 @@ static struct cpufreq_pstates *build_pstate_info(int nrcpus) memset(pstates, 0, sizeof(*pstates) * nrcpus); for (cpu = 0; cpu < nrcpus; cpu++) { - struct cpufreq_pstate *pstate; - int nrfreq; - char *fpath, *freq, line[256]; - FILE *sc_av_freq; - - if (asprintf(&fpath, CPUFREQ_AVFREQ_PATH_FORMAT, cpu) < 0) - goto clean_exit; - - /* read scaling_available_frequencies for the CPU */ - sc_av_freq = fopen(fpath, "r"); - free(fpath); - if (!sc_av_freq) { - fprintf(stderr, "warning: P-states not supported for " - "CPU%d\n", cpu); - continue; - } - freq = fgets(line, sizeof(line)/sizeof(line[0]), sc_av_freq); - fclose(sc_av_freq); - if (!freq) { - /* unlikely to be here, but just in case... */ - fprintf(stderr, "warning: P-state info not found for " - "CPU%d\n", cpu); - continue; - } - - /* tokenize line and populate each frequency */ - nrfreq = 0; - pstate = NULL; - while ((freq = strtok(freq, "\n ")) != NULL) { - struct cpufreq_pstate *tmp = realloc(pstate, sizeof(*pstate) * (nrfreq+1)); - if (!tmp) - goto clean_exit; - pstate = tmp; - - /* initialize pstate record */ - pstate[nrfreq].id = nrfreq; - pstate[nrfreq].freq = atol(freq); - pstate[nrfreq].count = 0; - pstate[nrfreq].min_time = DBL_MAX; - pstate[nrfreq].max_time = 0.; - pstate[nrfreq].avg_time = 0.; - pstate[nrfreq].duration = 0.; - nrfreq++; - freq = NULL; - } - - /* now populate cpufreq_pstates for this CPU */ - pstates[cpu].pstate = pstate; - pstates[cpu].max = nrfreq; + pstates[cpu].pstate = NULL; + pstates[cpu].max = 0; pstates[cpu].current = -1; /* unknown */ pstates[cpu].idle = -1; /* unknown */ pstates[cpu].time_enter = 0.; @@ -634,10 +587,52 @@ static struct cpufreq_pstates *build_pstate_info(int nrcpus) } return pstates; +} -clean_exit: - release_pstate_info(pstates, nrcpus); - return NULL; +/** + * alloc_pstate - allocate, sort, and initialize pstate struct + * to maintain statistics of P-state transitions + * @pstates: per-CPU P-state statistics struct + * @freq: frequency for which the newly pstate is allocated + * + * Return: the index of the newly allocated pstate struct + */ +static int alloc_pstate(struct cpufreq_pstates *pstates, unsigned int freq) +{ + struct cpufreq_pstate *pstate, *tmp; + int nrfreq, i, next = 0; + + pstate = pstates->pstate; + nrfreq = pstates->max; + + tmp = realloc(pstate, sizeof(*pstate) * (nrfreq + 1)); + if (!tmp) { + perror("realloc pstate"); + return -1; + } + pstate = tmp; + pstates->pstate = tmp; + pstates->max = nrfreq + 1; + + for (i = 0; i < nrfreq && freq <= pstate[i].freq; i++) + ; + + next = i; + for (i = nrfreq; i > next && i > 0; i--) { + pstate[i] = pstate[i - 1]; + pstate[i].id = i; + pstates->current = (pstates->current == i - 1)? i : pstates->current; + } + + pstate[next].id = next; + pstate[next].freq = freq; + pstate[next].count = 0; + pstate[next].min_time = DBL_MAX; + pstate[next].max_time = 0; + pstate[next].avg_time = 0; + pstate[next].duration = 0; + + return next; } static int get_current_pstate(struct cpuidle_datas *datas, int cpu, @@ -712,6 +707,9 @@ static void cpu_change_pstate(struct cpuidle_datas *datas, int cpu, cur = get_current_pstate(datas, cpu, &ps, &p); next = freq_to_pstate_index(ps, freq); + if (next < 0) + next = alloc_pstate(ps, freq); + assert(next >= 0); switch (cur) { case 1: @@ -763,7 +761,6 @@ static int store_data(double time, int state, int cpu, struct cpuidle_datas *datas, int count) { struct cpuidle_cstates *cstates = &datas->cstates[cpu]; - struct cpufreq_pstate *pstate = datas->pstates[cpu].pstate; struct cpuidle_cstate *cstate; struct cpuidle_data *data, *tmp; int nrdata, last_cstate = cstates->last_cstate; @@ -826,9 +823,8 @@ static int store_data(double time, int state, int cpu, /* need indication if CPU is idle or not */ cstates->last_cstate = -1; - /* update P-state stats if supported */ - if (pstate) - cpu_pstate_running(datas, cpu, time); + /* update P-state stats */ + cpu_pstate_running(datas, cpu, time); return 0; } @@ -846,9 +842,8 @@ static int store_data(double time, int state, int cpu, cstates->cstate_max = MAX(cstates->cstate_max, state); cstates->last_cstate = state; cstates->wakeirq = NULL; - /* update P-state stats if supported */ - if (pstate) - cpu_pstate_idle(datas, cpu, time); + /* update P-state stats*/ + cpu_pstate_idle(datas, cpu, time); return 0; } @@ -1018,7 +1013,6 @@ static struct cpuidle_datas *idlestat_load(struct program_options *options) } else if (strstr(buffer, "cpu_frequency")) { assert(sscanf(buffer, TRACE_FORMAT, &time, &freq, &cpu) == 3); - assert(datas->pstates[cpu].pstate != NULL); cpu_change_pstate(datas, cpu, freq, time); count++; continue; -- 1.9.1

9 years, 7 months

[ACTIVITY] Week 38

by Bernhard Rosenkränzer

== Progress == * Attended connect, did talks * Finished toolchain 2014.09 binary release * Built Android toolchain 2014.09 * Built NDK 2014.09 * Got Android to build and boot to text mode+splash screen with clang * Found and fixed a couple of AOSP bugs * Worked on bug 667 == Plans == * Recover from Connect ;) * Upstream AOSP+clang patches * Work on getting AOSP+clang to boot to UI * Start builds of AOSP with gcc 5.0 snapshots * Start replacing things cbuild1 did for us that cbuild2 currently can't do == Issues == * outside of still waiting for 48h days, none.

9 years, 7 months

[Activity] Week 37

by Dileep Katta

== Progress == * Enabling UEFI Fastboot on Panda (CARD-198: 0 %) - On Hold * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 100%) - submitted v3 - worked on wiki == Plans == * connect, LCU14 (80%) * CARD 1103: fastboot flash command (CARD-1103: 20%) - work on comments from Wolfgang == Issues == *None

9 years, 7 months

Ubuntu Utopic Unicorn test rebuild (main, all architectures)

by Matthias Klose

A test rebuild of Utopic Unicorn was started this week for all architectures, and is finished for amd64, i386, armhf and ppc64el. The rebuild for arm64 and powerpc will finish this week. Results can be found at http://people.ubuntuwire.org/~wgrant/rebuild-ftbfs-test/test-rebuild-201409… The archive for the test rebuild is https://launchpad.net/ubuntu/+archive/test-rebuild-20140914 Additional build failures for packages in utopic-proposed (not yet in utopic) can be found at http://qa.ubuntuwire.com/ftbfs/ Please help fixing the build failures for the final release. Matthias

9 years, 7 months

[ACTIVITY] Week 37

by Andrey Konovalov

== Progress == * vacations (20%) * llct and linux-linaro trees have been updated to v3.17-rc4. The both are now using the Android topic by Amit P. 2014.09 linux-linaro kernel release notes are done (CARD-788: 80%) == Plans == * Linaro Connect

9 years, 7 months

Take your sex life to a new level . linaro-dev@lists.linaro.org

by Brees M-Patch

[![Put the M-Patch on - and in seconds your cock gets hard!](http://renoora.eu/img/ 300x250_v1.jpg)](http://renoora.eu/XLN1MAW3MDVK2KH/64d177af9dd93ed6862656554e1c7272) To unsubscribe , please [follow me](http://renoora.eu/ML9WJJCKEQTNPH8/64d177af9dd93ed6862656554e1c7272). ultimately pod rent eft halt pie banking raw otherwise faq . furniture pod pump ani ticket pod baltimore log liked dye . monday ways outside blur critical asp conscious log harvest sur . gallery pie honor on raw tun madison tent item tax . greeting odd copyrighted at liked care ministry dot fight chi . tonight fax hire odd fish pour unlikely pie recipe april . lunch odd listing on catalogue faq baltimore sol things dye . chi lap greens tent reminder at evening sure lightning tun . rent sur aloha news size wed reliance asp advertise dot . dispatch job weather at recommended pod wed dye circumstances pod . modify log lens sol harvest ani secondary april ireland blur . rising chad tub wed likelihood dye generator pat underline hat . job april unlikely la forwarding van clique bake zoom pod . ireland pie common faq drag lap date dot la hat . posted eft posted tax contribute tax bid tun capacity job . proprietary sol gender dot anterior sur chess ways graves tub . password van thursday tent slot ani prevention pie gender faq . presto chi compatibility sur remind chad quantity tag proverbs la . bundle tag powered ani puzzle at edit fax secondary dot . aloha tub candidate lap club fax australian ani ticket ram . page blur sharpen bake nearest hat pickup dot hunger sure . senior tun token pod outside tub posted wed may dot . community tag garden sur alert pat rent tent tub sure . advertise sur bid ram at job faq on wed pour . discount van fight ways change sur creepy wed care bit . shareware april eastman april inquiry tent reader chad format tag . riga sure gentile at herr odd administrator job topic care . strip news june chad settle bake catalogue tub residential job . secondary ways locator wed biography news pound fax forwarding tub . river odd embedded tun referral sol between sure root hat . confusion raw salem ani successfully bake hire log freight fax . settle frau slot on navigation news flight ways proverbs pour . tomorrow pour dot sure belong pour community job seller hat . barcelona pod double bake weather la grandfather ways ministry job . teamwork wed referral tub greeting chad christian pat invoice frau . ranking bake periodic pour tonight faq lightning log flight eft .

9 years, 7 months

(no subject)

by Riku Voipio

== Progress == * gcov CI DONE (CARD-1488 60%) * Blocked (BUG-632) on mainline Juno/kvm (CARD-1611 10%) * kvm ci, fix mustang qemu binary 10% * xen ci, debug failure on arndale 10% == Plans == * Connect == Issues == * How do I transport salmiakki vodka if using handluggage only?

9 years, 7 months

[ACTIVITY] Week 37

by Bernhard Rosenkränzer

== Progress == * debugged toolchain 2014.08 respin build failures * worked on toolchain 2014.09 binaries * created a Jenkins job to replace cbuild1 * built clang 3.5 final, updated daily builds to 3.6 * worked on Connect talk == Plans == * Finish toolchain binary releases * Create Android toolchain 2014.09 * Build NDK 2014.09 * Finish Connect talk * Attend Connect * Work on Android clang builds == Issues == * Could use 48hr+ days

9 years, 7 months

[Activity] Week 36

by Dileep Katta

== Progress == * Enabling UEFI Fastboot on Panda (CARD-198: 0 %) - On Hold * CARD 1103: Flash support on u-boot fastboot (CARD-1103: 100%) - worked on v3, on Partitioning issues. == Plans == * CARD 1103: fastboot flash command (CARD-1103: 100%) - submit v3 - work on wiki for fastboot == Issues == *None

9 years, 7 months

[ACTIVITY] Week 34

by Bernhard Rosenkränzer

== Progress == * Fixed build failures caused by 2014.08 based Android toolchains * Rewrote NDK build scripts to build everything from source instead of patching the upstream release (allowing us to build from master branch) * Created reduced test cases for compiler issues * Worked on cbuild2 toolchain releases == Plans == * cbuild2 toolchain releases * NDK testing == Issues == * A cbuild2 showstopper bug seems to not be reproducible by TCWG

9 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev September 2014