linaro-dev

linaro-dev@lists.linaro.org

4332 discussions

[PATCH] cpufreq: interactive: fix racy timer stopping

by Viresh Kumar

From: Nicolas Pitre <nicolas.pitre(a)linaro.org> Relying on pcpu->governor_enabled alone to ensure proper shutdown of the governor activities is flawed. The following race is perfectly possible: CPU0 |CPU2 ---- +---- |cpufreq_interactive_timer() cpufreq_governor_interactive(GOV_STOP) |if (!pcpu->governor_enabled) pcpu->governor_enabled = 0; | return; [untaken] smp_wmb(); |[...] del_timer_sync(&pcpu->cpu_timer); |cpufreq_interactive_timer_resched() |mod_timer_pinned(&pcpu->cpu_timer) Result: timer is pending again. It is also possible for del_timer_sync() to race against the invocation of the idle notifier callback which also has the potential to reactivate the timer. To fix this issue, a read-write semaphore is used. Multiple readers are allowed as long as pcpu->governor_enabled is true. However it can be moved to false only after taking a write semaphore which would wait for any on-going asynchronous activities to complete and prevent any more of those activities to be initiated. Signed-off-by: Nicolas Pitre <nicolas.pitre(a)linaro.org> --- drivers/cpufreq/cpufreq_interactive.c | 38 ++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index c82d9fe..061af7f 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -21,14 +21,13 @@ #include <linux/cpufreq.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/mutex.h> +#include <linux/rwsem.h> #include <linux/sched.h> #include <linux/tick.h> #include <linux/time.h> #include <linux/timer.h> #include <linux/workqueue.h> #include <linux/kthread.h> -#include <linux/mutex.h> #include <linux/slab.h> #include <asm/cputime.h> @@ -50,6 +49,7 @@ struct cpufreq_interactive_cpuinfo { unsigned int floor_freq; u64 floor_validate_time; u64 hispeed_validate_time; + struct rw_semaphore mutex; int governor_enabled; }; @@ -138,8 +138,8 @@ static void cpufreq_interactive_timer(unsigned long data) unsigned int index; unsigned long flags; - smp_rmb(); - + if (!down_read_trylock(&pcpu->mutex)) + return; if (!pcpu->governor_enabled) goto exit; @@ -258,6 +258,7 @@ rearm: } exit: + up_read(&pcpu->mutex); return; } @@ -267,8 +268,12 @@ static void cpufreq_interactive_idle_start(void) &per_cpu(cpuinfo, smp_processor_id()); int pending; - if (!pcpu->governor_enabled) + if (!down_read_trylock(&pcpu->mutex)) + return; + if (!pcpu->governor_enabled) { + up_read(&pcpu->mutex); return; + } pending = timer_pending(&pcpu->cpu_timer); @@ -298,6 +303,7 @@ static void cpufreq_interactive_idle_start(void) } } + up_read(&pcpu->mutex); } static void cpufreq_interactive_idle_end(void) @@ -305,8 +311,12 @@ static void cpufreq_interactive_idle_end(void) struct cpufreq_interactive_cpuinfo *pcpu = &per_cpu(cpuinfo, smp_processor_id()); - if (!pcpu->governor_enabled) + if (!down_read_trylock(&pcpu->mutex)) + return; + if (!pcpu->governor_enabled) { + up_read(&pcpu->mutex); return; + } /* Arm the timer for 1-2 ticks later if not already. */ if (!timer_pending(&pcpu->cpu_timer)) { @@ -317,6 +327,8 @@ static void cpufreq_interactive_idle_end(void) del_timer(&pcpu->cpu_timer); cpufreq_interactive_timer(smp_processor_id()); } + + up_read(&pcpu->mutex); } static int cpufreq_interactive_speedchange_task(void *data) @@ -351,10 +363,12 @@ static int cpufreq_interactive_speedchange_task(void *data) unsigned int max_freq = 0; pcpu = &per_cpu(cpuinfo, cpu); - smp_rmb(); - - if (!pcpu->governor_enabled) + if (!down_read_trylock(&pcpu->mutex)) + continue; + if (!pcpu->governor_enabled) { + up_read(&pcpu->mutex); continue; + } for_each_cpu(j, pcpu->policy->cpus) { struct cpufreq_interactive_cpuinfo *pjcpu = @@ -371,6 +385,8 @@ static int cpufreq_interactive_speedchange_task(void *data) trace_cpufreq_interactive_setspeed(cpu, pcpu->target_freq, pcpu->policy->cur); + + up_read(&pcpu->mutex); } } @@ -690,9 +706,10 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy, case CPUFREQ_GOV_STOP: for_each_cpu(j, policy->cpus) { pcpu = &per_cpu(cpuinfo, j); + down_write(&pcpu->mutex); pcpu->governor_enabled = 0; - smp_wmb(); del_timer_sync(&pcpu->cpu_timer); + up_write(&pcpu->mutex); } if (atomic_dec_return(&active_count) > 0) @@ -736,6 +753,7 @@ static int __init cpufreq_interactive_init(void) init_timer_deferrable(&pcpu->cpu_timer); pcpu->cpu_timer.function = cpufreq_interactive_timer; pcpu->cpu_timer.data = i; + init_rwsem(&pcpu->mutex); } spin_lock_init(&speedchange_cpumask_lock); -- 1.7.12.rc2.18.g61b472e

