Skip to contentSkip to conversation

Patch "tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2015 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-lib-traceevent-kbuffer-remove-extra-update-to-data-pointer-in-padding.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c5e691928bf166ac03430e957038b60adba3cf6c Mon Sep 17 00:00:00 2001

From: "Steven Rostedt (Red Hat)" <[email protected]>
Date: Tue, 24 Mar 2015 09:57:55 -0400
Subject: tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING

From: "Steven Rostedt (Red Hat)" <[email protected]>

commit c5e691928bf166ac03430e957038b60adba3cf6c upstream.

When a event PADDING is hit (a deleted event that is still in the ring buffer), translate_data() sets the length of the padding and also updates the data pointer which is passed back to the caller.

This is unneeded because the caller also updates the data pointer with the passed back length. translate_data() should not update the pointer, only set the length.

---
 tools/lib/traceevent/kbuffer-parse.c |    1 -
 1 file changed, 1 deletion(-)
tools/lib/traceevent/kbuffer-parse.c +0 -1
@@ -372,7 +372,6 @@ translate_data(struct kbuffer *kbuf, voi
 	switch (type_len) {
 	case KBUFFER_TYPE_PADDING:
 		*length = read_4(kbuf, data);
-		data += *length;
 		break;
 
 	case KBUFFER_TYPE_TIME_EXTEND:

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/ring-buffer-replace-this_cpu_-with-__this_cpu_.patch queue-3.14/tools-lib-traceevent-kbuffer-remove-extra-update-to-data-pointer-in-padding.patch