Return-Path: <linux-kernel-owner+willy=40w.ods.org-S269007AbUJELzY@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S269007AbUJELzY (ORCPT <rfc822;willy@w.ods.org>);
	Tue, 5 Oct 2004 07:55:24 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S269006AbUJELzY
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 5 Oct 2004 07:55:24 -0400
Received: from caramon.arm.linux.org.uk ([212.18.232.186]:9991 "EHLO
	caramon.arm.linux.org.uk") by vger.kernel.org with ESMTP
	id S269007AbUJELx3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 5 Oct 2004 07:53:29 -0400
Date: Tue, 5 Oct 2004 12:53:25 +0100
From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Richard Earnshaw <richard.earnshaw@arm.com>
Cc: linux-kernel@vger.kernel.org, Catalin Marinas <Catalin.Marinas@arm.com>,
       Rusty Russell <rusty@rustcorp.com.au>, Sam Ravnborg <sam@ravnborg.org>
Subject: Re: [RFC] ARM binutils feature churn causing kernel problems
Message-ID: <20041005125324.A6910@flint.arm.linux.org.uk>
Mail-Followup-To: Richard Earnshaw <richard.earnshaw@arm.com>,
	linux-kernel@vger.kernel.org,
	Catalin Marinas <Catalin.Marinas@arm.com>,
	Rusty Russell <rusty@rustcorp.com.au>,
	Sam Ravnborg <sam@ravnborg.org>
References: <20040927210305.A26680@flint.arm.linux.org.uk> <20041001211106.F30122@flint.arm.linux.org.uk> <tnxllemvgi7.fsf@arm.com> <1096931899.32500.37.camel@localhost.localdomain> <loom.20041005T130541-400@post.gmane.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <loom.20041005T130541-400@post.gmane.org>; from richard.earnshaw@arm.com on Tue, Oct 05, 2004 at 11:10:46AM +0000
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2887
Lines: 78

On Tue, Oct 05, 2004 at 11:10:46AM +0000, Richard Earnshaw wrote:
> Rusty Russell <rusty <at> rustcorp.com.au> writes:
> > Russell, I thought about not including any symbol which is not of form
> > "[A-Za-z0-9_]+" in kallsyms, for all archs: you are not the only one
> > with weird-ass symbols.  Is it that you want these mapping symbols in
> > /proc/kallsyms but ignored in backtraces, or you don't need them in
> > kallsyms altogether?
> > 
> > Thanks,
> > Rusty.
> 
> 
> Mapping symbols will always be encoded with STB_LOCAL and STT_NOTYPE.
> I would have thought it unlikely that the kernel would ever want to
> report against any symbol with those attributes and they could all
> be dropped on that basis.

(Richard - your mailer appears to have dropped people from the CC: list...)

How about this patch?  Is there a better way to parse the 'nm' output
to achieve the same as your suggestion above?

diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/kernel/module.c linux/kernel/module.c
--- orig/kernel/module.c	Wed Sep 22 16:07:38 2004
+++ linux/kernel/module.c	Tue Oct  5 12:46:01 2004
@@ -1923,6 +1923,10 @@ static const char *get_ksymbol(struct mo
 		if (mod->symtab[i].st_shndx == SHN_UNDEF)
 			continue;
 
+		if (ELF_ST_BIND(mod->symtab[i].st_info) == STB_LOCAL
+		    && ELF_ST_TYPE(mod->symtab[i].st_info) == STT_NOTYPE)
+			continue;
+
 		/* We ignore unnamed symbols: they're uninformative
 		 * and inserted at a whim. */
 		if (mod->symtab[i].st_value <= addr
diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/scripts/kallsyms.c linux/scripts/kallsyms.c
--- orig/scripts/kallsyms.c	Sun Jul 11 22:56:39 2004
+++ linux/scripts/kallsyms.c	Tue Oct  5 12:51:26 2004
@@ -32,6 +32,17 @@ usage(void)
 	exit(1);
 }
 
+/*
+ * This ignores the intensely annoying "mapping symbols" found
+ * in ARM ELF files: $a, $t and $d.
+ */
+static inline int
+is_arm_mapping_symbol(const char *str)
+{
+	return str[0] == '$' && strchr("atd", str[1]) &&
+	       (str[2] == '\0' || str[2] == '.');
+}
+
 static int
 read_symbol(FILE *in, struct sym_entry *s)
 {
@@ -56,7 +67,8 @@ read_symbol(FILE *in, struct sym_entry *
 		_sinittext = s->addr;
 	else if (strcmp(str, "_einittext") == 0)
 		_einittext = s->addr;
-	else if (toupper(s->type) == 'A' || toupper(s->type) == 'U')
+	else if (toupper(s->type) == 'A' || toupper(s->type) == 'U' ||
+		 is_arm_mapping_symbol(str))
 		return -1;
 
 	s->sym = strdup(str);

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core
-
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/