13 years

big.LITTLE MP status will resume in January

by David Zinman

Development for big.LITTLE MP continues in a strong way, however as our efforts for big.LITTLE IKS ramp up to delivery, process and project management will focus on that project until the end of the year. As such, the next big.LITTLE MP status will be sent out in January. I will be happy to respond to any questions related to big.LITTLE MP through the normal channels. Apologies and thanks for your patience. -- David Zinman, Project Manager Linaro.org | Open source software for ARM SoCs

13 years

[RFC] bootwrapper: Add support for the TC1 and TC2 CoreTiles

by Alexander Spyridakis

- A new output binary (board.axf) has been added exclusively for board usage, which uses a different linker script (board.lds.S). - BootMonitor has already placed secondary CPUs in wfi state, generate a software interrupt first and point other cores to jump to the right location by writing the address to SYS_FLAGS. - Make room for atags, which are populated from BootMonitor's loader, at memory address 0x80000100. - Code relocation for secondary cores in wfe state, has been moved further back to a safer location than the initrd region. Usage example in BootMonitor (atags passing idea by Marc Zyngier): - load zImageDT LOAD_ADRESS 0x80008000 - flash linux boot board earlyprintk console=ttyAMA0 mem=... Or run the image itself, with default atags being set via config.mk: - load zImageDT LOAD_ADDRESS 0x80008000 - flash run board Tested on: - Dual/single cluster FastModels - V2P-CA15-TC1 CoreTile - V2P-CA15-A7-TC2 CoreTile (single cluster and big.LITTLE operation) Signed-off-by: Alexander Spyridakis <a.spyridakis(a)virtualopensystems.com> --- Makefile | 19 +++++++++--- board.lds.S | 21 +++++++++++++ boot.S | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++--- config-default.mk | 2 +- 4 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 board.lds.S diff --git a/Makefile b/Makefile index 0997dcf..c0f10ca 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,9 @@ KERNEL = uImage IMAGE = linux-system.axf SEMIIMG = linux-system-semi.axf +BOARD = board.axf LD_SCRIPT = model.lds.S - +B_LD_SCRIPT = board.lds.S CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld @@ -31,14 +32,15 @@ LD = $(CROSS_COMPILE)ld export CROSS_COMPILE ARCH # Build all wrappers -all: $(IMAGE) $(SEMIIMG) +all: $(IMAGE) $(SEMIIMG) $(BOARD) # Build just the semihosting wrapper semi: $(SEMIIMG) clean distclean: - rm -f $(IMAGE) $(SEMIIMG) \ - model.lds modelsemi.lds $(OBJS) $(KERNEL) + rm -f $(IMAGE) $(SEMIIMG) $(BOARD) \ + model.lds modelsemi.lds board.lds \ + board.o $(OBJS) $(KERNEL) $(KERNEL): $(KERNEL_SRC)/arch/arm/boot/uImage cp $< $@ @@ -49,9 +51,15 @@ $(IMAGE): $(OBJS) model.lds $(KERNEL) $(FILESYSTEM) Makefile $(SEMIIMG): $(OBJS) modelsemi.lds $(LD) -o $@ $(OBJS) --script=modelsemi.lds +$(BOARD): board.o board.lds Makefile + $(LD) -o board.axf --script=board.lds + boot.o: $(BOOTLOADER) $(CC) $(CPPFLAGS) -DKCMD='$(KCMD)' -c -o $@ $< +board.o: $(BOOTLOADER) + $(CC) $(CPPFLAGS) -DKCMD='$(KCMD)' -DVE_BOARD -c -o $@ $< + %.o: %.c $(CC) $(CPPFLAGS) -O2 -ffreestanding -I. -Ilibfdt -c -o $@ $< @@ -61,6 +69,9 @@ model.lds: $(LD_SCRIPT) Makefile modelsemi.lds: $(LD_SCRIPT) Makefile $(CC) $(CPPFLAGS) -DSEMIHOSTING=1 -E -P -C -o $@ $< +board.lds: $(B_LD_SCRIPT) Makefile + $(CC) $(CPPFLAGS) -DBOARD -E -P -C -o $@ $< + $(KERNEL_SRC)/arch/arm/boot/uImage: force $(MAKE) -C $(KERNEL_SRC) -j4 uImage diff --git a/board.lds.S b/board.lds.S new file mode 100644 index 0000000..560f65e --- /dev/null +++ b/board.lds.S @@ -0,0 +1,21 @@ +OUTPUT_FORMAT("elf32-littlearm") +OUTPUT_ARCH(arm) +TARGET(binary) + +INPUT(./board.o) + +PHYS_OFFSET = 0x80000000; +MON_OFFSET = 0xf0000000; + +SECTIONS +{ + . = PHYS_OFFSET; + + .text : { board.o } + + . = PHYS_OFFSET + 0x8000; + kernel = .; + + . = PHYS_OFFSET + 0x00d00000; + fs_start = .; +} diff --git a/boot.S b/boot.S index dd453e3..5d6e6a1 100644 --- a/boot.S +++ b/boot.S @@ -12,6 +12,9 @@ .arch_extension virt .text + .equ GICD_CTLR, 0x2c001000 + .equ VE_SYS_FLAGS, 0x1c010030 + .macro enter_hyp @ We assume we're entered in Secure Supervisor mode. To @ get to Hyp mode we have to pass through Monitor mode @@ -68,11 +71,60 @@ vectors: @ ...and return to calling code in NS state movs pc, lr - .globl start start: #ifdef SMP #ifdef VEXPRESS +#ifdef VE_BOARD + @ On the VE board only CPU0 should be awake at this stage + @ BootMonitor's linux loader, will pass machine id and atags to r1 and r2 + @ Save those two registers, instead of passing our own defaults + cmp r2, #0 + ldrne r0, =bootregs + stmne r0, {r1, r2} + + @ Update SYS_FLAGS with the address that secondary cores will jump to + ldr r0, =VE_SYS_FLAGS + ldr r1, =SEC_CORE_ENTRY + str r1, [r0] + + @ Generate Software Interrupt to wake secondary cores + ldr r0, =GICD_CTLR + ldr r1, =(1 << 24) + str r1, [r0, #0xf00] + + b SEC_CORE_ENTRY + +.org 0x100 +atags: + @ ATAG_CORE + .long 2 + .long 0x54410001 + + @ ATAG_CMDLINE + .long (1f - .) >> 2 + .long 0x54410009 + /* The kernel boot command line is defined in config.mk */ + .asciz KCMD + .align 2 +1: + +#ifdef USE_INITRD + @ ATAG_INITRD2 + .long 4 + .long 0x54420005 + .long fs_start + .long FS_SIZE +#endif + + @ ATAG_NONE + .long 0 + .long 0x00000000 + +@ BootMonitor will write the atags at 0x80000100, move code as far as we can. +.org 0xe00 +SEC_CORE_ENTRY: +#endif @ @ Program architected timer frequency @ @@ -95,7 +147,7 @@ start: @ @ Set all interrupts to be non-secure - ldr r0, =0x2c001000 @ Dist GIC base + ldr r0, =GICD_CTLR @ Dist GIC base ldr r1, [r0, #0x04] @ Type Register cmp r4, #0 andeq r1, r1, #0x1f @@ -130,12 +182,19 @@ start: @ enter_hyp - ldr r1, =fs_start - 0x100 +#ifdef VE_BOARD + @ Clear SYS_FLAGS to let the kernel wake the rest of the cores properly + ldr r0, =VE_SYS_FLAGS + mvn r1, #0 + str r1, [r0, 0x04] +#endif + + ldr r1, =MON_OFFSET - 0x100 adr r2, 1f ldmia r2, {r3 - r7} @ move the code to a location stmia r1, {r3 - r7} @ less likely to be overridden #ifdef VEXPRESS - ldr r0, =0x1c010030 @ VE SYS_FLAGS register + ldr r0, =VE_SYS_FLAGS @ VE SYS_FLAGS register #else ldr r0, =0x10000030 @ RealView SYS_FLAGS register #endif @@ -151,6 +210,7 @@ start: #endif 2: +#ifndef VE_BOARD @ @ UART initialisation (38400 8N1) @ @@ -214,3 +274,20 @@ kernel_cmd: .asciz KCMD #endif kernel_cmd_end: +#else /* VE_BOARD */ + enter_hyp + + @ + @ Kernel parameters + @ + ldr r0, =bootregs + ldm r0, {r1, r2} + mov r0, #0 + mov r3, #0 + ldr lr, =kernel + mov pc, lr @ jump to the kernel + +bootregs: + .long 2272 @ r1 + .long atags @ r2 +#endif /* VE_BOARD */ diff --git a/config-default.mk b/config-default.mk index 6c73934..0ba1a06 100644 --- a/config-default.mk +++ b/config-default.mk @@ -28,7 +28,7 @@ SYSTEM ?= vexpress # Turn this on to use an initrd whose contents are in filesystem.cpio.gz USE_INITRD ?= no ifeq ($(USE_INITRD),yes) -CPPFLAGS += -DUSE_INITRD +CPPFLAGS += -DUSE_INITRD -DFS_SIZE=$(shell stat -c %s $(FILESYSTEM)) FILESYSTEM ?= filesystem.cpio.gz else FILESYSTEM = -- 1.7.9.5

