Re: [ltt-dev] LTTng 0.10 for Linux 2.6.26

Re: [ltt-dev] LTTng 0.10 for Linux 2.6.26

[Mathieu Desnoyers]

* Takashi Nishiie (t-nishiie@np.css.fujitsu.com) wrote:
> Hi.
> 
> > http://ltt.polymtl.ca/lttng/patch-2.6.26-0.10.tar.bz2
> 
> I found a suspicious point though I compiled by the x86 architecture.
> 
>   Distribution: Red Hat Enterprise Linux 5
>   gcc: gcc-4.1.2-42.el5
> 
> In Module.markers
> <snip>
> kernel_arch_trap_exit	vmlinux	 
> kernel_irq_entry	vmlinux	irq_id %u kernel_mode %u
> kernel_irq_exit	vmlinux	 
> kernel_irq_exit	vmlinux	handled #1u%u
> kernel_kthread_stop	vmlinux	pid %d
> <snip>
> 
> Why are two kernel_irq_exit list?
> 

That's because you have an old Modules.markers in your tree. Try
deleting the old one and to recompile the kernel. This should probably
be fixed in modpost.c.

Mathieu

> Thank you,
> 
> --
> Takashi Nishiie
> 
> 
> 

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [ltt-dev] LTTng 0.10 for Linux 2.6.26

[Wenji Huang]

Mathieu Desnoyers wrote:
> * Takashi Nishiie (t-nishiie@np.css.fujitsu.com) wrote:
>> Hi.
>>
>>> http://ltt.polymtl.ca/lttng/patch-2.6.26-0.10.tar.bz2
>> I found a suspicious point though I compiled by the x86 architecture.
>>
>>   Distribution: Red Hat Enterprise Linux 5
>>   gcc: gcc-4.1.2-42.el5
>>
>> In Module.markers
>> <snip>
>> kernel_arch_trap_exit	vmlinux	 
>> kernel_irq_entry	vmlinux	irq_id %u kernel_mode %u
>> kernel_irq_exit	vmlinux	 
>> kernel_irq_exit	vmlinux	handled #1u%u
>> kernel_kthread_stop	vmlinux	pid %d
>> <snip>
>>
>> Why are two kernel_irq_exit list?
>>
> 
> That's because you have an old Modules.markers in your tree. Try
> deleting the old one and to recompile the kernel. This should probably
> be fixed in modpost.c.
> 
Remember it had been discussed in 
http://sources.redhat.com/ml/systemtap/2008-q1/msg00466.html

Roland's patch plus removing/emptying the file before vmlinux-modpost
in scripts/Makefile.modpost like:

  vmlinux.o: FORCE
+       @rm -fr $(kernelmarkersfile)
         $(call cmd,kernel-mod)

will solve the problem.

Regards,
Wenji

[PATCH] Fix markers duplicate modpost entry

[Mathieu Desnoyers]

When a kernel was rebuilt, the previous Module.markers was not cleared. It
caused markers with different format strings to appear as duplicates when a
markers was changed.

I merely merged the patches from Roland and Wenji here. It applies to
mainline (and is not intrusive, so will also apply to linux-next).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
From: Roland McGrath <roland@redhat dot com>
From: Wenji Huang <wenji.huang@oracle.com>
CC: akpm@linux-foundation.org
---
 scripts/Makefile.modpost |    1 +
 scripts/mod/modpost.c    |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-lttng/scripts/Makefile.modpost
===================================================================
--- linux-2.6-lttng.orig/scripts/Makefile.modpost	2008-07-17 02:47:44.000000000 -0400
+++ linux-2.6-lttng/scripts/Makefile.modpost	2008-07-17 02:48:17.000000000 -0400
@@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
 
 vmlinux.o: FORCE
+	@rm -fr $(kernelmarkersfile)
 	$(call cmd,kernel-mod)
 
 # Declare generated files as targets for modpost
Index: linux-2.6-lttng/scripts/mod/modpost.c
===================================================================
--- linux-2.6-lttng.orig/scripts/mod/modpost.c	2008-07-17 02:49:33.000000000 -0400
+++ linux-2.6-lttng/scripts/mod/modpost.c	2008-07-17 02:50:10.000000000 -0400
@@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
 			mod->skip = 1;
 		}
 
