FROMLIST: PCI: Fix PREL32 relocations for LTO
With Clang's Link Time Optimization (LTO), the compiler can rename static functions to avoid global naming collisions. As PCI fixup functions are typically static, renaming can break references to them in inline assembly. This change adds a global stub to DECLARE_PCI_FIXUP_SECTION to fix the issue when PREL32 relocations are used. Bug: 145210207 Change-Id: Iaf4a28d14c5ab86d49d6fec07704c3cb48301d64 Link: https://lore.kernel.org/lkml/20201211184633.3213045-10-samitolvanen@google.com/ Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
@@ -1912,19 +1912,28 @@ enum pci_fixup_pass {
|
||||
};
|
||||
|
||||
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
|
||||
#define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook) \
|
||||
__ADDRESSABLE(hook) \
|
||||
#define ___DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook, stub) \
|
||||
void stub(struct pci_dev *dev); \
|
||||
void stub(struct pci_dev *dev) \
|
||||
{ \
|
||||
hook(dev); \
|
||||
} \
|
||||
asm(".section " #sec ", \"a\" \n" \
|
||||
".balign 16 \n" \
|
||||
".short " #vendor ", " #device " \n" \
|
||||
".long " #class ", " #class_shift " \n" \
|
||||
".long " #hook " - . \n" \
|
||||
".long " #stub " - . \n" \
|
||||
".previous \n");
|
||||
|
||||
#define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook, stub) \
|
||||
___DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook, stub)
|
||||
#define DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook) \
|
||||
__DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
|
||||
class_shift, hook)
|
||||
class_shift, hook, __UNIQUE_ID(hook))
|
||||
#else
|
||||
/* Anonymous variables would be nice... */
|
||||
#define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class, \
|
||||
|
Reference in New Issue
Block a user