13 years

Patch for YAML test definitions

by Senthil Kumaran

Hi, I converted lava-test test definitions to work on lava-test-shell with the new YAML format. These converted tests are mostly from https://code.launchpad.net/~linaro-foundations I request someone from developer platform team to merge these tests to the bzr repositories so that it will be easy to maintain these tests in future. PFA the patches and the following are the repositories to which the patch should be applied: 1) lp:~linaro-foundations/linaro-ubuntu/lava-test-device-tree - device-tree-patch.txt 2) lp:~linaro-foundations/linaro-ubuntu/lava-test-bt-enablement - bt-enablement-patch.txt 3) lp:~linaro-foundations/linaro-ubuntu/lava-test-basic-graphics - basic-graphics-patch.txt 4) lp:~linaro-foundations/linaro-ubuntu/lava-test-wifi-enablement - wifi-enablement-patch.txt 5) lp:~linaro-foundations/lava-test/lava-perf-test - perf-test-patch.txt 6) lp:~linaro-foundations/lava-test/new-test-definitions - other-tests-patch.txt Thank You. -- Senthil Kumaran S http://www.stylesen.org/ http://www.sasenthilkumaran.com/

13 years, 1 month

Planning topcs for inclusion in linux-linaro

by Jon Medhurst (Tixy)