-		add_marker(mod, marker, fmt);
+		if (!mod->skip)
+			add_marker(mod, marker, fmt);
 	}
 	return;
 fail:

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [PATCH] Fix markers duplicate modpost entry

[Andrew Morton]

On Thu, 17 Jul 2008 03:03:21 -0400 Mathieu Desnoyers <compudj@krystal.dyndns.org> wrote:

> When a kernel was rebuilt, the previous Module.markers was not cleared. It
> caused markers with different format strings to appear as duplicates when a
> markers was changed.
> 
> I merely merged the patches from Roland and Wenji here. It applies to
> mainline (and is not intrusive, so will also apply to linux-next).

Is this fix needed in 2.6.26.x?  2.6.25.x?

> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> From: Roland McGrath <roland@redhat dot com>
> From: Wenji Huang <wenji.huang@oracle.com>
> CC: akpm@linux-foundation.org

whoa, what's all that about?

Patches can only have one Author: in git, and we indicate that in
emails by putting a From: line right at the top of the changelog. 
(Additional credits can and should be mentioned in the changelog text
of course).  When that From: line is missing we take the authorship
info from the email headers.

So according to the above, this patch has three authors.  Geeze, even I
can type faster than that!

Who wrote it?

> ---
>  scripts/Makefile.modpost |    1 +
>  scripts/mod/modpost.c    |    3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> Index: linux-2.6-lttng/scripts/Makefile.modpost
> ===================================================================
> --- linux-2.6-lttng.orig/scripts/Makefile.modpost	2008-07-17 02:47:44.000000000 -0400
> +++ linux-2.6-lttng/scripts/Makefile.modpost	2008-07-17 02:48:17.000000000 -0400
> @@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
>        cmd_kernel-mod = $(modpost) $@
>  
>  vmlinux.o: FORCE
> +	@rm -fr $(kernelmarkersfile)
>  	$(call cmd,kernel-mod)
>  
>  # Declare generated files as targets for modpost
> Index: linux-2.6-lttng/scripts/mod/modpost.c
> ===================================================================
> --- linux-2.6-lttng.orig/scripts/mod/modpost.c	2008-07-17 02:49:33.000000000 -0400
> +++ linux-2.6-lttng/scripts/mod/modpost.c	2008-07-17 02:50:10.000000000 -0400
> @@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
>  			mod->skip = 1;
>  		}
>  
> -		add_marker(mod, marker, fmt);
> +		if (!mod->skip)
> +			add_marker(mod, marker, fmt);
>  	}
>  	return;
>  fail:

RE: [ltt-dev] LTTng 0.10 for Linux 2.6.26

[Takashi Nishiie]

Wenji Huang wrote:
>
>Mathieu Desnoyers wrote:
>> * Takashi Nishiie (t-nishiie@np.css.fujitsu.com) wrote:
>>> Hi.
>>>
>>>> http://ltt.polymtl.ca/lttng/patch-2.6.26-0.10.tar.bz2
>>> I found a suspicious point though I compiled by the x86 architecture.
>>>
>>>   Distribution: Red Hat Enterprise Linux 5
>>>   gcc: gcc-4.1.2-42.el5
>>>
>>> In Module.markers
>>> <snip>
>>> kernel_arch_trap_exit	vmlinux	 
>>> kernel_irq_entry	vmlinux	irq_id %u kernel_mode %u
>>> kernel_irq_exit	vmlinux	 
>>> kernel_irq_exit	vmlinux	handled #1u%u
>>> kernel_kthread_stop	vmlinux	pid %d
>>> <snip>
>>>
>>> Why are two kernel_irq_exit list?
>>>
>> 
>> That's because you have an old Modules.markers in your tree. Try
>> deleting the old one and to recompile the kernel. This should probably
>> be fixed in modpost.c.
>> 
>Remember it had been discussed in 
>http://sources.redhat.com/ml/systemtap/2008-q1/msg00466.html
>

It is a mysterious problem. 

Env.1
   Architecture: x86
   Distribution: Red Hat Enterprise Linux 5
   gcc: gcc-4.1.2-42.el5

   In this environment, other marker is normally listed though two 
   kernel_irq_exit is listed even if Modules.markers is deleted 
   before it compiles. The problem was solved by using Roland 's 
   patch.

