* [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names
@ 2013-11-11 13:40 Michal Marek
2013-11-12 8:40 ` Michal Marek
2013-11-25 23:06 ` Bjorn Helgaas
0 siblings, 2 replies; 5+ messages in thread
From: Michal Marek @ 2013-11-11 13:40 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kbuild, Bjorn Helgaas, linux-pci, Andi Kleen, Joe Mario
Pasting the verbatim PCI_(VENDOR|DEVICE)_* macros in the __pci_fixup_*
symbol names results in insanely long names such as
__pci_fixup_resumePCI_VENDOR_ID_SERVERWORKSPCI_DEVICE_ID_SERVERWORKS_HT1000SBquirk_disable_broadcom_boot_interrupt
When LTO adds its numeric suffix to such symbol, it overflows the
namebuf[KSYM_NAME_LEN] array. Use the line number instead to create
(nearly) unique symbol names.
Reported-by: Joe Mario <jmario@redhat.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Mario <jmario@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
include/linux/pci.h | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index da172f9..1ff4dec 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1557,65 +1557,65 @@ enum pci_fixup_pass {
/* Anonymous variables would be nice... */
#define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class, \
class_shift, hook) \
- static const struct pci_fixup __pci_fixup_##name __used \
+ static const struct pci_fixup __PASTE(__pci_fixup_##name,__LINE__) __used \
__attribute__((__section__(#section), aligned((sizeof(void *))))) \
= { vendor, device, class, class_shift, hook };
#define DECLARE_PCI_FIXUP_CLASS_EARLY(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early, \
- vendor##device##hook, vendor, device, class, class_shift, hook)
+ hook, vendor, device, class, class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_HEADER(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header, \
- vendor##device##hook, vendor, device, class, class_shift, hook)
+ hook, vendor, device, class, class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_FINAL(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final, \
- vendor##device##hook, vendor, device, class, class_shift, hook)
+ hook, vendor, device, class, class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_ENABLE(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable, \
- vendor##device##hook, vendor, device, class, class_shift, hook)
+ hook, vendor, device, class, class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_RESUME(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume, \
- resume##vendor##device##hook, vendor, device, class, \
+ resume##hook, vendor, device, class, \
class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early, \
- resume_early##vendor##device##hook, vendor, device, \
+ resume_early##hook, vendor, device, \
class, class_shift, hook)
#define DECLARE_PCI_FIXUP_CLASS_SUSPEND(vendor, device, class, \
class_shift, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
- suspend##vendor##device##hook, vendor, device, class, \
+ suspend##hook, vendor, device, class, \
class_shift, hook)
#define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early, \
- vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_HEADER(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header, \
- vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_FINAL(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final, \
- vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable, \
- vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
+ hook, vendor, device, PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume, \
- resume##vendor##device##hook, vendor, device, \
+ resume##hook, vendor, device, \
PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_RESUME_EARLY(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early, \
- resume_early##vendor##device##hook, vendor, device, \
+ resume_early##hook, vendor, device, \
PCI_ANY_ID, 0, hook)
#define DECLARE_PCI_FIXUP_SUSPEND(vendor, device, hook) \
DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
- suspend##vendor##device##hook, vendor, device, \
+ suspend##hook, vendor, device, \
PCI_ANY_ID, 0, hook)
#ifdef CONFIG_PCI_QUIRKS
--
1.8.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names
2013-11-11 13:40 [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names Michal Marek
@ 2013-11-12 8:40 ` Michal Marek
2013-11-25 22:18 ` Bjorn Helgaas
2013-11-25 23:06 ` Bjorn Helgaas
1 sibling, 1 reply; 5+ messages in thread
From: Michal Marek @ 2013-11-12 8:40 UTC (permalink / raw)
To: linux-kernel
Cc: linux-kbuild, Bjorn Helgaas, linux-pci, Andi Kleen, Joe Mario
On 11.11.2013 14:40, Michal Marek wrote:
> Pasting the verbatim PCI_(VENDOR|DEVICE)_* macros in the __pci_fixup_*
> symbol names results in insanely long names such as
>
> __pci_fixup_resumePCI_VENDOR_ID_SERVERWORKSPCI_DEVICE_ID_SERVERWORKS_HT1000SBquirk_disable_broadcom_boot_interrupt
>
> When LTO adds its numeric suffix to such symbol, it overflows the
> namebuf[KSYM_NAME_LEN] array. Use the line number instead to create
"... the namebuf[KSYM_NAME_LEN] array in kernel/kallsyms.c."
That way, the changelog is hopefully more clear.
Michal
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names
2013-11-12 8:40 ` Michal Marek
@ 2013-11-25 22:18 ` Bjorn Helgaas
2013-11-25 23:02 ` Andi Kleen
0 siblings, 1 reply; 5+ messages in thread
From: Bjorn Helgaas @ 2013-11-25 22:18 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kernel@vger.kernel.org, linux-kbuild,
linux-pci@vger.kernel.org, Andi Kleen, Joe Mario
On Tue, Nov 12, 2013 at 1:40 AM, Michal Marek <mmarek@suse.cz> wrote:
> On 11.11.2013 14:40, Michal Marek wrote:
>> Pasting the verbatim PCI_(VENDOR|DEVICE)_* macros in the __pci_fixup_*
>> symbol names results in insanely long names such as
>>
>> __pci_fixup_resumePCI_VENDOR_ID_SERVERWORKSPCI_DEVICE_ID_SERVERWORKS_HT1000SBquirk_disable_broadcom_boot_interrupt
>>
>> When LTO adds its numeric suffix to such symbol, it overflows the
>> namebuf[KSYM_NAME_LEN] array. Use the line number instead to create
>
> "... the namebuf[KSYM_NAME_LEN] array in kernel/kallsyms.c."
What's LTO? I guess it's Link Time Optimization? Is there any
documentation about how it works or how to use it?
Bjorn
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names
2013-11-25 22:18 ` Bjorn Helgaas
@ 2013-11-25 23:02 ` Andi Kleen
0 siblings, 0 replies; 5+ messages in thread
From: Andi Kleen @ 2013-11-25 23:02 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Michal Marek, linux-kernel@vger.kernel.org, linux-kbuild,
linux-pci@vger.kernel.org, Joe Mario
> What's LTO? I guess it's Link Time Optimization? Is there any
Yes. Link Time Optimization with modern gcc.
> documentation about how it works or how to use it?
It's still a separate tree, but bits'n'pieces are slowly
making it into the kernel.
https://github.com/andikleen/linux-misc/tree/lto-3.12
https://github.com/andikleen/linux-misc/blob/5a18e33264321b01816a220ab14207a5f26ae16e/Documentation/lto-build
http://halobates.de/kernel-lto.pdf
-Andi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names
2013-11-11 13:40 [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names Michal Marek
2013-11-12 8:40 ` Michal Marek
@ 2013-11-25 23:06 ` Bjorn Helgaas
1 sibling, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2013-11-25 23:06 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kernel@vger.kernel.org, linux-kbuild,
linux-pci@vger.kernel.org, Andi Kleen, Joe Mario
On Mon, Nov 11, 2013 at 6:40 AM, Michal Marek <mmarek@suse.cz> wrote:
> Pasting the verbatim PCI_(VENDOR|DEVICE)_* macros in the __pci_fixup_*
> symbol names results in insanely long names such as
>
> __pci_fixup_resumePCI_VENDOR_ID_SERVERWORKSPCI_DEVICE_ID_SERVERWORKS_HT1000SBquirk_disable_broadcom_boot_interrupt
>
> When LTO adds its numeric suffix to such symbol, it overflows the
> namebuf[KSYM_NAME_LEN] array. Use the line number instead to create
> (nearly) unique symbol names.
>
> Reported-by: Joe Mario <jmario@redhat.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org
> Cc: Andi Kleen <ak@linux.intel.com>
> Cc: Joe Mario <jmario@redhat.com>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
Applied to my for-linus branch for v3.13, thanks.
> ---
> include/linux/pci.h | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index da172f9..1ff4dec 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1557,65 +1557,65 @@ enum pci_fixup_pass {
> /* Anonymous variables would be nice... */
> #define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class, \
> class_shift, hook) \
> - static const struct pci_fixup __pci_fixup_##name __used \
> + static const struct pci_fixup __PASTE(__pci_fixup_##name,__LINE__) __used \
> __attribute__((__section__(#section), aligned((sizeof(void *))))) \
> = { vendor, device, class, class_shift, hook };
>
> #define DECLARE_PCI_FIXUP_CLASS_EARLY(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early, \
> - vendor##device##hook, vendor, device, class, class_shift, hook)
> + hook, vendor, device, class, class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_HEADER(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header, \
> - vendor##device##hook, vendor, device, class, class_shift, hook)
> + hook, vendor, device, class, class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_FINAL(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final, \
> - vendor##device##hook, vendor, device, class, class_shift, hook)
> + hook, vendor, device, class, class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_ENABLE(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable, \
> - vendor##device##hook, vendor, device, class, class_shift, hook)
> + hook, vendor, device, class, class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_RESUME(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume, \
> - resume##vendor##device##hook, vendor, device, class, \
> + resume##hook, vendor, device, class, \
> class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early, \
> - resume_early##vendor##device##hook, vendor, device, \
> + resume_early##hook, vendor, device, \
> class, class_shift, hook)
> #define DECLARE_PCI_FIXUP_CLASS_SUSPEND(vendor, device, class, \
> class_shift, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
> - suspend##vendor##device##hook, vendor, device, class, \
> + suspend##hook, vendor, device, class, \
> class_shift, hook)
>
> #define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early, \
> - vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
> + hook, vendor, device, PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_HEADER(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_header, \
> - vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
> + hook, vendor, device, PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_FINAL(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_final, \
> - vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
> + hook, vendor, device, PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable, \
> - vendor##device##hook, vendor, device, PCI_ANY_ID, 0, hook)
> + hook, vendor, device, PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume, \
> - resume##vendor##device##hook, vendor, device, \
> + resume##hook, vendor, device, \
> PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_RESUME_EARLY(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early, \
> - resume_early##vendor##device##hook, vendor, device, \
> + resume_early##hook, vendor, device, \
> PCI_ANY_ID, 0, hook)
> #define DECLARE_PCI_FIXUP_SUSPEND(vendor, device, hook) \
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend, \
> - suspend##vendor##device##hook, vendor, device, \
> + suspend##hook, vendor, device, \
> PCI_ANY_ID, 0, hook)
>
> #ifdef CONFIG_PCI_QUIRKS
> --
> 1.8.1.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-25 23:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-11 13:40 [PATCH 1/2] PCI: Do not use PCI ID macros in quirk names Michal Marek
2013-11-12 8:40 ` Michal Marek
2013-11-25 22:18 ` Bjorn Helgaas
2013-11-25 23:02 ` Andi Kleen
2013-11-25 23:06 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).