Hi Andrey Now I'm providing a single LT topic based off linux-linaro-core-tracking (llct), and you said that you need everyone to base off the same version of llct, don't we need some kind of notification system where you announce a plan to rebuild linux-linaro and give us a version of llct to base our LT branches off? -- Tixy

13 years, 1 month

Fwd: Minor downtime

by Dave Pigott

Adding other interested parties. Dave Begin forwarded message: > From: Dave Pigott <dave.pigott(a)linaro.org> > Subject: Minor downtime > Date: 13 December 2012 09:37:30 GMT > To: "linaro-validation(a)lists.linaro.org Validation" <linaro-validation(a)lists.linaro.org> > > Hi all, > > As part of my investigations into our IP addressing issue, I am going to reboot one of the Cisco switches in the lab. This will mean downtime of maybe a few minutes, and will happen later today. It means that Pandas 05-24, Origens 02-10 and the Toolchain pandas will be unavailable during that time. > > Thanks > > Dave

13 years, 1 month

l.a.m.c failed on Validation linaro server.

by Naresh Kamboju

Hi, I have tried to build linaro.img on validation.linaro.org and found below error. I request you provide way forward on this. $ linaro-android-media-create --image-file linaro.img --image-size 2000M --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2 Traceback (most recent call last): File "/usr/bin/linaro-android-media-create", line 105, in <module> board_config = android_board_configs[args.dev] AttributeError: 'Namespace' object has no attribute 'dev' [sudo] password for naresh-kamboju: $ ls boot.tar.bz2 system.tar.bz2 userdata.tar.bz2 Best regards Naresh Kamboju