Env.2
   Architecture: x86_64
   Distribution: Fedora 9
   gcc: gcc-4.3.0-8

   In this environment, Module.markers is normally made. But,when Roland's
   patch was used oppositely, kernel marker that existed in source 
   codes other than the samples directory and the ltt directory was not
   listed. 

There might be some problems in my compilation environment.
Is Module.markers normally generated to you?

>Roland's patch plus removing/emptying the file before vmlinux-modpost
>in scripts/Makefile.modpost like:
>
>  vmlinux.o: FORCE
>+       @rm -fr $(kernelmarkersfile)
>         $(call cmd,kernel-mod)
>
>will solve the problem.

I think that Module.markers should delete it when "Make clean" is executed. 

Makefile:

clean: archclean $(clean-dirs)
        $(call cmd,rmdirs)
        $(call cmd,rmfiles)
        @find . $(RCS_FIND_IGNORE) \
                \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
                -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-               -o -name '*.symtypes' -o -name 'modules.order' \) \
+               -o -name '*.symtypes' -o -name 'modules.order' \
+		-o -name 'Module.markers' \) \
                -type f -print | xargs rm -f

Thank you,

--
Takashi Nishiie

Re: [PATCH] Fix markers duplicate modpost entry

[Mathieu Desnoyers]

* Andrew Morton (akpm@linux-foundation.org) wrote:
> On Thu, 17 Jul 2008 03:03:21 -0400 Mathieu Desnoyers <compudj@krystal.dyndns.org> wrote:
> 
> > When a kernel was rebuilt, the previous Module.markers was not cleared. It
> > caused markers with different format strings to appear as duplicates when a
> > markers was changed.
> > 
> > I merely merged the patches from Roland and Wenji here. It applies to
> > mainline (and is not intrusive, so will also apply to linux-next).
> 
> Is this fix needed in 2.6.26.x?  2.6.25.x?
> 

Yes, it's needed in 2.6.26.x and 2.6.25, but I doubt it is critical :
only needed for systemtap users which use markers and rebuild their
kernel after having changed a marker format string.

> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> > From: Roland McGrath <roland@redhat dot com>
> > From: Wenji Huang <wenji.huang@oracle.com>
> > CC: akpm@linux-foundation.org
> 
> whoa, what's all that about?
> 
> Patches can only have one Author: in git, and we indicate that in
> emails by putting a From: line right at the top of the changelog. 
> (Additional credits can and should be mentioned in the changelog text
> of course).  When that From: line is missing we take the authorship
> info from the email headers.
> 
> So according to the above, this patch has three authors.  Geeze, even I
> can type faster than that!
> 

hehehe :)

> Who wrote it?
> 

I took the diffs Roland and Wenji sent in separate emails and created
this patch. They are the ones who actually identified the solution. So I
guess I should be the author, with credits to them, if they are ok with
that.

Mathieu


> > ---
> >  scripts/Makefile.modpost |    1 +
> >  scripts/mod/modpost.c    |    3 ++-
> >  2 files changed, 3 insertions(+), 1 deletion(-)
> > 
> > Index: linux-2.6-lttng/scripts/Makefile.modpost
> > ===================================================================
> > --- linux-2.6-lttng.orig/scripts/Makefile.modpost	2008-07-17 02:47:44.000000000 -0400
> > +++ linux-2.6-lttng/scripts/Makefile.modpost	2008-07-17 02:48:17.000000000 -0400
> > @@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
> >        cmd_kernel-mod = $(modpost) $@
> >  
> >  vmlinux.o: FORCE
> > +	@rm -fr $(kernelmarkersfile)
> >  	$(call cmd,kernel-mod)
> >  
> >  # Declare generated files as targets for modpost
> > Index: linux-2.6-lttng/scripts/mod/modpost.c
> > ===================================================================
> > --- linux-2.6-lttng.orig/scripts/mod/modpost.c	2008-07-17 02:49:33.000000000 -0400
> > +++ linux-2.6-lttng/scripts/mod/modpost.c	2008-07-17 02:50:10.000000000 -0400
> > @@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
> >  			mod->skip = 1;
> >  		}
> >  
> > -		add_marker(mod, marker, fmt);
> > +		if (!mod->skip)
> > +			add_marker(mod, marker, fmt);
> >  	}
> >  	return;
> >  fail:
> 

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [PATCH] Fix markers duplicate modpost entry (update)

[Mathieu Desnoyers]

