Skip to contentSkip to conversation

Marker depmod fix core kernel list

PATCH Mathieu Desnoyers 1 participant 1 message Oct 6, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Do you think this fix could be pulled in before 2.6.27 final ?

Thanks,

Mathieu

Quoted 15 lines · * Theodore Ts'o ([email protected]) wrote:

I've been playing with adding some markers into ext4 to see if they could be useful in solving some problems along with Systemtap. It appears, though, that as of 2.6.27-rc8, markers defined in code which is compiled directly into the kernel (i.e., not as modules) don't show up in Module.markers:

kvm_trace_entryexit arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u kvm_trace_handler arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u kvm_trace_entryexit arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u kvm_trace_handler arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u

(Note the lack of any of the kernel_sched_* markers, and the markers I added for ext4_* and jbd2_* are missing as wel.)

Quoted 8 lines

Systemtap apparently depends on in-kernel trace_mark being recorded in Module.markers, and apparently it's been claimed that it used to be there. Is this a bug in systemtap, or in how Module.markers is getting
built? And is there a file that contains the equivalent information
for markers located in non-modules code?

Thanks, regards,

I think the problem comes from this patch :
commit d35cb360c29956510b2fe1a953bd4968536f7216
"markers: fix duplicate modpost entry"

Especially :

- add_marker(mod, marker, fmt);
+ if (!mod->skip)
+ add_marker(mod, marker, fmt);
}
return;
fail:

Here is a fix that should take care if this problem.

Thanks for the bug report!

CC Linus Torvalds <[email protected]>
CC Greg KH <[email protected]>
CC David Smith <[email protected]>
CC Roland McGrath <[email protected]>
CC Sam Ravnborg <[email protected]>
CC Wenji Huang <[email protected]>
CC Takashi Nishiie <[email protected]>
---
 scripts/mod/modpost.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/mod/modpost.c +4 -2
Index: linux-2.6-lttng/scripts/mod/modpost.c
===================================================================
@@ -1986,11 +1986,13 @@ static void read_markers(const char *fna
 
 		mod = find_module(modname);
 		if (!mod) {
-			if (is_vmlinux(modname))
-				have_vmlinux = 1;
 			mod = new_module(NOFAIL(strdup(modname)));
 			mod->skip = 1;
 		}
+		if (is_vmlinux(modname)) {
+			have_vmlinux = 1;
+			mod->skip = 0;
+		}
 
 		if (!mod->skip)
 			add_marker(mod, marker, fmt);
Signature · 2 lines
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68