13 years, 1 month

[PATCH] cpuidle - remove the power_specified field in the driver

by Daniel Lezcano

This patch follows the discussion about reinitializing the power usage when a C-state is added/removed. https://lkml.org/lkml/2012/10/16/518 We realized the power usage field is never filled and when it is filled for tegra, the power_specified flag is not set making all these values to be resetted when the driver is initialized with the set_power_state function. Julius and I feel this is over-engineered and the power_specified flag could be simply removed and continue assuming the states are backward sorted. The menu governor select function is simplified as the power is ordered. Actually the condition is always true with the current code. The cpuidle_play_dead function is also simplified by doing a reverse lookup on the array. The set_power_states function is removed as it does no make sense anymore. As a consequence, this patch fix also the bug where on the dynamic C-state system, the power fields is not initialized. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> Cc: Julius Werner <jwerner(a)chromium.org> --- drivers/cpuidle/cpuidle.c | 17 ++++------------- drivers/cpuidle/driver.c | 25 ------------------------- drivers/cpuidle/governors/menu.c | 8 ++------ include/linux/cpuidle.h | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 8df53dd..e1f6860 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -69,24 +69,15 @@ int cpuidle_play_dead(void) { struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices); struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); - int i, dead_state = -1; - int power_usage = -1; + int i; if (!drv) return -ENODEV; /* Find lowest-power state that supports long-term idle */ - for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) { - struct cpuidle_state *s = &drv->states[i]; - - if (s->power_usage < power_usage && s->enter_dead) { - power_usage = s->power_usage; - dead_state = i; - } - } - - if (dead_state != -1) - return drv->states[dead_state].enter_dead(dev, dead_state); + for (i = drv->state_count - 1; i >= CPUIDLE_DRIVER_STATE_START; i--) + if (drv->states[i].enter_dead) + return drv->states[i].enter_dead(dev, i); return -ENODEV; } diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 3af841f..bb045f1 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -19,34 +19,9 @@ DEFINE_SPINLOCK(cpuidle_driver_lock); static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu); static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu); -static void set_power_states(struct cpuidle_driver *drv) -{ - int i; - - /* - * cpuidle driver should set the drv->power_specified bit - * before registering if the driver provides - * power_usage numbers. - * - * If power_specified is not set, - * we fill in power_usage with decreasing values as the - * cpuidle code has an implicit assumption that state Cn - * uses less power than C(n-1). - * - * With CONFIG_ARCH_HAS_CPU_RELAX, C0 is already assigned - * an power value of -1. So we use -2, -3, etc, for other - * c-states. - */ - for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) - drv->states[i].power_usage = -1 - i; -} - static void __cpuidle_driver_init(struct cpuidle_driver *drv) { drv->refcnt = 0; - - if (!drv->power_specified) - set_power_states(drv); } static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu) diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index bd40b94..fe343a0 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -312,7 +312,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) { struct menu_device *data = &__get_cpu_var(menu_devices); int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); - int power_usage = -1; int i; int multiplier; struct timespec t; @@ -383,11 +382,8 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) if (s->exit_latency * multiplier > data->predicted_us) continue; - if (s->power_usage < power_usage) { - power_usage = s->power_usage; - data->last_state_idx = i; - data->exit_us = s->exit_latency; - } + data->last_state_idx = i; + data->exit_us = s->exit_latency; } /* not deepest C-state chosen for low predicted residency */ diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 3711b34..24cd103 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -126,9 +126,9 @@ struct cpuidle_driver { struct module *owner; int refcnt; - unsigned int power_specified:1; /* set to 1 to use the core cpuidle time keeping (for all states). */ unsigned int en_core_tk_irqen:1; + /* states array must be ordered in decreasing power consumption */ struct cpuidle_state states[CPUIDLE_STATE_MAX]; int state_count; int safe_state_index; -- 1.7.5.4