When a kernel was rebuilt, the previous Module.markers was not cleared. It
caused markers with different format strings to appear as duplicates when a
markers was changed. This problem is present since scripts/mod/modpost.c started
to generate Module.markers,
commit b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0

It therefore applies to 2.6.25, 2.6.26 and linux-next.

I merely merged the patches from Roland, Wenji and Takashi here.

Credits to
Roland McGrath <roland@redhat.com>
Wenji Huang <wenji.huang@oracle.com> 
and
Takashi Nishiie <t-nishiie@np.css.fujitsu.com>

for providing the individual fixes.

- Changelog :
  - Integrated Takashi's Makefile modification to clear Module.markers upon
    make clean.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Roland McGrath <roland@redhat.com>
CC: Wenji Huang <wenji.huang@oracle.com>
CC: Takashi Nishiie <t-nishiie@np.css.fujitsu.com>
CC: akpm@linux-foundation.org
---
 Makefile                 |    3 ++-
 scripts/Makefile.modpost |    1 +
 scripts/mod/modpost.c    |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6-lttng/scripts/Makefile.modpost
===================================================================
--- linux-2.6-lttng.orig/scripts/Makefile.modpost	2008-07-17 02:47:44.000000000 -0400
+++ linux-2.6-lttng/scripts/Makefile.modpost	2008-07-17 02:48:17.000000000 -0400
@@ -101,6 +101,7 @@ quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
 
 vmlinux.o: FORCE
+	@rm -fr $(kernelmarkersfile)
 	$(call cmd,kernel-mod)
 
 # Declare generated files as targets for modpost
Index: linux-2.6-lttng/scripts/mod/modpost.c
===================================================================
--- linux-2.6-lttng.orig/scripts/mod/modpost.c	2008-07-17 02:49:33.000000000 -0400
+++ linux-2.6-lttng/scripts/mod/modpost.c	2008-07-17 02:50:10.000000000 -0400
@@ -1992,7 +1992,8 @@ static void read_markers(const char *fna
 			mod->skip = 1;
 		}
 
-		add_marker(mod, marker, fmt);
+		if (!mod->skip)
+			add_marker(mod, marker, fmt);
 	}
 	return;
 fail:
Index: linux-2.6-lttng/Makefile
===================================================================
--- linux-2.6-lttng.orig/Makefile	2008-07-17 10:37:44.000000000 -0400
+++ linux-2.6-lttng/Makefile	2008-07-17 10:38:34.000000000 -0400
@@ -1133,7 +1133,8 @@ clean: archclean $(clean-dirs)
 	@find . $(RCS_FIND_IGNORE) \
 		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-		-o -name '*.symtypes' -o -name 'modules.order' \) \
+		-o -name '*.symtypes' -o -name 'modules.order' \
+		-o -name 'Module.markers' \) \
 		-type f -print | xargs rm -f
 
 # mrproper - Delete all generated files, including .config
-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Re: [PATCH] Fix markers duplicate modpost entry (update)

[Andrew Morton]

On Thu, 17 Jul 2008 10:52:17 -0400
Mathieu Desnoyers <compudj@krystal.dyndns.org> wrote:

> Subject: Re: [PATCH] Fix markers duplicate modpost entry (update)

Please prepare the patch titles along the lines of

	[patch] subsystem-identifer: what i did to it

so this one would have been

	[patch] markers: fix markers duplicate modpost entry


It's for consistency, and for ease of reading commits mailing lists and
gitk titles and git-shortlog output, etc.

Thanks.

Re: [PATCH] Fix markers duplicate modpost entry (update)

[Randy Dunlap]

On Thu, 17 Jul 2008 15:28:37 -0700 Andrew Morton wrote:

> On Thu, 17 Jul 2008 10:52:17 -0400
> Mathieu Desnoyers <compudj@krystal.dyndns.org> wrote:
> 
> > Subject: Re: [PATCH] Fix markers duplicate modpost entry (update)
> 
> Please prepare the patch titles along the lines of
> 
> 	[patch] subsystem-identifer: what i did to it
> 
> so this one would have been
> 
> 	[patch] markers: fix markers duplicate modpost entry
> 
> 
> It's for consistency, and for ease of reading commits mailing lists and
> gitk titles and git-shortlog output, etc.

Agreed, although I would have used

	[PATCH] modpost: fix duplicate markers entries


---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/