diff mbox

[2/2] kallsyms: Revert back to 128 max symbol length

Message ID 1384177236-8371-2-git-send-email-mmarek@suse.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Michal Marek Nov. 11, 2013, 1:40 p.m. UTC
This reverts commits
f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and
eea0e9c (kbuild: Increase kallsyms max symbol length)
except for the added overflow check. The reason is a regression caused
by increasing the buffer:
http://marc.info/?l=linux-kernel&m=138387700415675.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Mario <jmario@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
 include/linux/kallsyms.h | 2 +-
 scripts/kallsyms.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Andi Kleen Nov. 11, 2013, 2:17 p.m. UTC | #1
On Mon, Nov 11, 2013 at 02:40:36PM +0100, Michal Marek wrote:
> This reverts commits
> f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and
> eea0e9c (kbuild: Increase kallsyms max symbol length)
> except for the added overflow check. The reason is a regression caused
> by increasing the buffer:
> http://marc.info/?l=linux-kernel&m=138387700415675.

Can you please wait a bit until we tracked down the problem?


-Andi

--
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
Michal Marek Nov. 11, 2013, 5:02 p.m. UTC | #2
On Mon, Nov 11, 2013 at 06:17:15AM -0800, Andi Kleen wrote:
> On Mon, Nov 11, 2013 at 02:40:36PM +0100, Michal Marek wrote:
> > This reverts commits
> > f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and
> > eea0e9c (kbuild: Increase kallsyms max symbol length)
> > except for the added overflow check. The reason is a regression caused
> > by increasing the buffer:
> > http://marc.info/?l=linux-kernel&m=138387700415675.
> 
> Can you please wait a bit until we tracked down the problem?

I'd like to send a pull request to Linus this week.

Michal
--
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
Joe Mario Nov. 12, 2013, 9:55 p.m. UTC | #3
On 11/11/2013 09:17 AM, Andi Kleen wrote:
> On Mon, Nov 11, 2013 at 02:40:36PM +0100, Michal Marek wrote:
>> This reverts commits
>> f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and
>> eea0e9c (kbuild: Increase kallsyms max symbol length)
>> except for the added overflow check. The reason is a regression caused
>> by increasing the buffer:
>> http://marc.info/?l=linux-kernel&m=138387700415675.
>
> Can you please wait a bit until we tracked down the problem?
>
>
> -Andi
>

Andi:
  Don Zickus and I have been trying to reproduce the problem with
  the config file Fengguang Wu sent to us, but so far have been unsuccessful.

  Given there are 5 other locations in the code that need to be changed
  from [128] to [KSYM_NAME_LEN], and that we still haven't found Fengguang's
  problem yet, I'd be in favor of letting Michal's revert patch 2/2 go forward.

  That would give us time to find the issue Fengguang reported.

Joe  




--
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
Michal Marek Nov. 13, 2013, 3:12 p.m. UTC | #4
On 12.11.2013 22:55, Joe Mario wrote:
>   Given there are 5 other locations in the code that need to be changed
>   from [128] to [KSYM_NAME_LEN], and that we still haven't found Fengguang's
>   problem yet, I'd be in favor of letting Michal's revert patch 2/2 go forward.

It's in kbuild.git#kbuild now. If Bjorn merges the PCI patch, then the
issue with LTO will be resolved even without increasing the symbol length.

Michal
--
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/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 5648870..6883e19 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -9,7 +9,7 @@ 
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 
-#define KSYM_NAME_LEN 255
+#define KSYM_NAME_LEN 128
 #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
 			 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
 
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 48afa20..518da86c 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -27,7 +27,7 @@ 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 #endif
 
-#define KSYM_NAME_LEN		255
+#define KSYM_NAME_LEN		128
 
 struct sym_entry {
 	unsigned long long addr;