Skip to contentSkip to conversation

namespace: add source file location exceptions

PATCH In review Stephen Hemminger 2 participants 4 messages Oct 13, 2010 – Oct 27, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 namespace: add source file location exceptions

Teach namespace checker about some special case files where the source is in unusual location. This fixes many of the source file not found errors (more can be added), and also prevents false positives for functions not being used.

---
Applies after previous patches by Amerigo Wang

scripts/namespace.pl +24 -0
@@ -141,6 +141,26 @@ my %nameexception = (
     'VDSO32_sigreturn'	=> 1,
 );
 
+# Files with exceptions to source file location
+my %sourceloc = (
+    'net/dccp/dccp_probe.o'	=> 'probe',
+    'net/dccp/dccp_ipv4.o'	=> 'ipv4',
+    'net/dccp/dccp_ipv6.o'	=> 'ipv6',
+    'net/dccp/dccp_diag.o'	=> 'diag',
+    'drivers/char/hw_random/rng-core.o'	=> 'core',
+    'fs/fat/msdos.o'		=> 'namei_msdos',
+    'fs/fat/vfat.o'		=> 'namei_vfat',
+    'fs/nfs_common/nfs_acl.o'	=> 'nfsacl',
+    'sound/soundcore.o'		=> 'sound_core',
+    'drivers/md/dm-mirror.o'	=> 'dm-raid1',
+    'drivers/message/i2o/i2o_bus.o' => 'bus-osm',
+    'arch/x86/kvm/kvm-amd.o'	=> 'svm',
+    'arch/x86/kvm/kvm-intel.o'	=> 'vmx',
+    'arch/x86/crypto/twofish-x86_64.o' => 'twofish-x86_64-asm_64',
+    'arch/x86/crypto/aes-x86_64.o' => 'aes-x86_64-asm_64',
+    'arch/x86/crypto/aesni-intel.o' => 'aesni-intel_asm',
+    'arch/x86/crypto/salsa20-x86_64.o' => 'salsa20-x86_64-asm_64',
+);
 
 &find(\&linux_objects, '.');	# find the objects and do_nm on them
 &list_multiply_defined();
@@ -228,11 +248,15 @@ sub do_nm
 		return;
 	}
 	($source = $basename) =~ s/\.o$//;
+
+	$source = $sourceloc{$fullname} if ($sourceloc{$fullname});
+
 	if (-e "$source.c" || -e "$source.S") {
 		$source = "$objtree$File::Find::dir/$source";
 	} else {
 		$source = "$srctree$File::Find::dir/$source";
 	}
+
 	if (! -e "$source.c" && ! -e "$source.S") {
 		# No obvious source, exclude the object if it is conglomerate
 	        open(my $objdumpdata, "$objdump $basename|")
#1 lore raw
Quoted 8 lines · Stephen Hemminger

Teach namespace checker about some special case files where the source is in unusual location. This fixes many of the source file not found errors (more can be added), and also prevents false positives for functions not being used.

---
Applies after previous patches by Amerigo Wang

Applied to kbuild-2.6.git#misc, sorry for the delay.

Michal

#2 lore raw
Quoted 6 lines · On Thu, 28 Oct 2010 00:31:18 +0200 Michal Marek <[email protected]> wrote:
Quoted 5 lines · Stephen Hemminger

Teach namespace checker about some special case files where the source is in unusual location. This fixes many of the source file not found errors (more can be added), and also prevents false positives for functions not being used.

Quoted 7 lines
Quoted 3 lines

---
Applies after previous patches by Amerigo Wang

Applied to kbuild-2.6.git#misc, sorry for the delay.

Michal

That patch should not be included. It causes more problems than it solves, since then there are duplicate file locations which causes false duplicate symbol reports.

#3 lore raw
Quoted 3 lines · Stephen Hemminger

That patch should not be included. It causes more problems than it solves, since then there are duplicate file locations which causes false duplicate symbol reports.

Ah, ok, thanks for the info, I reverted the patch again.

Michal