linaro-dev July 2014

linaro-dev@lists.linaro.org

23 participants
48 discussions

[meta-linaro-toolchain][PATCH] external-linaro-toolchain: Add eglibc-mtrace to RPROVIDES

by b40527＠freescale.com

From: Zongchun Yu <Zongchun.Yu(a)freescale.com> The mtrace should be provided by external toolchain instead of eglibc-mtrace. Signed-off-by: Zongchun Yu <Zongchun.Yu(a)freescale.com> --- .../external-linaro-toolchain/external-linaro-toolchain.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 06abb7a..bb4cfae 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -72,6 +72,7 @@ do_install() { fi cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/share/* ${D}${datadir} cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/* ${D}${includedir} + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/bin/mtrace ${D}${bindir} if [ -d ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/${ELT_TARGET_SYS} ]; then cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/${ELT_TARGET_SYS}/* ${D}${includedir} @@ -155,6 +156,7 @@ INSANE_SKIP_gdbserver += "ldflags" PKG_${PN} = "eglibc" PKG_${PN}-dev = "eglibc-dev" PKG_${PN}-doc = "eglibc-doc" +PKG_${PN}-mtrace = "eglibc-mtrace" PKG_${PN}-dbg = "eglibc-dbg" PKG_${PN}-pic = "eglibc-pic" PKG_${PN}-utils = "eglibc-utils" @@ -164,6 +166,8 @@ PKG_${PN}-thread-db = "eglibc-thread-db" PKG_${PN}-pcprofile = "eglibc-pcprofile" PKG_${PN}-staticdev = "eglibc-staticdev" +RPROVIDES_${PN}-mtrace += "${TCLIBC}-mtrace" + PKGV_${PN} = "${ELT_VER_LIBC}" PKGV_${PN}-dev = "${ELT_VER_LIBC}" PKGV_${PN}-doc = "${ELT_VER_LIBC}" -- 1.8.3.2

10 years, 5 months

[ACTIVITY] week 27

by Andrey Konovalov

== Progress == * moved linux-linaro-core-tracking and linux-linaro to v3.16-rc3, added llvm topic back to linux-linaro (CARD-788, 60%) * added QCOM LT tree to linux-linaro, boot tested in LAVA (CARD-788, 40%) * DEVPLAT-210 "upstream: fastboot in u-boot": synced up with Dileep (0%) == Plans == * move linux-linaro-core-tracking and linux-linaro to v3.16-rc4, make all the topics fixed for 3.16 (CARD-788) * add QCOM's ifc6410 board to linux-linaro CI loop (CARD-788) * complete the ILP32 topic branch for ll, sanity check it with LTP in LP64, identify the missing components needed for testing in ILP32 (CARD-1161) * follow up on: . DEVPLAT-210 "upstream: fastboot in u-boot" . bug 1189839 "kernel crash on arndale while CPU hotplug" * update the wiki doc for DEVPLAT-204 == Issues == * none

10 years, 5 months

[PATCH] Add pinctrl support in powerdebug

by Mohammad Merajul Islam Molla

Add support for pinctrl in powerdebug. Both dump and display modes supported. Tested only on Samsung Arndale board. Sample output in display mode on Arndale Board - Pin Name MUX Owner GPIO Owner HOG Function Group 0 gpa0-0 MUX UNCLAIMED GPIO UNCLAIMED 1 gpa0-1 MUX UNCLAIMED GPIO UNCLAIMED 2 gpa0-2 MUX UNCLAIMED GPIO UNCLAIMED 3 gpa0-3 MUX UNCLAIMED GPIO UNCLAIMED 4 gpa0-4 MUX UNCLAIMED GPIO UNCLAIMED 5 gpa0-5 MUX UNCLAIMED GPIO UNCLAIMED 6 gpa0-6 12c80000.i2c GPIO UNCLAIMED i2c2-bus-mux i2c2-bus-grp 7 gpa0-7 12c80000.i2c GPIO UNCLAIMED i2c2-bus-mux i2c2-bus-grp 8 gpa1-0 MUX UNCLAIMED GPIO UNCLAIMED 9 gpa1-1 MUX UNCLAIMED GPIO UNCLAIMED 10 gpa1-2 12c90000.i2c GPIO UNCLAIMED i2c3-bus-mux i2c3-bus-grp 11 gpa1-3 12c90000.i2c GPIO UNCLAIMED i2c3-bus-mux i2c3-bus-grp --- Android.mk | 2 +- Makefile | 2 +- README | 4 +- display.c | 3 +- display.h | 2 +- pinctrl.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pinctrl.h | 19 ++++ powerdebug.c | 35 +++++-- 8 files changed, 381 insertions(+), 15 deletions(-) create mode 100644 pinctrl.c create mode 100644 pinctrl.h diff --git a/Android.mk b/Android.mk index 36c73cd..19d00ca 100644 --- a/Android.mk +++ b/Android.mk @@ -29,6 +29,6 @@ LOCAL_C_INCLUDES += external/stlport/stlport/ \ LOCAL_SRC_FILES += \ powerdebug.c sensor.c clocks.c regulator.c \ - display.c tree.c utils.c mainloop.c gpio.c + display.c tree.c utils.c mainloop.c gpio.c pinctrl.c include $(BUILD_EXECUTABLE) diff --git a/Makefile b/Makefile index 2da9d67..f002438 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CFLAGS?=-O1 -g -Wall -Wshadow CC?=gcc OBJS = powerdebug.o sensor.o clocks.o regulator.o gpio.o \ - display.o tree.o utils.o mainloop.o + display.o tree.o utils.o mainloop.o pinctrl.o default: powerdebug diff --git a/README b/README index 1479db1..b24dd98 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ powerdebug ---------- -This is a new tool which displays regulator, sensor and clock tree -information. +This is a new tool which displays regulator, sensor, clock tree, gpio and +pinctrl information. Current version only displays regulator information and clock tree from debugfs. Support will be added for sensors later. diff --git a/display.c b/display.c index 0000ee9..fb899c0 100644 --- a/display.c +++ b/display.c @@ -63,7 +63,8 @@ struct windata windata[] = { [CLOCK] = { .name = "Clocks" }, [REGULATOR] = { .name = "Regulators" }, [SENSOR] = { .name = "Sensors" }, - [GPIO] = { .name = "Gpio" }, + [GPIO] = { .name = "Gpio" }, + [PINCTRL] = { .name = "Pins" }, }; static void display_fini(void) diff --git a/display.h b/display.h index e3a1529..4496f30 100644 --- a/display.h +++ b/display.h @@ -13,7 +13,7 @@ * - initial API and implementation *******************************************************************************/ -enum { CLOCK, REGULATOR, SENSOR, GPIO }; +enum { CLOCK, REGULATOR, SENSOR, GPIO, PINCTRL }; struct display_ops { int (*display)(bool refresh); diff --git a/pinctrl.c b/pinctrl.c new file mode 100644 index 0000000..eef06e2 --- /dev/null +++ b/pinctrl.c @@ -0,0 +1,329 @@ + +/******************************************************************************* + * Copyright (C) 2014, Linaro Limited. + * + * This file is part of PowerDebug. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mohammad Merajul Islam Molla <meraj.molla(a)samsung.com> + * (Samsung R&D Institute Bangladesh) + * - initial API and implementation + *******************************************************************************/ + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#include <stdio.h> +#undef _GNU_SOURCE +#endif +#include <string.h> +#include <stdbool.h> +#include <unistd.h> +#include <stdlib.h> +#include <dirent.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "pinctrl.h" +#include "display.h" + +#define SIZE 64 +#define MAX_PINS 256 + +#define PIN_fmt "%*[^ ] %d" +#define NAME_fmt "%*[^(]( %s" +#define MUX_fmt "%*[^:]: %s" +#define GPIO_fmt "%*[^:]: %*[^ ] %s" +#define GPIO_fmt1 "%*[^:]: %*[^ ] %*[^ ] %s" + +#define SYS_PINCTRL "/sys/kernel/debug/pinctrl" + +static bool pinctrl_error = false; + +static struct pintcrl_info { + int pin; + char name[SIZE]; + char mux_owner[SIZE]; + char gpio_owner[SIZE]; + char hog[SIZE]; + char function[SIZE]; + char group[SIZE]; +} pins_info[MAX_PINS]; + +static int fill_pinctrl_info(); + +static int pinctrl_print_header(void) +{ + char *buf; + int ret; + + if (asprintf(&buf, "%-5s %-10s %-15s %-15s %-5s %-20s %-20s", + "Pin", "Name", "MUX Owner", "GPIO Owner", "HOG", "Function", + "Group") < 0) + return -1; + + ret = display_column_name(buf); + + free(buf); + + return ret; +} + +static char *pin_line(int pin) +{ + char *pinline = 0; + + if (asprintf(&pinline,"%-5d %-10s %-15s %-15s %-5s %-20s %-20s", + pins_info[pin].pin, pins_info[pin].name, + pins_info[pin].mux_owner, pins_info[pin].gpio_owner, + pins_info[pin].hog, pins_info[pin].function, + pins_info[pin].group) < 0) + return NULL; + + return pinline; +} + +static int pinctrl_print_info() +{ + int i; + int line = 0; + char *buffer; + + display_reset_cursor(PINCTRL); + + pinctrl_print_header(); + + for (i = 0; i < MAX_PINS; i++) { + if (pins_info[i].pin == -1) + continue; + + buffer = pin_line(i); + if (!buffer) + return -1; + + display_print_line(PINCTRL, line, buffer, 0, NULL); + line++; + + free(buffer); + } + + display_refresh_pad(PINCTRL); + + return 0; +} + +static int dump_pinctrl_info() +{ + int i; + + for (i = 0; i < MAX_PINS; i++) { + if (pins_info[i].pin == -1) + continue; + printf("\tPin %d: (Name: %s, MUX_owner: %s, GPIO_owner: %s, HOG: %s, Function: %s, Group: %s)\n", + pins_info[i].pin, pins_info[i].name, + pins_info[i].mux_owner, pins_info[i].gpio_owner, + pins_info[i].hog, + pins_info[i].function, pins_info[i].group); + } + + return 0; +} + + +int pinctrl_dump() +{ + int ret; + + if (pinctrl_error) + return -1; + + printf("\nPin Information:\n"); + printf("****************\n"); + ret = dump_pinctrl_info(); + printf("\n\n"); + + return ret; + +} + +static int pinctrl_display(bool refresh) +{ + if (pinctrl_error) { + display_message(PINCTRL, + "error: path " SYS_PINCTRL " not found or not root"); + return -2; + } + + if (refresh && fill_pinctrl_info()) + return -1; + + return pinctrl_print_info(); +} + +static struct display_ops pinctrl_ops = { + .display = pinctrl_display, +}; + +static int read_pin_info(const char *path) +{ + FILE *fpinmux; + int pin; + int ret = 0; + char *p; + char buf[4096]; + + fpinmux = fopen(path, "r"); + if (!fpinmux) { + printf("error: failed to read %s\n", path); + return -1; + } + + /* first two lines are headers, ignore */ + fgets(buf, 4096, fpinmux); + fgets(buf, 4096, fpinmux); + + while (fgets(buf, 4096, fpinmux)) { + int mux_owner = 0; + + /* get pin number */ + sscanf(buf, PIN_fmt, &pin); + + if (pin >= MAX_PINS) { + printf("WARNING: # of pins > max pins (256), need to increase limit\n"); + continue; + } + + pins_info[pin].pin = pin; + sscanf(buf, NAME_fmt, pins_info[pin].name); + pins_info[pin].name[strlen(pins_info[pin].name) - 2] = '\0'; + + if (strstr(buf, "MUX UNCLAIMED")) + strcpy(pins_info[pin].mux_owner, "MUX UNCLAIMED"); + else { + sscanf(buf, MUX_fmt, pins_info[pin].mux_owner); + mux_owner = 1; + } + + if (strstr(buf, "GPIO UNCLAIMED")) + strcpy(pins_info[pin].gpio_owner, "GPIO UNCLAIMED"); + else { + if (mux_owner) + sscanf(buf, GPIO_fmt, pins_info[pin].gpio_owner); + else + sscanf(buf, GPIO_fmt1, pins_info[pin].gpio_owner); + } + + if (strstr(buf, "HOG")) + strcpy(pins_info[pin].hog, "HOG"); + else + strcpy(pins_info[pin].hog, ""); + + if ((p = strstr(buf, "function"))) { + p += 9; + sscanf(p, "%s", pins_info[pin].function); + } + else + strcpy(pins_info[pin].function, ""); + + if ((p = strstr(buf, "group"))) { + p += 5; + sscanf(p, "%s", pins_info[pin].group); + } + else + strcpy(pins_info[pin].group, ""); + } + + fclose(fpinmux); + return ret; +} + +static void init_pins_info() +{ + int i; + + memset(pins_info, 0, sizeof(pins_info)); + + for (i = 0; i < MAX_PINS; i++) + pins_info[i].pin = -1; +} + +static int fill_pinctrl_info() +{ + DIR *dir; + char *newpath, *pinmux_path; + struct dirent dirent, *direntp; + struct stat s; + int ret = 0; + + dir = opendir(SYS_PINCTRL); + if (!dir) { + printf("error: unable to open directory " SYS_PINCTRL); + ret = -1; + goto out; + } + + init_pins_info(); + + while (!readdir_r(dir, &dirent, &direntp)) { + ret = 0; + + if (!direntp) + break; + + if (direntp->d_name[0] == '.') + continue; + + ret = asprintf(&newpath, "%s/%s", SYS_PINCTRL, direntp->d_name); + if (ret < 0) + goto out; + + ret = stat(newpath, &s); + if (ret) + goto out_free_newpath; + + if (S_ISDIR(s.st_mode)) { + ret = asprintf(&pinmux_path, "%s/%s", newpath, + "pinmux-pins"); + if (ret < 0) + goto out_free_newpath; + + if (read_pin_info(pinmux_path)) { + ret = -1; + goto out_free_pinmux; + } + } + } + +out_free_pinmux: + free(pinmux_path); + +out_free_newpath: + free(newpath); + +out: + closedir(dir); + return ret; +} + +int pinctrl_init(void) +{ + int ret = 0; + + ret = display_register(PINCTRL, &pinctrl_ops); + if (ret) + printf("error: pinctrl display register failed"); + + if (access(SYS_PINCTRL, F_OK)) { + pinctrl_error = true; + return -1; + } + + if (fill_pinctrl_info()) + return -1; + + return ret; +} diff --git a/pinctrl.h b/pinctrl.h new file mode 100644 index 0000000..2fa4f3a --- /dev/null +++ b/pinctrl.h @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (C) 2014, Linaro Limited. + * + * This file is part of PowerDebug. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mohammad merajul Islam Molla <meraj.molla(a)samsung.com> + * (Samsung R&D Institute Bangladesh) + * + * - initial API and implementation + *******************************************************************************/ + +extern int pinctrl_init(void); +extern int pinctrl_dump(void); diff --git a/powerdebug.c b/powerdebug.c index 6cf3a1b..b4f4833 100644 --- a/powerdebug.c +++ b/powerdebug.c @@ -26,6 +26,7 @@ #include "clocks.h" #include "sensor.h" #include "gpio.h" +#include "pinctrl.h" #include "mainloop.h" #include "powerdebug.h" @@ -35,13 +36,14 @@ void usage(void) { printf("Usage: powerdebug [OPTIONS]\n"); printf("\n"); - printf("powerdebug -d [ -r ] [ -s ] [ -c [ -p <clock-name> ] ] " + printf("powerdebug -d [ -r ] [ -s ] [ -p ][ -c [ -P <clock-name> ] ] " "[ -v ]\n"); - printf("powerdebug [ -r | -s | -c ]\n"); + printf("powerdebug [ -r | -s | -c | -p] \n"); printf(" -r, --regulator Show regulator information\n"); printf(" -s, --sensor Show sensor information\n"); printf(" -c, --clock Show clock information\n"); - printf(" -p, --findparents Show all parents for a particular" + printf(" -p, --pin Show pin information\n"); + printf(" -P, --findparents Show all parents for a particular" " clock\n"); printf(" -t, --time Set ticktime in seconds (eg. 10.0)\n"); printf(" -d, --dump Dump information once (no refresh)\n"); @@ -62,7 +64,8 @@ void version() * -s, --sensor : sensors * -c, --clock : clocks * -g, --gpio : gpios - * -p, --findparents : clockname whose parents have to be found + * -p, --pin : pins + * -P, --findparents : clockname whose parents have to be found * -t, --time : ticktime * -d, --dump : dump * -v, --verbose : verbose @@ -76,7 +79,8 @@ static struct option long_options[] = { { "sensor", 0, 0, 's' }, { "clock", 0, 0, 'c' }, { "gpio", 0, 0, 'g' }, - { "findparents", 1, 0, 'p' }, + { "pin", 0 , 0, 'p' }, + { "findparents", 1, 0, 'P' }, { "time", 1, 0, 't' }, { "dump", 0, 0, 'd' }, { "verbose", 0, 0, 'v' }, @@ -91,6 +95,7 @@ struct powerdebug_options { bool sensors; bool clocks; bool gpios; + bool pins; bool dump; unsigned int ticktime; int selectedwindow; @@ -108,7 +113,7 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options) while (1) { int optindex = 0; - c = getopt_long(argc, argv, "rscgp:t:dvVh", + c = getopt_long(argc, argv, "rscgpP:t:dvVh", long_options, &optindex); if (c == -1) break; @@ -131,6 +136,10 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options) options->selectedwindow = GPIO; break; case 'p': + options->pins = true; + options->selectedwindow = PINCTRL; + break; + case 'P': options->clkname = strdup(optarg); if (!options->clkname) { fprintf(stderr, "failed to allocate memory"); @@ -161,9 +170,9 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options) /* No system specified to be dump, let's default to all */ if (!options->regulators && !options->clocks && - !options->sensors && !options->gpios) - options->regulators = options->clocks = - options->sensors = options->gpios = true; + !options->sensors && !options->gpios && !options->pins) + options->regulators = options->clocks = options->sensors = + options->gpios = options->pins = true; if (options->selectedwindow == -1) options->selectedwindow = CLOCK; @@ -185,6 +194,9 @@ static int powerdebug_dump(struct powerdebug_options *options) if (options->gpios) gpio_dump(); + if (options->pins) + pinctrl_dump(); + return 0; } @@ -266,6 +278,11 @@ int main(int argc, char **argv) options->gpios = false; } + if (pinctrl_init()) { + printf("failed to initialize pinctrl\n"); + options->pins = false; + } + ret = options->dump ? powerdebug_dump(options) : powerdebug_display(options); -- Thanks, -Meraj

10 years, 5 months

[PATCH PMQA] thermal: skip if there are no cooling devices

by Sanjay Singh Rawat

Signed-off-by: Sanjay Singh Rawat <sanjay.rawat(a)linaro.org> --- include/thermal_functions.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/thermal_functions.sh b/include/thermal_functions.sh index 1f1991f..0c836c5 100644 --- a/include/thermal_functions.sh +++ b/include/thermal_functions.sh @@ -163,6 +163,10 @@ for_each_cooling_device() { shift 1 devices=$(ls $THERMAL_PATH | grep "cooling_device['$MAX_CDEV']") + if [ "$devices" == "" ]; then + log_skip "no cooling devices" + return 0 + fi ALL_DEVICE=$devices for device in $devices; do -- 1.8.3.2

10 years, 5 months

[Activity] week 27

by Vishal Bhoj

== Progress == * Juno Android release (CARD-1104, 40%) * Closed u-boot ARMv8 Android build (CARD-1049, 10%) == Plans == * Android Baseline maintenance * Reduce the number of FVP Android builds. * Move Juno daily builds to public location. == Issues == None Regards, Vishal

10 years, 5 months

[Activity] week 27

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 60%) * GCC 4.9 BE update * Juno (40%) == Plans == * OE toolchain updates == Issues == -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

10 years, 5 months

[Activity] week 26

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 10%) * Release 90% == Plans == * Release Juno == Issues == * ITS broke releases.l.o and snapshots.l.o -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

10 years, 5 months

[Activity] week 25

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 100%) * OE-core binconfig fixes == Plans == * Release == Issues == -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

10 years, 5 months

[Activity] week 24

by Koen Kooi

== Progress == * OE baseline work (CARD-787: 80%) * ODP work * Patch review * Juno CI loop (CARD-1441: 20%) -- Koen Kooi Builds and Baselines | Release Manager Linaro.org | Open source software for ARM SoCs

10 years, 5 months

Regarding powertop VFS ops/sec output

by Mohammad Merajul Islam Molla

Hello, It looks like powertop requires a kernel patch to display VFS ops/sec. The last patch was for kernel v3.3.0. The patch needs to be updated, otherwise powertop always displays 0 VFS ops/sec. Considering changes starting with kernel v3.9, the kernel side patch would look like as below. I have tested it with powertop and linux-linaro-tracking branch (v3.14.0) and with this patch powertop displays and updates VFS ops/sec properly. diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 5584bea..c6a9832 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1141,6 +1141,9 @@ void __mark_inode_dirty(struct inode *inode, int flags) if ((inode->i_state & flags) == flags) return; + if (flags & (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)) + trace_writeback_inode_dirty(inode, flags); + if (unlikely(block_dump > 1)) block_dump___mark_inode_dirty(inode); diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 464ea82..7956d8f 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -101,6 +101,35 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode, TP_ARGS(inode, flags) ); +/* + * Tracepoint for dirtying an inode; used by PowerTOP + */ +TRACE_EVENT(writeback_inode_dirty, + + TP_PROTO(struct inode *inode, int flags), + + TP_ARGS(inode, flags), + + TP_STRUCT__entry( + __field( __kernel_dev_t, dev ) + __field( ino_t, ino ) + __field( u32, flags ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->flags = flags; + ), + + TP_printk("dev %d:%d ino %lu flags %d %s", MAJOR(__entry->dev), + MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->flags, + show_inode_state(__entry->flags) + ) +); + DECLARE_EVENT_CLASS(writeback_write_inode_template, TP_PROTO(struct inode *inode, struct writeback_control *wbc), However, there is an alternative thought. Starting with kernel v3.9, kernel provides a built in trace event called - "writeback_dirty_inode" - DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode, TP_PROTO(struct inode *inode, int flags), TP_ARGS(inode, flags) ); But since the event powertop expects is "writeback_inode_dirty" and the names and output format don't match, to take advantage of the built-in kernel trace event, the below two patches together make it work. powertop side patch is necessary to match the TRACE_EVENT name. Also, checking for dev > 0 is not necessary, since now there is name instead of device major and minor number in kernel trace. kernel side patch is necessary to account for DIRTY_PAGES. powertop side patch - diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp index ba164eb..2e2cbea 100644 --- a/src/process/do_process.cpp +++ b/src/process/do_process.cpp @@ -625,21 +625,14 @@ void perf_process_bundle::handle_trace_point(void *trace, int cpu, uint64_t time consumer->gpu_ops++; } } - else if (strcmp(event->name, "writeback_inode_dirty") == 0) { - static uint64_t prev_time; + else if (strcmp(event->name, "writeback_dirty_inode") == 0) { + static uint64_t prev_time = 0; class power_consumer *consumer = NULL; - int dev; consumer = current_consumer(cpu); - ret = pevent_get_field_val(NULL, event, "dev", &rec, &val, 0); - if (ret < 0) - - return; - dev = (int)val; - if (consumer && strcmp(consumer->name(), - "process")==0 && dev > 0) { + "process")==0) { consumer->disk_hits++; @@ -674,7 +667,7 @@ void start_process_measurement(void) perf_events->add_event("workqueue:workqueue_execute_end"); perf_events->add_event("i915:i915_gem_ring_dispatch"); perf_events->add_event("i915:i915_gem_request_submit"); - perf_events->add_event("writeback:writeback_inode_dirty"); + perf_events->add_event("writeback:writeback_dirty_inode"); } first_stamp = ~0ULL; kernel side patch - diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 5584bea..c2ab700 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1141,6 +1141,9 @@ void __mark_inode_dirty(struct inode *inode, int flags) if ((inode->i_state & flags) == flags) return; + if (flags & I_DIRTY_PAGES) + trace_writeback_dirty_inode(inode, flags); + if (unlikely(block_dump > 1)) block_dump___mark_inode_dirty(inode); I have tested both solutions and both displays and updates VFS ops/sec. However, since second solution changes powertop, that means powertop won't work with pre v3.9 kernel. Any comment or thought on this? -- Thanks, -Meraj

10 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev July 2014