13 years, 1 month

Powertop Linaro-2012.12 release

by Rajagopal Venkat

Hi, The Powertop Linaro-2012.12 release is available[1] based on upstream v2.2 version. The upstream v2.2 minor release mainly includes bug fixes and new report generator facility. Detailed notes available at [2]. Powertop Linaro-2012.12 release highlights - Bug fix to display freq stats when cpuidle is not enabled - Devfreq support to display devfreq device freq stats [1] http://git.linaro.org/gitweb?p=tools/powertop-2.0.git [2] http://lists.01.org/pipermail/powertop/2012-November/000619.html -- Regards, Rajagopal

13 years, 1 month

[Powertop][PATCH v1] Allow frequency stats when cpuidle is not enabled

by Rajagopal Venkat

Powertop fails to display frequency stats when cpuidle subsystem is not enabled. Fix it. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- src/cpu/cpu.h | 7 ++++++- src/cpu/cpu_linux.cpp | 36 +++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 4480b11..781e33c 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -159,7 +159,12 @@ extern vector<class abstract_cpu *> all_cpus; class cpu_linux: public abstract_cpu { - void account_freq(uint64_t frequency, uint64_t duration); + void account_freq(uint64_t frequency, uint64_t duration); + void parse_pstates_start(void); + void parse_cstates_start(void); + void parse_pstates_end(void); + void parse_cstates_end(void); + public: virtual void measurement_start(void); virtual void measurement_end(void); diff --git a/src/cpu/cpu_linux.cpp b/src/cpu/cpu_linux.cpp index d6caf45..e7a3d37 100644 --- a/src/cpu/cpu_linux.cpp +++ b/src/cpu/cpu_linux.cpp @@ -47,17 +47,13 @@ static int is_turbo(uint64_t freq, uint64_t max, uint64_t maxmo) return 1; } -void cpu_linux::measurement_start(void) +void cpu_linux::parse_cstates_start(void) { ifstream file; - DIR *dir; struct dirent *entry; char filename[256]; int len; - unsigned int i; - - abstract_cpu::measurement_start(); len = sprintf(filename, "/sys/devices/system/cpu/cpu%i/cpuidle", number); @@ -111,9 +107,16 @@ void cpu_linux::measurement_start(void) } closedir(dir); +} - last_stamp = 0; +void cpu_linux::parse_pstates_start(void) +{ + ifstream file; + char filename[256]; + unsigned int i; + + last_stamp = 0; for (i = 0; i < children.size(); i++) if (children[i]) children[i]->wiggle(); @@ -136,8 +139,14 @@ void cpu_linux::measurement_start(void) account_freq(0, 0); } +void cpu_linux::measurement_start(void) +{ + abstract_cpu::measurement_start(); + parse_cstates_start(); + parse_pstates_start(); +} -void cpu_linux::measurement_end(void) +void cpu_linux::parse_cstates_end(void) { DIR *dir; struct dirent *entry; @@ -187,6 +196,12 @@ void cpu_linux::measurement_end(void) } closedir(dir); +} + +void cpu_linux::parse_pstates_end(void) +{ + char filename[256]; + ifstream file; sprintf(filename, "/sys/devices/system/cpu/cpu%i/cpufreq/stats/time_in_state", number); @@ -216,12 +231,15 @@ void cpu_linux::measurement_end(void) } file.close(); } +} - +void cpu_linux::measurement_end(void) +{ + parse_cstates_end(); + parse_pstates_end(); abstract_cpu::measurement_end(); } - char * cpu_linux::fill_cstate_line(int line_nr, char *buffer, const char *separator) { unsigned int i; -- 1.7.11.3

13 years, 1 month

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev