Add generated modalias to modules.builtin.modinfo
Subsystems (12)
v6 cover Add generated modalias to modules.builtin.modinfo
The modules.builtin.modinfo file is used by userspace (kmod to be specific) to get information about builtin modules. Among other information about the module, information about module aliases is stored. This is very important to determine that a particular modalias will be handled by a module that is inside the kernel.
There are several mechanisms for creating modalias for modules:
The first is to explicitly specify the MODULE_ALIAS of the macro. In this case, the aliases go into the '.modinfo' section of the module if it is compiled separately or into vmlinux.o if it is builtin into the kernel.
The second is the use of MODULE_DEVICE_TABLE followed by the use of the modpost utility. In this case, vmlinux.o no longer has this information and does not get it into modules.builtin.modinfo.
For example:
$ modinfo pci:v00008086d0000A36Dsv00001043sd00008694bc0Csc03i30 modinfo: ERROR: Module pci:v00008086d0000A36Dsv00001043sd00008694bc0Csc03i30 not found.
$ modinfo xhci_pci name: xhci_pci filename: (builtin) license: GPL file: drivers/usb/host/xhci-pci description: xHCI PCI Host Controller Driver
The builtin module is missing alias "pci:v*d*sv*sd*bc0Csc03i30*" which will be generated by modpost if the module is built separately.
To fix this it is necessary to add the generated by modpost modalias to modules.builtin.modinfo. Fortunately modpost already generates .vmlinux.export.c for exported symbols. It is possible to add .modinfo for builtin modules and modify the build system so that .modinfo section is extracted from the intermediate vmlinux after modpost is executed.
---
Notes:
- v6:
* Rebase to v6.17-rc1-16-g8742b2d8935f to pick up the fixes made by Masahiro Yamada.
* Fix an issue on i386 configs caused by the use of string_32.h.
* v5: https://lore.kernel.org/all/[email protected]/
- v5:
* Rebase to v6.16-rc6-281-gf4a40a4282f4 to pick up the fixes made by Masahiro Yamada.
* Attempt to fix linker warning on s390.
* Fix typo in pinctrl/meson found by the kernel test robot.
* v4: https://lore.kernel.org/all/[email protected]/
- v4:
* Rework the patchset based on top of Masahiro Yamada's patches.
* Add removal of unnecessary __mod_device_table__* symbols to avoid symbol table growth in vmlinux.
* rust code takes into account changes in __mod_device_table__*.
* v3: https://lore.kernel.org/all/[email protected]/
- v3:
* Add Reviewed-by tag to patches from Petr Pavlu.
* Rebase to v6.15.
* v2: https://lore.kernel.org/all/[email protected]/
- v2:
* Drop patch for mfd because it was already applied and is in linux-next.
* The generation of aliases for builtin modules has been redone as suggested by Masahiro Yamada.
* Rebase to v6.15-rc5-136-g9c69f8884904
* v1: https://lore.kernel.org/all/[email protected]/
Alexey Gladkov (6):
scsi: Always define blogic_pci_tbl structure
pinctrl: meson: Fix typo in device table macro
modpost: Add modname to mod_device_table alias
modpost: Create modalias for builtin modules
kbuild: vmlinux.unstripped should always depend on .vmlinux.export.o
s390: vmlinux.lds.S: Reorder sections
Masahiro Yamada (3):
kbuild: always create intermediate vmlinux.unstripped
kbuild: keep .modinfo section in vmlinux.unstripped
kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
arch/s390/kernel/vmlinux.lds.S | 10 +-- drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 2 +- drivers/scsi/BusLogic.c | 4 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/module.h | 18 +++-- rust/kernel/device_id.rs | 8 +-- scripts/Makefile.vmlinux | 77 ++++++++++++++-------- scripts/Makefile.vmlinux_o | 26 +------- scripts/link-vmlinux.sh | 5 +- scripts/mksysmap | 6 ++ scripts/mod/file2alias.c | 34 ++++++++-- scripts/mod/modpost.c | 15 +++++ scripts/mod/modpost.h | 2 + 13 files changed, 130 insertions(+), 79 deletions(-)
Signature · 1 line
2.50.1
PATCH v6 1/9 kbuild: always create intermediate vmlinux.unstripped
From: Masahiro Yamada <[email protected]>
Generate the intermediate vmlinux.unstripped regardless of CONFIG_ARCH_VMLINUX_NEEDS_RELOCS.
If CONFIG_ARCH_VMLINUX_NEEDS_RELOCS is unset, vmlinux.unstripped and vmlinux are identiacal.
This simplifies the build rule, and allows to strip more sections by adding them to remove-section-y.
--- scripts/Makefile.vmlinux | 45 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 23 deletions(-)
scripts/Makefile.vmlinux +22 -23
@@ -9,20 +9,6 @@ include $(srctree)/scripts/Makefile.lib targets := -ifdef CONFIG_ARCH_VMLINUX_NEEDS_RELOCS -vmlinux-final := vmlinux.unstripped - -quiet_cmd_strip_relocs = RSTRIP $@ - cmd_strip_relocs = $(OBJCOPY) --remove-section='.rel*' --remove-section=!'.rel*.dyn' $< $@ - -vmlinux: $(vmlinux-final) FORCE - $(call if_changed,strip_relocs) - -targets += vmlinux -else -vmlinux-final := vmlinux -endif - %.o: %.c FORCE $(call if_changed_rule,cc_o_c)
@@ -61,19 +47,19 @@ targets += .builtin-dtbs-list ifdef CONFIG_GENERIC_BUILTIN_DTB targets += .builtin-dtbs.S .builtin-dtbs.o -$(vmlinux-final): .builtin-dtbs.o +vmlinux.unstripped: .builtin-dtbs.o endif -# vmlinux +# vmlinux.unstripped # --------------------------------------------------------------------------- ifdef CONFIG_MODULES targets += .vmlinux.export.o -$(vmlinux-final): .vmlinux.export.o +vmlinux.unstripped: .vmlinux.export.o endif ifdef CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX -$(vmlinux-final): arch/$(SRCARCH)/tools/vmlinux.arch.o +vmlinux.unstripped: arch/$(SRCARCH)/tools/vmlinux.arch.o arch/$(SRCARCH)/tools/vmlinux.arch.o: vmlinux.o FORCE $(Q)$(MAKE) $(build)=arch/$(SRCARCH)/tools $@
@@ -86,17 +72,30 @@ cmd_link_vmlinux = \ $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)" "$@"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) -targets += $(vmlinux-final) -$(vmlinux-final): scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE +targets += vmlinux.unstripped +vmlinux.unstripped: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE +$(call if_changed_dep,link_vmlinux) ifdef CONFIG_DEBUG_INFO_BTF -$(vmlinux-final): $(RESOLVE_BTFIDS) +vmlinux.unstripped: $(RESOLVE_BTFIDS) endif ifdef CONFIG_BUILDTIME_TABLE_SORT -$(vmlinux-final): scripts/sorttable +vmlinux.unstripped: scripts/sorttable endif +# vmlinux +# --------------------------------------------------------------------------- + +remove-section-y := +remove-section-$(CONFIG_ARCH_VMLINUX_NEEDS_RELOCS) += '.rel*' + +quiet_cmd_strip_relocs = OBJCOPY $@ + cmd_strip_relocs = $(OBJCOPY) $(addprefix --remove-section=,$(remove-section-y)) $< $@ + +targets += vmlinux +vmlinux: vmlinux.unstripped FORCE + $(call if_changed,strip_relocs) + # modules.builtin.ranges # --------------------------------------------------------------------------- ifdef CONFIG_BUILTIN_MODULE_RANGES
@@ -110,7 +109,7 @@ modules.builtin.ranges: $(srctree)/scripts/generate_builtin_ranges.awk \ modules.builtin vmlinux.map vmlinux.o.map FORCE $(call if_changed,modules_builtin_ranges) -vmlinux.map: $(vmlinux-final) +vmlinux.map: vmlinux.unstripped @: endif
Signature · 1 line
2.50.1
PATCH v6 2/9 kbuild: keep .modinfo section in vmlinux.unstripped
In reply to Alexey GladkovFrom: Masahiro Yamada <[email protected]>
Keep the .modinfo section during linking, but strip it from the final vmlinux.
Adjust scripts/mksysmap to exclude modinfo symbols from kallsyms.
This change will allow the next commit to extract the .modinfo section from the vmlinux.unstripped intermediate.
--- include/asm-generic/vmlinux.lds.h | 2 +- scripts/Makefile.vmlinux | 2 +- scripts/mksysmap | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -831,6 +831,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG)/* Required sections not related to debugging. */ #define ELF_DETAILS \ + .modinfo : { *(.modinfo) } \ .comment 0 : { *(.comment) } \ .symtab 0 : { *(.symtab) } \ .strtab 0 : { *(.strtab) } \
@@ -1044,7 +1045,6 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) *(.discard.*) \ *(.export_symbol) \ *(.no_trim_symbol) \ - *(.modinfo) \/* ld.bfd warns about .gnu.version* even when not emitted */ \ *(.gnu.version*) \
scripts/Makefile.vmlinux +1 -1
@@ -86,7 +86,7 @@ endif # vmlinux # --------------------------------------------------------------------------- -remove-section-y := +remove-section-y := .modinfo remove-section-$(CONFIG_ARCH_VMLINUX_NEEDS_RELOCS) += '.rel*' quiet_cmd_strip_relocs = OBJCOPY $@
scripts/mksysmap +3 -0
@@ -79,6 +79,9 @@ / _SDA_BASE_$/d / _SDA2_BASE_$/d +# MODULE_INFO() +/ __UNIQUE_ID_modinfo[0-9]*$/d + # --------------------------------------------------------------------------- # Ignored patterns # (symbols that contain the pattern are ignored)
Signature · 1 line
2.50.1
PATCH v6 3/9 kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
In reply to Alexey GladkovFrom: Masahiro Yamada <[email protected]>
Currently, we assume all the data for modules.builtin.modinfo are available in vmlinux.o.
This makes it impossible for modpost, which is invoked after vmlinux.o, to add additional module info.
This commit moves the modules.builtin.modinfo rule after modpost.
--- scripts/Makefile.vmlinux | 26 ++++++++++++++++++++++++++ scripts/Makefile.vmlinux_o | 26 +------------------------- 2 files changed, 27 insertions(+), 25 deletions(-)
scripts/Makefile.vmlinux +26 -0
@@ -96,6 +96,32 @@ targets += vmlinux vmlinux: vmlinux.unstripped FORCE $(call if_changed,strip_relocs) +# modules.builtin.modinfo +# --------------------------------------------------------------------------- + +OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary + +targets += modules.builtin.modinfo +modules.builtin.modinfo: vmlinux.unstripped FORCE + $(call if_changed,objcopy) + +# modules.builtin +# --------------------------------------------------------------------------- + +__default: modules.builtin + +# The second line aids cases where multiple modules share the same object. + +quiet_cmd_modules_builtin = GEN $@ + cmd_modules_builtin = \ + tr '\0' '\n' < $< | \ + sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ + tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ + +targets += modules.builtin +modules.builtin: modules.builtin.modinfo FORCE + $(call if_changed,modules_builtin) + # modules.builtin.ranges # --------------------------------------------------------------------------- ifdef CONFIG_BUILTIN_MODULE_RANGES
scripts/Makefile.vmlinux_o +1 -25
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only PHONY := __default -__default: vmlinux.o modules.builtin.modinfo modules.builtin +__default: vmlinux.o include include/config/auto.conf include $(srctree)/scripts/Kbuild.include
@@ -73,30 +73,6 @@ vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE targets += vmlinux.o -# modules.builtin.modinfo -# --------------------------------------------------------------------------- - -OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary - -targets += modules.builtin.modinfo -modules.builtin.modinfo: vmlinux.o FORCE - $(call if_changed,objcopy) - -# modules.builtin -# --------------------------------------------------------------------------- - -# The second line aids cases where multiple modules share the same object. - -quiet_cmd_modules_builtin = GEN $@ - cmd_modules_builtin = \ - tr '\0' '\n' < $< | \ - sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ - tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ - -targets += modules.builtin -modules.builtin: modules.builtin.modinfo FORCE - $(call if_changed,modules_builtin) - # Add FORCE to the prerequisites of a target to force it to be always rebuilt. # ---------------------------------------------------------------------------
Signature · 1 line
2.50.1
Re: [PATCH v6 3/9] kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
Quoted 6 lines · Alexey Gladkov
From: Masahiro Yamada <[email protected]>
Currently, we assume all the data for modules.builtin.modinfo are available in vmlinux.o.
Quoted 7 lines
This makes it impossible for modpost, which is invoked after vmlinux.o, to add additional module info.
This commit moves the modules.builtin.modinfo rule after modpost.
Signed-off-by Masahiro Yamada <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>
I got this report from Stephen
https://lore.kernel.org/lkml/[email protected]/
Please make sure to have no regression.
If this is difficult to solve, please discard this patch, and consider a different approach.
Quoted 89 lines
--- scripts/Makefile.vmlinux | 26 ++++++++++++++++++++++++++ scripts/Makefile.vmlinux_o | 26 +------------------------- 2 files changed, 27 insertions(+), 25 deletions(-)scripts/Makefile.vmlinux +26
-0@@ -96,6 +96,32 @@ targets += vmlinux vmlinux: vmlinux.unstripped FORCE $(call if_changed,strip_relocs) +# modules.builtin.modinfo +# --------------------------------------------------------------------------- + +OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary + +targets += modules.builtin.modinfo +modules.builtin.modinfo: vmlinux.unstripped FORCE + $(call if_changed,objcopy) + +# modules.builtin +# --------------------------------------------------------------------------- + +__default: modules.builtin + +# The second line aids cases where multiple modules share the same object. + +quiet_cmd_modules_builtin = GEN $@ + cmd_modules_builtin = \ + tr '\0' '\n' < $< | \ + sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ + tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ + +targets += modules.builtin +modules.builtin: modules.builtin.modinfo FORCE + $(call if_changed,modules_builtin) + # modules.builtin.ranges # --------------------------------------------------------------------------- ifdef CONFIG_BUILTIN_MODULE_RANGESscripts/Makefile.vmlinux_o +1
-26@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only PHONY := __default -__default: vmlinux.o modules.builtin.modinfo modules.builtin +__default: vmlinux.o include include/config/auto.conf include $(srctree)/scripts/Kbuild.include@@ -73,30 +73,6 @@ vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE targets += vmlinux.o -# modules.builtin.modinfo -# --------------------------------------------------------------------------- - -OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary - -targets += modules.builtin.modinfo -modules.builtin.modinfo: vmlinux.o FORCE - $(call if_changed,objcopy) - -# modules.builtin -# --------------------------------------------------------------------------- - -# The second line aids cases where multiple modules share the same object. - -quiet_cmd_modules_builtin = GEN $@ - cmd_modules_builtin = \ - tr '\0' '\n' < $< | \ - sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ - tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ - -targets += modules.builtin -modules.builtin: modules.builtin.modinfo FORCE - $(call if_changed,modules_builtin) - # Add FORCE to the prerequisites of a target to force it to be always rebuilt. # --------------------------------------------------------------------------- --2.50.1
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH v6 3/9] kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
Quoted 15 lines · Masahiro Yamada
Quoted 6 lines · Alexey Gladkov
From: Masahiro Yamada <[email protected]>
Currently, we assume all the data for modules.builtin.modinfo are available in vmlinux.o.
Quoted 7 lines
This makes it impossible for modpost, which is invoked after vmlinux.o, to add additional module info.
This commit moves the modules.builtin.modinfo rule after modpost.
Signed-off-by Masahiro Yamada <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>
Quoted 6 lines
I got this report from Stephen
https://lore.kernel.org/lkml/[email protected]/Please make sure to have no regression.
If this is difficult to solve, please discard this patch, and consider a different approach.
My emails must have gotten lost somewhere. Because I replied to that message right away and provided a fix. Stephen even applied it to the tree later. You were in CC whole time.
https://lore.kernel.org/all/[email protected]/
Tomorrow I will make a new version with the corrections I missed. But now, I'm not sure to which tree I should send it.
Quoted 96 lines
Quoted 90 lines
--- scripts/Makefile.vmlinux | 26 ++++++++++++++++++++++++++ scripts/Makefile.vmlinux_o | 26 +------------------------- 2 files changed, 27 insertions(+), 25 deletions(-)scripts/Makefile.vmlinux +26
-0@@ -96,6 +96,32 @@ targets += vmlinux vmlinux: vmlinux.unstripped FORCE $(call if_changed,strip_relocs) +# modules.builtin.modinfo +# --------------------------------------------------------------------------- + +OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary + +targets += modules.builtin.modinfo +modules.builtin.modinfo: vmlinux.unstripped FORCE + $(call if_changed,objcopy) + +# modules.builtin +# --------------------------------------------------------------------------- + +__default: modules.builtin + +# The second line aids cases where multiple modules share the same object. + +quiet_cmd_modules_builtin = GEN $@ + cmd_modules_builtin = \ + tr '\0' '\n' < $< | \ + sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ + tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ + +targets += modules.builtin +modules.builtin: modules.builtin.modinfo FORCE + $(call if_changed,modules_builtin) + # modules.builtin.ranges # --------------------------------------------------------------------------- ifdef CONFIG_BUILTIN_MODULE_RANGESscripts/Makefile.vmlinux_o +1
-26@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only PHONY := __default -__default: vmlinux.o modules.builtin.modinfo modules.builtin +__default: vmlinux.o include include/config/auto.conf include $(srctree)/scripts/Kbuild.include@@ -73,30 +73,6 @@ vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE targets += vmlinux.o -# modules.builtin.modinfo -# --------------------------------------------------------------------------- - -OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary - -targets += modules.builtin.modinfo -modules.builtin.modinfo: vmlinux.o FORCE - $(call if_changed,objcopy) - -# modules.builtin -# --------------------------------------------------------------------------- - -# The second line aids cases where multiple modules share the same object. - -quiet_cmd_modules_builtin = GEN $@ - cmd_modules_builtin = \ - tr '\0' '\n' < $< | \ - sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ - tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ - -targets += modules.builtin -modules.builtin: modules.builtin.modinfo FORCE - $(call if_changed,modules_builtin) - # Add FORCE to the prerequisites of a target to force it to be always rebuilt. # --------------------------------------------------------------------------- --2.50.1
Signature · 2 lines
Best Regards Masahiro Yamada
Signature · 1 line
Rgrds, legion
Nathan Chancellor
maintainerRe: [PATCH v6 3/9] kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
Quoted 8 lines · Alexey Gladkov
My emails must have gotten lost somewhere. Because I replied to that message right away and provided a fix. Stephen even applied it to the tree later. You were in CC whole time.
https://lore.kernel.org/all/[email protected]/
Tomorrow I will make a new version with the corrections I missed. But now, I'm not sure to which tree I should send it.
You can send it against kbuild-next:
https://git.kernel.org/kbuild/l/kbuild-next
Cheers,
Nathan
PATCH v6 4/9 scsi: Always define blogic_pci_tbl structure
In reply to Alexey GladkovThe blogic_pci_tbl structure is used by the MODULE_DEVICE_TABLE macro. There is no longer a need to protect it with the MODULE condition, since this no longer causes the compiler to warn about an unused variable.
To avoid warnings when -Wunused-const-variable option is used, mark it as __maybe_unused for such configuration.
--- drivers/scsi/BusLogic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/scsi/BusLogic.c +1 -3
@@ -3715,7 +3715,6 @@ static void __exit blogic_exit(void)__setup ("BusLogic=" , blogic_setup); -#ifdef MODULE /*static const struct pci_device_id blogic_pci_tbl[] = { { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -3725,13 +3724,12 @@ __setup("BusLogic=", blogic_setup);PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { } };*/ -static const struct pci_device_id blogic_pci_tbl[] = { +static const struct pci_device_id blogic_pci_tbl[]__maybe_unused = { {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER )}, {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC )}, {PCI_DEVICE (PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT )}, {0 , }, }; -#endif MODULE_DEVICE_TABLE (pci, blogic_pci_tbl);module_init (blogic_init);
Signature · 1 line
2.50.1
Martin K. Petersen
AppliedRe: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Alexey,
Quoted 7 lines
The
blogic_pci_tblstructure is used by theMODULE_DEVICE_TABLEmacro. There is no longer a need to protect it with the MODULE condition, since this no longer causes the compiler to warn about an unused variable.To avoid warnings when -Wunused-const-variable option is used, mark it as
__maybe_unusedfor such configuration.
Applied to 6.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Nathan Chancellor
maintainerRe: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Hi Martin,
Quoted 8 lines · Martin K. Petersen
Alexey,
Quoted 5 lines
The
blogic_pci_tblstructure is used by theMODULE_DEVICE_TABLEmacro. There is no longer a need to protect it with the MODULE condition, since this no longer causes the compiler to warn about an unused variable.
Quoted 4 lines
Quoted 2 lines
To avoid warnings when -Wunused-const-variable option is used, mark it as
__maybe_unusedfor such configuration.Applied to 6.18/scsi-staging, thanks!
I think I will need this change to apply patch 7 [1] to kbuild-next without any issues [2]. If there is little risk of conflict, could I take it with your Ack? Another option would be getting it into 6.17 as a fix so that I could back merge Linus's tree and apply the series on top. I am already going to have to do that for the pinctrl change that Linus W took [3].
[1]: https://lore.kernel.org/22b36a5807d943a84431298c18b41d093e01c371.1755170493.git.legion@kernel.org/
[2]: https://lore.kernel.org/[email protected]/
[3]: https://lore.kernel.org/CACRpkdZ9oyJ4aJ5Dcp_Dtv5qoiSo+g5cO7Uf4PmHgv_Z423onQ@mail.gmail.com/
Cheers,
Nathan
Martin K. Petersen
Acked-byRe: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Hi Nathan!
Quoted 5 lines
Quoted 1 line
Applied to 6.18/scsi-staging, thanks!
I think I will need this change to apply patch 7 [1] to kbuild-next without any issues [2]. If there is little risk of conflict, could I take it with your Ack?
Sure, no problem. Dropped the patch from my tree.
Signature · 1 line
Martin K. Petersen
Nathan Chancellor
maintainerRe: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Quoted 9 lines · Martin K. Petersen
Quoted 5 lines
Quoted 1 line
Applied to 6.18/scsi-staging, thanks!
I think I will need this change to apply patch 7 [1] to kbuild-next without any issues [2]. If there is little risk of conflict, could I take it with your Ack?
Sure, no problem. Dropped the patch from my tree.
Thanks a lot!
Re: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Quoted 7 lines · Nathan Chancellor
Quoted 6 lines · Martin K. Petersen
Quoted 5 lines
Quoted 1 line
Applied to 6.18/scsi-staging, thanks!
I think I will need this change to apply patch 7 [1] to kbuild-next without any issues [2]. If there is little risk of conflict, could I take it with your Ack?
Quoted 5 lines
Quoted 3 lines
Sure, no problem. Dropped the patch from my tree.
Thanks a lot!
Has these patches been added somewhere, I can't find it in kbuild?
Signature · 1 line
Rgrds, legion
Nathan Chancellor
maintainerRe: [PATCH v6 4/9] scsi: Always define blogic_pci_tbl structure
Hi Alexey,
Quoted 1 line · Alexey Gladkov
Has these patches been added somewhere, I can't find it in kbuild?
I plan to apply this to the kbuild tree when [1] becomes available in mainline so that I can backmerge it and apply the rest of the series on top to avoid build breakage. As it is on a fixes branch, I would expect it to be there by -rc4 or -rc5, which still gives us a few weeks for soak testing in -next. If it is not there by then, I will just apply the series in whole and we will just end up with the same commit in the tree twice.
[1]: https://git.kernel.org/linusw/linux-pinctrl/c/bd7c2312128e31d056d30d34d60503de056e15f0
Cheers,
Nathan
PATCH v6 5/9 pinctrl: meson: Fix typo in device table macro
In reply to Alexey GladkovThe typo when using the MODULE_DEVICE_TABLE macro was not noticeable because the macro was defined only if the module was built as a separate module.
--- drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-amlogic-a4.c +1 -1
@@ -1093,7 +1093,7 @@ static const struct of_device_id aml_pctl_of_match[] = { { .compatible = "amlogic,pinctrl-s6", .data = &s6_priv_data, }, {/* sentinel */ } }; -MODULE_DEVICE_TABLE (of, aml_pctl_dt_match); +MODULE_DEVICE_TABLE (of, aml_pctl_of_match);static struct platform_driver aml_pctl_driver = { .driver = {
Signature · 1 line
2.50.1
Re: [PATCH v6 5/9] pinctrl: meson: Fix typo in device table macro
Quoted 4 lines · Alexey Gladkov
The typo when using the
MODULE_DEVICE_TABLEmacro was not noticeable because the macro was defined only if the module was built as a separate module.
Quoted 10 lines
Cc Xianwei Zhao <[email protected]>Cc Linus Walleij <[email protected]>Cc Neil Armstrong <[email protected]>Cc Kevin Hilman <[email protected]>Reported-by kernel test robot <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>Reviewed-by Neil Armstrong <[email protected]>
This patch 5/9 applied separately to pin control fixes.
Yours,
Linus Walleij
PATCH v6 6/9 modpost: Add modname to mod_device_table alias
In reply to Alexey GladkovAt this point, if a symbol is compiled as part of the kernel, information about which module the symbol belongs to is lost.
To save this it is possible to add the module name to the alias name. It's not very pretty, but it's possible for now.
--- include/linux/module.h | 14 +++++++++++++- rust/kernel/device_id.rs | 8 ++++---- scripts/mod/file2alias.c | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)
include/linux/module.h +13 -1
@@ -244,10 +244,22 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name);/* What your module does. */ #define MODULE_DESCRIPTION (_description) MODULE_INFO(description, _description) +/* +* Format: __mod_device_table__kmod_<modname>__<type>__<name> +* Parts of the string `__kmod_` and `__` are used as delimiters when parsing +* a symbol in file2alias.c +*/ +#define __mod_device_table (type, name) \ + __PASTE(__mod_device_table__, \ + __PASTE(__KBUILD_MODNAME, \ + __PASTE(__, \ + __PASTE(type, \ + __PASTE(__, name))))) +#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ -static typeof(name) __mod_device_table__##type##__##name \ +static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name))))#else /* !MODULE */ #define MODULE_DEVICE_TABLE (type, name)
rust/kernel/device_id.rs +4 -4
@@ -195,10 +195,10 @@ macro_rules! module_device_table { ($table_type: literal, $module_table_name:ident, $table_name:ident) => {#[rustfmt::skip] #[export_name = -concat! ( "__mod_device_table__" , $table_type, -"__" , module_path! (), -"_" , line! (), -"_" , stringify! ($table_name)) +concat! ( "__mod_device_table__" , line! (), +"__kmod_" , module_path! (), +"__" , $table_type, +"__" , stringify! ($table_name)) ] static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) };
scripts/mod/file2alias.c +14 -4
@@ -1476,8 +1476,8 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, {void *symval;char *zeros =NULL ; -const char *type, *name; -size_t typelen; +const char *type, *name, *modname; +size_t typelen, modnamelen;static const char *prefix ="__mod_device_table__" ;/* We're looking for a section relative symbol */
@@ -1488,10 +1488,20 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,if (ELF_ST_TYPE (sym->st_info) !=STT_OBJECT )return ; -/* All our symbols are of form __mod_device_table__<type>__<name>. */ +/* All our symbols are of form __mod_device_table__kmod_<modname>__<type>__<name>. */ if (!strstarts (symname, prefix))return ; - type = symname +strlen (prefix); + + modname =strstr (symname,"__kmod_" ); +if (!modname) +return ; + modname +=strlen ("__kmod_" ); + + type =strstr (modname,"__" ); +if (!type) +return ; + modnamelen = type - modname; + type +=strlen ("__" ); name =strstr (type,"__" );if (!name)
Signature · 1 line
2.50.1
Danilo Krummrich
maintainerRe: [PATCH v6 6/9] modpost: Add modname to mod_device_table alias
Quoted 51 lines · Alexey Gladkov
At this point, if a symbol is compiled as part of the kernel, information about which module the symbol belongs to is lost.
To save this it is possible to add the module name to the alias name. It's not very pretty, but it's possible for now.
Cc Miguel Ojeda <[email protected]>Cc Andreas Hindborg <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Alex Gaynor <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>--- include/linux/module.h | 14 +++++++++++++- rust/kernel/device_id.rs | 8 ++++---- scripts/mod/file2alias.c | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)include/linux/module.h +13
-1@@ -244,10 +244,22 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name);/* What your module does. */ #define MODULE_DESCRIPTION (_description) MODULE_INFO(description, _description) +/* +* Format: __mod_device_table__kmod_<modname>__<type>__<name> +* Parts of the string `__kmod_` and `__` are used as delimiters when parsing +* a symbol in file2alias.c +*/ +#define __mod_device_table (type, name) \ + __PASTE(__mod_device_table__, \ + __PASTE(__KBUILD_MODNAME, \ + __PASTE(__, \ + __PASTE(type, \ + __PASTE(__, name))))) +#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ -static typeof(name) __mod_device_table__##type##__##name \ +static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name))))#else /* !MODULE */ #define MODULE_DEVICE_TABLE (type, name)rust/kernel/device_id.rs +0
-0
rust/kernel/device_id.rs macro_rules! module_device_table { · line 198
Quoted 8 lines
rust/kernel/device_id.rs +1
-4@@ -195,10 +195,10 @@ macro_rules! module_device_table { ($table_type: literal, $module_table_name:ident, $table_name:ident) => { #[rustfmt::skip] #[export_name = -concat! ( "__mod_device_table__" , $table_type, -"__" , module_path! (), -"_" , line! (), - "_", stringify!($table_name)) + concat!("__mod_device_table__", line!(),
Why do we have line!() between "__mod_device_table__" and "__kmod_", while the format is defined as "__mod_device_table__kmod_<modname>__<type>__<name>" above?
The previous logic was to create a unique name with
using "<module_path>_<line>_<table_name>" as "<name>". So, I think this should actually be:
concat!("__mod_device_table__kmod_",
module_path!(),
"__", $table_type,
"__", stringify!($table_name),
"_", line!())rather than the below.
Quoted 6 lines
rust/kernel/device_id.rs +3
-0+ "__kmod_", module_path!(), +"__" , $table_type, +"__" ,stringify! ($table_name)) ] static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) };
Re: [PATCH v6 6/9] modpost: Add modname to mod_device_table alias
Quoted 55 lines · Danilo Krummrich
Quoted 54 lines · Alexey Gladkov
At this point, if a symbol is compiled as part of the kernel, information about which module the symbol belongs to is lost.
To save this it is possible to add the module name to the alias name. It's not very pretty, but it's possible for now.
Cc Miguel Ojeda <[email protected]>Cc Andreas Hindborg <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Alex Gaynor <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>--- include/linux/module.h | 14 +++++++++++++- rust/kernel/device_id.rs | 8 ++++---- scripts/mod/file2alias.c | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)include/linux/module.h +13
-1@@ -244,10 +244,22 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name);/* What your module does. */ #define MODULE_DESCRIPTION (_description) MODULE_INFO(description, _description) +/* +* Format: __mod_device_table__kmod_<modname>__<type>__<name> +* Parts of the string `__kmod_` and `__` are used as delimiters when parsing +* a symbol in file2alias.c +*/ +#define __mod_device_table (type, name) \ + __PASTE(__mod_device_table__, \ + __PASTE(__KBUILD_MODNAME, \ + __PASTE(__, \ + __PASTE(type, \ + __PASTE(__, name))))) +#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ -static typeof(name) __mod_device_table__##type##__##name \ +static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name))))#else /* !MODULE */ #define MODULE_DEVICE_TABLE (type, name)rust/kernel/device_id.rs +0
-0@@ -195,10 +195,10 @@ macro_rules! module_device_table { ($table_type: literal, $module_table_name:ident, $table_name:ident) => {#[rustfmt::skip] #[export_name =
Quoted 8 lines
rust/kernel/device_id.rs macro_rules! module_device_table { · line 198
Quoted 5 lines
rust/kernel/device_id.rs +1
-4-concat! ("__mod_device_table__" , $table_type, -"__" ,module_path! (), -"_" ,line! (), -"_" ,stringify! ($table_name)) +concat! ("__mod_device_table__" ,line! (),Why do we have line!() between "
__mod_device_table__" and "__kmod_", while the format is defined as "__mod_device_table__kmod_<modname>__<type>__<name>" above?
The "__mod_device_table__" is used to filter symbols.
The meaning part starts after "__kmod_" part. After that, order becomes important.
Quoted 11 lines
The previous logic was to create a unique name with
using "<module_path>_<line>_<table_name>" as "<name>". So, I think this should actually be:concat!("__mod_device_table__kmod_", module_path!(), "__", $table_type, "__", stringify!($table_name), "_", line!())rather than the below.
No. "stringify!($table_name)" should be the last thing in this string. This is the a symbol name that will be searched for in the elf to generate modalias.
Quoted 8 lines
Quoted 7 lines
rust/kernel/device_id.rs +3
-0+ "__kmod_", module_path!(), +"__" , $table_type, +"__" ,stringify! ($table_name)) ] static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) };
Signature · 1 line
Rgrds, legion
Danilo Krummrich
maintainerRe: [PATCH v6 6/9] modpost: Add modname to mod_device_table alias
Quoted 79 lines · Alexey Gladkov
Quoted 55 lines · Danilo Krummrich
Quoted 54 lines · Alexey Gladkov
At this point, if a symbol is compiled as part of the kernel, information about which module the symbol belongs to is lost.
To save this it is possible to add the module name to the alias name. It's not very pretty, but it's possible for now.
Cc Miguel Ojeda <[email protected]>Cc Andreas Hindborg <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Alex Gaynor <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>--- include/linux/module.h | 14 +++++++++++++- rust/kernel/device_id.rs | 8 ++++---- scripts/mod/file2alias.c | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)include/linux/module.h +13
-1@@ -244,10 +244,22 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name);/* What your module does. */ #define MODULE_DESCRIPTION (_description) MODULE_INFO(description, _description) +/* +* Format: __mod_device_table__kmod_<modname>__<type>__<name> +* Parts of the string `__kmod_` and `__` are used as delimiters when parsing +* a symbol in file2alias.c +*/ +#define __mod_device_table (type, name) \ + __PASTE(__mod_device_table__, \ + __PASTE(__KBUILD_MODNAME, \ + __PASTE(__, \ + __PASTE(type, \ + __PASTE(__, name))))) +#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ -static typeof(name) __mod_device_table__##type##__##name \ +static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name))))#else /* !MODULE */ #define MODULE_DEVICE_TABLE (type, name)rust/kernel/device_id.rs +0
-0@@ -195,10 +195,10 @@ macro_rules! module_device_table { ($table_type: literal, $module_table_name:ident, $table_name:ident) => {#[rustfmt::skip] #[export_name =Quoted 8 lines
rust/kernel/device_id.rs macro_rules! module_device_table { · line 198
Quoted 5 lines
rust/kernel/device_id.rs +1
-4-concat! ("__mod_device_table__" , $table_type, -"__" ,module_path! (), -"_" ,line! (), -"_" ,stringify! ($table_name)) +concat! ("__mod_device_table__" ,line! (),Why do we have line!() between "
__mod_device_table__" and "__kmod_", while the format is defined as "__mod_device_table__kmod_<modname>__<type>__<name>" above?The "
__mod_device_table__" is used to filter symbols.
The meaning part starts after "__kmod_" part. After that, order becomes important.Quoted 10 lines
The previous logic was to create a unique name with
using "<module_path>_<line>_<table_name>" as "<name>". So, I think this should actually be:concat!("__mod_device_table__kmod_", module_path!(), "__", $table_type, "__", stringify!($table_name), "_", line!())
Quoted 5 lines
Quoted 1 line
rather than the below.
No. "stringify!($table_name)" should be the last thing in this string. This is the a symbol name that will be searched for in the elf to generate modalias.
$table_name is not guaranteed to be unique for a certain module_path!(), hence we need line!() to guarantee uniqueness.
The symbol name will be unique no matter where you place line!() of course, but $table_name + line!() is the unique table name, which I think is what we want?
Quoted 11 lines
Quoted 8 lines
Quoted 7 lines
rust/kernel/device_id.rs +3
-0+ "__kmod_", module_path!(), +"__" , $table_type, +"__" ,stringify! ($table_name)) ] static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) };Signature · 1 line
Rgrds, legion
Re: [PATCH v6 6/9] modpost: Add modname to mod_device_table alias
Quoted 86 lines · Danilo Krummrich
Quoted 79 lines · Alexey Gladkov
Quoted 55 lines · Danilo Krummrich
Quoted 54 lines · Alexey Gladkov
At this point, if a symbol is compiled as part of the kernel, information about which module the symbol belongs to is lost.
To save this it is possible to add the module name to the alias name. It's not very pretty, but it's possible for now.
Cc Miguel Ojeda <[email protected]>Cc Andreas Hindborg <[email protected]>Cc Danilo Krummrich <[email protected]>Cc Alex Gaynor <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>--- include/linux/module.h | 14 +++++++++++++- rust/kernel/device_id.rs | 8 ++++---- scripts/mod/file2alias.c | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)include/linux/module.h +13
-1@@ -244,10 +244,22 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name);/* What your module does. */ #define MODULE_DESCRIPTION (_description) MODULE_INFO(description, _description) +/* +* Format: __mod_device_table__kmod_<modname>__<type>__<name> +* Parts of the string `__kmod_` and `__` are used as delimiters when parsing +* a symbol in file2alias.c +*/ +#define __mod_device_table (type, name) \ + __PASTE(__mod_device_table__, \ + __PASTE(__KBUILD_MODNAME, \ + __PASTE(__, \ + __PASTE(type, \ + __PASTE(__, name))))) +#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ -static typeof(name) __mod_device_table__##type##__##name \ +static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name))))#else /* !MODULE */ #define MODULE_DEVICE_TABLE (type, name)rust/kernel/device_id.rs +0
-0@@ -195,10 +195,10 @@ macro_rules! module_device_table { ($table_type: literal, $module_table_name:ident, $table_name:ident) => {#[rustfmt::skip] #[export_name =Quoted 8 lines
rust/kernel/device_id.rs macro_rules! module_device_table { · line 198
Quoted 5 lines
rust/kernel/device_id.rs +1
-4-concat! ("__mod_device_table__" , $table_type, -"__" ,module_path! (), -"_" ,line! (), -"_" ,stringify! ($table_name)) +concat! ("__mod_device_table__" ,line! (),Why do we have line!() between "
__mod_device_table__" and "__kmod_", while the format is defined as "__mod_device_table__kmod_<modname>__<type>__<name>" above?The "
__mod_device_table__" is used to filter symbols.
The meaning part starts after "__kmod_" part. After that, order becomes important.Quoted 10 lines
The previous logic was to create a unique name with
using "<module_path>_<line>_<table_name>" as "<name>". So, I think this should actually be:concat!("__mod_device_table__kmod_", module_path!(), "__", $table_type, "__", stringify!($table_name), "_", line!())Quoted 5 lines
Quoted 1 line
rather than the below.
No. "stringify!($table_name)" should be the last thing in this string. This is the a symbol name that will be searched for in the elf to generate modalias.
Quoted 5 lines
$table_name is not guaranteed to be unique for a certain module_path!(), hence we need line!() to guarantee uniqueness.
The symbol name will be unique no matter where you place line!() of course, but $table_name + line!() is the unique table name, which I think is what we want?
Again, no. We need the entire symbol to be unique so that the linker doesn't complain. In fact, this symbol will later be removed from the elf. It is only needed for the modpost utility.
The modpost requires a format symbol:
__mod_device_table__<random>*__kmod_<modname>__<type>__<name>
"<random>*" may or may not exist. This is a place to add uniqueness if needed.
The fields "<modname>”, "<type>" and "<name>" must be very specific and must not be random. These values are used for generation.
Quoted 13 lines
Quoted 12 lines
Quoted 9 lines
Quoted 8 lines
rust/kernel/device_id.rs +3
-0+ "__kmod_", module_path!(), +"__" , $table_type, +"__" ,stringify! ($table_name)) ] static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) };Signature · 1 line
Rgrds, legion
Signature · 1 line
Rgrds, legion
Re: [PATCH v6 6/9] modpost: Add modname to mod_device_table alias
Quoted 3 lines · Alexey Gladkov
Again, no. We need the entire symbol to be unique so that the linker doesn't complain. In fact, this symbol will later be removed from the elf. It is only needed for the modpost utility.
Gotcha -- I think I got confused; for the device ID parts:
PATCH v6 7/9 modpost: Create modalias for builtin modules
In reply to Alexey GladkovFor some modules, modalias is generated using the modpost utility and the section is added to the module file.
When a module is added inside vmlinux, modpost does not generate modalias for such modules and the information is lost.
As a result kmod (which uses modules.builtin.modinfo in userspace) cannot determine that modalias is handled by a builtin kernel module.
$ cat /sys/devices/pci0000:00/0000:00:14.0/modalias pci:v00008086d0000A36Dsv00001043sd00008694bc0Csc03i30
$ modinfo xhci_pci name: xhci_pci filename: (builtin) license: GPL file: drivers/usb/host/xhci-pci description: xHCI PCI Host Controller Driver
Missing modalias "pci:v*d*sv*sd*bc0Csc03i30*" which will be generated by modpost if the module is built separately.
To fix this it is necessary to generate the same modalias for vmlinux as for the individual modules. Fortunately '.vmlinux.export.o' is already generated from which '.modinfo' can be extracted in the same way as for vmlinux.o.
--- include/linux/module.h | 4 ---- scripts/Makefile.vmlinux | 5 ++++- scripts/mksysmap | 3 +++ scripts/mod/file2alias.c | 16 ++++++++++++++++ scripts/mod/modpost.c | 15 +++++++++++++++ scripts/mod/modpost.h | 2 ++ 6 files changed, 40 insertions(+), 5 deletions(-)
include/linux/module.h +0 -4
@@ -256,14 +256,10 @@ struct module_kobject *lookup_or_create_module_kobject(const char *name); __PASTE(type, \ __PASTE(__, name))))) -#ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE (type, name) \ static typeof(name) __mod_device_table(type, name) \ __attribute__ ((used, alias(__stringify(name)))) -#else /* !MODULE */ -#define MODULE_DEVICE_TABLE (type, name) -#endif /* Version of form [<epoch>:]<version>[-<extra-version>]. * Or for CVS/RCS ID version, everything but the number is stripped.
scripts/Makefile.vmlinux +4 -1
@@ -89,8 +89,11 @@ endif remove-section-y := .modinfo remove-section-$(CONFIG_ARCH_VMLINUX_NEEDS_RELOCS) += '.rel*' +remove-symbols := -w --strip-symbol='__mod_device_table__*' + quiet_cmd_strip_relocs = OBJCOPY $@ - cmd_strip_relocs = $(OBJCOPY) $(addprefix --remove-section=,$(remove-section-y)) $< $@ + cmd_strip_relocs = $(OBJCOPY) $(addprefix --remove-section=,$(remove-section-y)) \ + $(remove-symbols) $< $@ targets += vmlinux vmlinux: vmlinux.unstripped FORCE
scripts/mksysmap +3 -0
@@ -59,6 +59,9 @@ # EXPORT_SYMBOL (namespace) / __kstrtabns_/d +# MODULE_DEVICE_TABLE (symbol name) +/ __mod_device_table__/d + # --------------------------------------------------------------------------- # Ignored suffixes # (do not forget '$' after each pattern)
scripts/mod/file2alias.c +16 -0
@@ -1527,5 +1527,21 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, } } +if (mod->is_vmlinux) { +struct module_alias *alias; + +/* +* If this is vmlinux, record the name of the builtin module. +* Traverse the linked list in the reverse order, and set the +* builtin_modname unless it has already been set in the +* previous call. +*/ +list_for_each_entry_reverse (alias, &mod->aliases, node) { +if (alias->builtin_modname) +break ; + alias->builtin_modname =xstrndup (modname, modnamelen); + } + } +free (zeros); }
scripts/mod/modpost.c +15 -0
@@ -2067,11 +2067,26 @@ static void write_if_changed(struct buffer *b, const char *fname)static void write_vmlinux_export_c_file (struct module *mod) {struct buffer buf = { }; +struct module_alias *alias, *next;buf_printf (&buf,"#include <linux/export-internal.h>\n" );add_exported_symbols (&buf, mod); + +buf_printf (&buf, +"#include <linux/module.h>\n" +"#undef __MODULE_INFO_PREFIX\n" +"#define __MODULE_INFO_PREFIX\n" ); + +list_for_each_entry_safe (alias, next, &mod->aliases, node) { +buf_printf (&buf,"MODULE_INFO(%s.alias, \"%s\");\n" , + alias->builtin_modname, alias->str); +list_del (&alias->node); +free (alias->builtin_modname); +free (alias); + } +write_if_changed (&buf,".vmlinux.export.c" );free (buf.p); }
scripts/mod/modpost.h +2 -0
@@ -99,10 +99,12 @@ buf_write(struct buffer *buf, const char *s, int len);* struct module_alias - auto-generated MODULE_ALIAS() * * @node: linked to module::aliases +* @modname: name of the builtin module (only for vmlinux) * @str: a string for MODULE_ALIAS() */ struct module_alias {struct list_head node; +char *builtin_modname;char str[]; };
Signature · 1 line
2.50.1
PATCH v6 8/9 kbuild: vmlinux.unstripped should always depend on .vmlinux.export.o
In reply to Alexey GladkovSince .vmlinux.export.c is used to add generated by modpost modaliases for builtin modules the .vmlinux.export.o is no longer optional and should always be created. The generation of this file is not dependent on CONFIG_MODULES.
--- scripts/Makefile.vmlinux | 9 ++------- scripts/link-vmlinux.sh | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-)
scripts/Makefile.vmlinux +2 -7
@@ -53,11 +53,6 @@ endif # vmlinux.unstripped # --------------------------------------------------------------------------- -ifdef CONFIG_MODULES -targets += .vmlinux.export.o -vmlinux.unstripped: .vmlinux.export.o -endif - ifdef CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX vmlinux.unstripped: arch/$(SRCARCH)/tools/vmlinux.arch.o
@@ -72,8 +67,8 @@ cmd_link_vmlinux = \ $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)" "$@"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) -targets += vmlinux.unstripped -vmlinux.unstripped: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE +targets += vmlinux.unstripped .vmlinux.export.o +vmlinux.unstripped: scripts/link-vmlinux.sh vmlinux.o .vmlinux.export.o $(KBUILD_LDS) FORCE +$(call if_changed_dep,link_vmlinux) ifdef CONFIG_DEBUG_INFO_BTF vmlinux.unstripped: $(RESOLVE_BTFIDS)
scripts/link-vmlinux.sh +1 -4
@@ -73,10 +73,7 @@ vmlinux_link() objs="${objs} .builtin-dtbs.o" fi - if is_enabled CONFIG_MODULES; then - objs="${objs} .vmlinux.export.o" - fi - + objs="${objs} .vmlinux.export.o" objs="${objs} init/version-timestamp.o" if [ "${SRCARCH}" = "um" ]; then
Signature · 1 line
2.50.1
PATCH v6 9/9 s390: vmlinux.lds.S: Reorder sections
In reply to Alexey GladkovReorder the sections to be placed in the default segment. The .vmlinux.info use :NONE to override the default segment and tell the linker to not put the section in any segment at all.
Quoted 3 lines
Quoted 3 lines
s390x-linux-ld: .tmp_vmlinux1: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: .tmp_vmlinux2: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: vmlinux.unstripped: warning: allocated section `.modinfo' not in segment
--- arch/s390/kernel/vmlinux.lds.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/s390/kernel/vmlinux.lds.S +5 -5
@@ -209,6 +209,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); _end = . ; + /* Debugging sections. */ + STABS_DEBUG + DWARF_DEBUG + ELF_DETAILS + /* * uncompressed image info used by the decompressor * it should match struct vmlinux_info
@@ -239,11 +244,6 @@ SECTIONS #endif } :NONE - /* Debugging sections. */ - STABS_DEBUG - DWARF_DEBUG - ELF_DETAILS - /* * Make sure that the .got.plt is either completely empty or it * contains only the three reserved double words.
Signature · 1 line
2.50.1
Heiko Carstens
maintainerRe: [PATCH v6 9/9] s390: vmlinux.lds.S: Reorder sections
Quoted 16 lines · Alexey Gladkov
Reorder the sections to be placed in the default segment. The .vmlinux.info use :NONE to override the default segment and tell the linker to not put the section in any segment at all.
Quoted 3 lines
Quoted 3 lines
s390x-linux-ld: .tmp_vmlinux1: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: .tmp_vmlinux2: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: vmlinux.unstripped: warning: allocated section `.modinfo' not in segmentCc Heiko Carstens <[email protected]>Cc Vasily Gorbik <[email protected]>Cc Alexander Gordeev <[email protected]>Reported-by kernel test robot <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>Acked-by Heiko Carstens <[email protected]>
Quoted 3 lines
--- arch/s390/kernel/vmlinux.lds.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Is there any reason why you didn't reorder the patches?
https://lore.kernel.org/all/[email protected]/
Re: [PATCH v6 9/9] s390: vmlinux.lds.S: Reorder sections
Quoted 21 lines · Heiko Carstens
Quoted 16 lines · Alexey Gladkov
Reorder the sections to be placed in the default segment. The .vmlinux.info use :NONE to override the default segment and tell the linker to not put the section in any segment at all.
Quoted 3 lines
Quoted 3 lines
s390x-linux-ld: .tmp_vmlinux1: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: .tmp_vmlinux2: warning: allocated section `.modinfo' not in segment
s390x-linux-ld: vmlinux.unstripped: warning: allocated section `.modinfo' not in segmentCc Heiko Carstens <[email protected]>Cc Vasily Gorbik <[email protected]>Cc Alexander Gordeev <[email protected]>Reported-by kernel test robot <[email protected]>Signed-off-by Alexey Gladkov <[email protected]>Acked-by Heiko Carstens <[email protected]>Quoted 3 lines
--- arch/s390/kernel/vmlinux.lds.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 2 lines
Is there any reason why you didn't reorder the patches?
https://lore.kernel.org/all/[email protected]/
Oops! My bad. This patchset was added to linux-next and seems to be in the correct order, but then it was removed and I seem to have lost this change.
Signature · 1 line
Rgrds, legion