Skip to contentSkip to conversation

Fix for YB6498

PATCH Superseded Roxana Ciobanu 4 participants 5 messages Jul 10, 2014 – Jul 12, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Roxana Ciobanu

author
#0 lore raw

v2 cover Fix for YB6498

The following changes since commit 6879c3c903ec7d08cf0240281c83d85b4a42b6db:

maintainers.inc: add info for libical (2014-07-08 11:20:14 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib roxana/YB6498
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=roxana/YB6498

Roxana Ciobanu (1):
latencytop: fix mount error

 .../latencytop/latencytop-0.5/latencytop-fsync-mount.patch  | 13 +++++++++++++
 meta/recipes-kernel/latencytop/latencytop_0.5.bb            |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v2 1/1 latencytop: fix mount error

Bug was fixed by redirecting stderr to /dev/null. The error was caused because /sys/kernel/debug was already mounted by sysfs.sh.

[ YOCTO #6498 ]

Signed-off-by Roxana Ciobanu <[email protected]>
---
 .../latencytop/latencytop-0.5/latencytop-fsync-mount.patch  | 13 +++++++++++++
 meta/recipes-kernel/latencytop/latencytop_0.5.bb            |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch
meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch new file +13 -0
new file mode 100644
index 0000000..043be75
@@ -0,0 +1,13 @@
+Index: latencytop-0.5/fsync.c
+===================================================================
+--- latencytop-0.5.orig/fsync.c
++++ latencytop-0.5/fsync.c
+@@ -151,7 +151,7 @@ int enable_fsync_tracer(void)
+  * echo ftrace_printk > iter_ctrl 
+  * echo 1 > tracing_on
+  */
+-	ret = system("/bin/mount -t debugfs none /sys/kernel/debug/");
++	ret = system("/bin/mount -t debugfs none /sys/kernel/debug/ 2>/dev/null");
+ 	if (!ret) 
+ 		return -1;
+ 	write_to_file("/sys/kernel/debug/tracing/current_tracer", "fsync");
meta/recipes-kernel/latencytop/latencytop_0.5.bb +3 -2
index 516e2c5..9a95b92 100644
@@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a
 
 DEPENDS = "virtual/libintl ncurses glib-2.0  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
             file://latencytop-makefile.patch \
-            file://latencytop-fsync.patch"
+            file://latencytop-fsync.patch \
+            file://latencytop-fsync-mount.patch"
 
 SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
 SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
Signature · 1 line
1.9.1
#2 lore raw

Re: [PATCH v2 1/1] latencytop: fix mount error

meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch

Quoted 17 lines · Roxana Ciobanu

Bug was fixed by redirecting stderr to /dev/null. The error was caused because /sys/kernel/debug was already mounted by sysfs.sh.

[ YOCTO #6498 ]

Signed-off-by Roxana Ciobanu <[email protected]>
---
  .../latencytop/latencytop-0.5/latencytop-fsync-mount.patch  | 13 +++++++++++++
  meta/recipes-kernel/latencytop/latencytop_0.5.bb            |  5 +++--
  2 files changed, 16 insertions(+), 2 deletions(-)

create mode 100644 meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch

meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch new file +0 -0
new file mode 100644
index 0000000..043be75

This patch is missing a Signed-off-by: and an Upstream-Status.

Have you sent email to the latencytop list?

meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch line 10

Quoted 11 lines
meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch new file +10 -0
@@ -0,0 +1,13 @@
+Index: latencytop-0.5/fsync.c
+===================================================================
+--- latencytop-0.5.orig/fsync.c
++++ latencytop-0.5/fsync.c
+@@ -151,7 +151,7 @@ int enable_fsync_tracer(void)
+  * echo ftrace_printk > iter_ctrl
+  * echo 1 > tracing_on
+  */
+-	ret = system("/bin/mount -t debugfs none /sys/kernel/debug/");
++	ret = system("/bin/mount -t debugfs none /sys/kernel/debug/ 2>/dev/null");

So this is masking the issue, not addressing it, but this will cause other true errors to be masked. I think Ross's suggestion of using stat() to check for the existance of a file in debugfs would be better.

Quoted 8 lines
meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync-mount.patch new file +3 -0
+ 	if (!ret)
+ 		return -1;
+ 	write_to_file("/sys/kernel/debug/tracing/current_tracer", "fsync");
meta/recipes-kernel/latencytop/latencytop_0.5.bb +0 -0
index 516e2c5..9a95b92 100644

meta/recipes-kernel/latencytop/latencytop_0.5.bb LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a · line 10

Quoted 6 lines
meta/recipes-kernel/latencytop/latencytop_0.5.bb +1 -1
@@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a
 
  DEPENDS = "virtual/libintl ncurses glib-2.0  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
 
-PR = "r3"
+PR = "r4"

PR Bumps are not needed any more

Sau!

Quoted 9 lines
meta/recipes-kernel/latencytop/latencytop_0.5.bb +2 -1
  SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
              file://latencytop-makefile.patch \
-            file://latencytop-fsync.patch"
+            file://latencytop-fsync.patch \
+            file://latencytop-fsync-mount.patch"
 
  SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
  SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
#3 lore raw

Re: [PATCH v2 1/1] latencytop: fix mount error

Quoted 2 lines · Saul Wold

I think Ross's suggestion of using stat() to check for the existance of a file in debugfs would be better.

At least one good way of checking if a directory is a mount point is to compare the device of / and /debug using stat(). For example:

$ stat -c %d /
2049
$ stat -c %d /sys
13

Different devices, so /sys is a mount.

Ross

#4 lore raw

Re: [PATCH v2 1/1] latencytop: fix mount error

Quoted 7 lines · Ross
Quoted 2 lines · Saul Wold

I think Ross's suggestion of using stat() to check for the existance of a file in debugfs would be better.

At least one good way of checking if a directory is a mount point is to compare the device of / and /debug using stat(). For example:

Quoted 6 lines
$ stat -c %d /
2049
$ stat -c %d /sys
13

Different devices, so /sys is a mount.

This came up a while back in another context, and someone (Phil?) pointed out the "mountpoint" standard Unix command which does exactly this.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre