From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26473 invoked by alias); 7 Oct 2008 15:11:38 -0000 Received: (qmail 26461 invoked by uid 22791); 7 Oct 2008 15:11:37 -0000 X-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from tomts5-srv.bellnexxia.net (HELO tomts5-srv.bellnexxia.net) (209.226.175.25) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 07 Oct 2008 15:10:55 +0000 Received: from toip7.srvr.bell.ca ([209.226.175.124]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20081007151053.WKYC1572.tomts5-srv.bellnexxia.net@toip7.srvr.bell.ca> for ; Tue, 7 Oct 2008 11:10:53 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjQFAB8Z60hMQWq+/2dsb2JhbACBcrxxgWo Received: from bas5-montreal19-1279355582.dsl.bell.ca (HELO krystal.dyndns.org) ([76.65.106.190]) by toip7.srvr.bell.ca with ESMTP; 07 Oct 2008 11:11:46 -0400 Received: from localhost (localhost [127.0.0.1]) (uid 1000) by krystal.dyndns.org with local; Tue, 07 Oct 2008 11:10:52 -0400 id 001F223C.48EB7BFC.0000021B Date: Tue, 07 Oct 2008 15:11:00 -0000 From: Mathieu Desnoyers To: Lai Jiangshan Cc: KOSAKI Motohiro , Andrew Morton , Greg KH , stable@kernel.org, Linux Kernel Mailing List , Roland McGrath , Wenji Huang , Takashi Nishiie , systemtap@sourceware.org Subject: Re: [PATCH] markers: fix missing modpost entry in Module.markers Message-ID: <20081007151052.GC31970@Krystal> References: <48EB032B.3070200@cn.fujitsu.com> <20081007154401.5A59.KOSAKI.MOTOHIRO@jp.fujitsu.com> <48EB3542.2060306@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline In-Reply-To: <48EB3542.2060306@cn.fujitsu.com> X-Editor: vi X-Info: http://krystal.dyndns.org:8080 X-Operating-System: Linux/2.6.21.3-grsec (i686) X-Uptime: 11:06:45 up 124 days, 19:47, 8 users, load average: 1.79, 0.72, 0.56 User-Agent: Mutt/1.5.16 (2007-06-11) X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2008-q4/txt/msg00075.txt.bz2 Hi Lai, I tried to fix it in a way that would still not duplicate marker entries, which is what the patch we are trying to repair was supposed to do. The patch you propose here seems to go back to the old behavior where we can have duplicate marker entries. I did not verify extensively that my new patch does not duplicate marker entries though, but I tried to follow the logic of your original patch. Mathieu * Lai Jiangshan (laijs@cn.fujitsu.com) wrote: > KOSAKI Motohiro wrote: > > Hi Lai > > > > Have you seen "Markers in (non-module) kernel code?" thread? > > I think this patch and that patch treat the same issue. > > > > I didn't notice that thread. > > > In addition, I think mathieu's patch is better. > > I greed with you, Mathieu's patch is better. > > Thanks. > > > So, Could I hear your opinition for that? > > > > > >> commit d35cb360c29956510b2fe1a953bd4968536f7216 brought a bug. > >> marker points compiled in vmlinux are missing in Module.markers. > >> > >> # cat Module.markers > >> subsystem_event samples/markers/marker-example integer %d string %s > >> subsystem_eventb samples/markers/marker-example > >> > >> # stap -e 'probe kernel.mark("core_marker_format"){} ' > >> semantic error: no match while resolving probe point kernel.mark("core_marker_format") > >> semantic error: no probes found > >> Pass 2: analysis failed. Try again with more '-v' (verbose) options. > >> > >> This patch revert a part of d35cb360c29956510b2fe1a953bd4968536f7216. > >> Other parts have fixed duplicate modpost entry bug. > >> > >> > >> Signed-off-by: Lai Jiangshan > >> --- > >> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > >> index 418cd7d..3509142 100644 > >> --- a/scripts/mod/modpost.c > >> +++ b/scripts/mod/modpost.c > >> @@ -1992,8 +1992,7 @@ static void read_markers(const char *fname) > >> mod->skip = 1; > >> } > >> > >> - if (!mod->skip) > >> - add_marker(mod, marker, fmt); > >> + add_marker(mod, marker, fmt); > >> } > >> return; > >> fail: > >> > >> > >> -- > >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > >> the body of a message to majordomo@vger.kernel.org > >> More majordomo info at http://vger.kernel.org/majordomo-info.html > >> Please read the FAQ at http://www.tux.org/lkml/ > > > > > > > > > > > > > > -- Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68