diff mbox

Handle non ABS crc symbols

Message ID 1376077524-27573-1-git-send-email-andi@firstfloor.org (mailing list archive)
State New, archived
Headers show

Commit Message

Andi Kleen Aug. 9, 2013, 7:45 p.m. UTC
From: Andi Kleen <ak@linux.intel.com>

For some reason I managed to trick gcc into create CRC symbols that
are not absolute anymore, but weak.

Make modpost handle this case.

Andrew, this should fix the bizarre warning. Seems like a toolchain
bug to me.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 scripts/mod/modpost.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Comments

Michal Marek Aug. 13, 2013, 8:02 p.m. UTC | #1
Added Rusty to CC.

Dne 9.8.2013 21:45, Andi Kleen napsal(a):
> From: Andi Kleen <ak@linux.intel.com>
> 
> For some reason I managed to trick gcc into create CRC symbols that
> are not absolute anymore, but weak.
> 
> Make modpost handle this case.
> 
> Andrew, this should fix the bizarre warning. Seems like a toolchain
> bug to me.
> 
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
>  scripts/mod/modpost.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 6216434..b3dd735 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -599,18 +599,17 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
>  	else
>  		export = export_from_sec(info, get_secindex(info, sym));
>  
> +	/* CRC'd symbol */
> +	if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
> +		crc = (unsigned int) sym->st_value;
> +		sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
> +				export);
> +	}
> +
>  	switch (sym->st_shndx) {
>  	case SHN_COMMON:
>  		warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
>  		break;
> -	case SHN_ABS:
> -		/* CRC'd symbol */
> -		if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
> -			crc = (unsigned int) sym->st_value;
> -			sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
> -					export);
> -		}
> -		break;
>  	case SHN_UNDEF:
>  		/* undefined symbol */
>  		if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rusty Russell Aug. 14, 2013, 1:46 a.m. UTC | #2
Michal Marek <mmarek@suse.cz> writes:
> Added Rusty to CC.
>
> Dne 9.8.2013 21:45, Andi Kleen napsal(a):
>> From: Andi Kleen <ak@linux.intel.com>
>> 
>> For some reason I managed to trick gcc into create CRC symbols that
>> are not absolute anymore, but weak.
>> 
>> Make modpost handle this case.
>> 
>> Andrew, this should fix the bizarre warning. Seems like a toolchain
>> bug to me.
>> 
>> Signed-off-by: Andi Kleen <ak@linux.intel.com>

Do you also end up with relocated CRCs, like ppc does?

See ARCH_RELOCATES_KCRCTAB in kernel/module.c.

Cheers,
Rusty.

>> ---
>>  scripts/mod/modpost.c | 15 +++++++--------
>>  1 file changed, 7 insertions(+), 8 deletions(-)
>> 
>> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
>> index 6216434..b3dd735 100644
>> --- a/scripts/mod/modpost.c
>> +++ b/scripts/mod/modpost.c
>> @@ -599,18 +599,17 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
>>  	else
>>  		export = export_from_sec(info, get_secindex(info, sym));
>>  
>> +	/* CRC'd symbol */
>> +	if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
>> +		crc = (unsigned int) sym->st_value;
>> +		sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
>> +				export);
>> +	}
>> +
>>  	switch (sym->st_shndx) {
>>  	case SHN_COMMON:
>>  		warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
>>  		break;
>> -	case SHN_ABS:
>> -		/* CRC'd symbol */
>> -		if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
>> -			crc = (unsigned int) sym->st_value;
>> -			sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
>> -					export);
>> -		}
>> -		break;
>>  	case SHN_UNDEF:
>>  		/* undefined symbol */
>>  		if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
>> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 6216434..b3dd735 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -599,18 +599,17 @@  static void handle_modversions(struct module *mod, struct elf_info *info,
 	else
 		export = export_from_sec(info, get_secindex(info, sym));
 
+	/* CRC'd symbol */
+	if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+		crc = (unsigned int) sym->st_value;
+		sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
+				export);
+	}
+
 	switch (sym->st_shndx) {
 	case SHN_COMMON:
 		warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
 		break;
-	case SHN_ABS:
-		/* CRC'd symbol */
-		if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
-			crc = (unsigned int) sym->st_value;
-			sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
-					export);
-		}
-		break;
 	case SHN_UNDEF:
 		/* undefined symbol */
 		if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&