Skip to content

treewide: fix object files shared between several modules

Alexander Lobakin linux-crypto linux-kbuild lkml netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 42 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18block/rnbd: fix mixed module-builtin objectdrivers/block/rnbd/Makefile drivers/block/rnbd/rnbd-common.c drivers/block/rnbd/rnbd-proto.h+15 -283 replies
2/18drm/bridge: imx: fix mixed module-builtin objectdrivers/gpu/drm/bridge/imx/Makefile drivers/gpu/drm/bridge/imx/imx-ldb-helper.c drivers/gpu/drm/bridge/imx/imx-ldb-helper.h+197 -2410 replies
3/18drm/bridge: imx: turn imx8{qm,qxp}-ldb into single-object modulesdrivers/gpu/drm/bridge/imx/Makefile drivers/gpu/drm/bridge/imx/imx8qm-ldb.c drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c+0 -40 replies
4/18sound: fix mixed module-builtin objectsound/soc/codecs/Makefile sound/soc/codecs/wcd-clsh-v2.c sound/soc/codecs/wcd-clsh-v2.h+907 -9190 replies
5/18mfd: rsmu: fix mixed module-builtin objectdrivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/rsmu_core.c+13 -40 replies
6/18mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modulesdrivers/mfd/Makefile drivers/mfd/rsmu-core.c drivers/mfd/rsmu-i2c.c +1 more+0 -30 replies
7/18net: liquidio: fix mixed module-builtin objectdrivers/net/ethernet/cavium/Kconfig drivers/net/ethernet/cavium/liquidio/Makefile drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +11 more+87 -10 replies
8/18net: enetc: fix mixed module-builtin objectdrivers/net/ethernet/freescale/enetc/Kconfig drivers/net/ethernet/freescale/enetc/Makefile drivers/net/ethernet/freescale/enetc/enetc.c +4 more+43 -31 reply
9/18net: emac, cpsw: fix mixed module-builtin object (davinci_cpdma)drivers/net/ethernet/ti/Kconfig drivers/net/ethernet/ti/Makefile drivers/net/ethernet/ti/cpsw.c +3 more+50 -31 reply
10/18EDAC: i10nm, skx: fix mixed module-builtin objectdrivers/edac/Kconfig drivers/edac/Makefile drivers/edac/i10nm_base.c +3 more+37 -101 reply
11/18platform/x86: int3472: fix object shared between several modulesdrivers/platform/x86/intel/int3472/Makefile drivers/platform/x86/intel/int3472/common.c drivers/platform/x86/intel/int3472/discrete.c +1 more+17 -39 replies
12/18mtd: tests: fix object shared between several modulesdrivers/mtd/tests/Makefile drivers/mtd/tests/mtd_test.c drivers/mtd/tests/nandbiterrs.c +7 more+34 -83 replies
13/18crypto: octeontx2: fix objects shared between several modulesdrivers/crypto/marvell/octeontx2/Makefile drivers/crypto/marvell/octeontx2/cn10k_cpt.c drivers/crypto/marvell/octeontx2/cn10k_cpt.h +5 more+39 -142 replies
14/18dsa: ocelot: fix mixed module-builtin objectdrivers/net/dsa/ocelot/Kconfig drivers/net/dsa/ocelot/Makefile drivers/net/dsa/ocelot/felix.c +2 more+25 -158 replies
15/18net: dpaa2: fix mixed module-builtin objectdrivers/net/ethernet/freescale/dpaa2/Kconfig drivers/net/ethernet/freescale/dpaa2/Makefile drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +2 more+28 -31 reply
16/18net: hns3: fix mixed module-builtin objectdrivers/net/ethernet/hisilicon/Kconfig drivers/net/ethernet/hisilicon/hns3/Makefile drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +5 more+58 -213 replies
17/18net: octeontx2: fix mixed module-builtin objectdrivers/net/ethernet/marvell/octeontx2/Kconfig drivers/net/ethernet/marvell/octeontx2/nic/Makefile drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +5 more+26 -101 reply
18/18net: cpsw: fix mixed module-builtin objectdrivers/net/ethernet/ti/Kconfig drivers/net/ethernet/ti/Makefile drivers/net/ethernet/ti/am65-cpsw-nuss.c +8 more+112 -71 reply

Reviews trailers per patch

6 of 18 patches have a Reviewed-by or Acked-by.

PatchAlexander LobakinMasahiro Yamada
1/18Reviewed-and-tested-by
2/18Reviewed-and-tested-by
3/18Reviewed-and-tested-by
4/18Reviewed-and-tested-by
5/18Reviewed-and-tested-by
6/18Reviewed-and-tested-by
7/18Reviewed-and-tested-by
8/18R-b R-b
9/18R-b
10/18R-b
11/18
12/18
13/18R-b R-b
14/18
15/18R-b
16/18
17/18R-b
18/18

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/18] treewide: fix object files shared between several modules

This is a follow-up to the series[0] that adds Kbuild warning if an object is linked into several modules (including vmlinux) in order to prevent hidden side effects from appearing.
The original series, as well as this one, was inspired by the recent issue[1] with the ZSTD modules on a platform which has such sets of vmlinux cflags and module cflags so that objects built with those two even refuse to link with each other.
The final goal is to forbid linking one object several times entirely.

Patches 1-7 and 10-11 was runtime-tested by me. Pathes 8-9 and 12-18 are compile-time tested only (compile, link, modpost), so I encourage the maintainers to review them carefully. At least the last one, for cpsw, most likely has issues :D
Masahiro's patches are taken from his WIP tree[2], with the two last finished by me.

This mostly is a monotonic work, all scores go to Masahiro and Alexey :P

[0] https://lore.kernel.org/linux-kbuild/[email protected]
[1] https://github.com/torvalds/linux/commit/637a642f5ca5e850186bb64ac75ebb0f124b458d
[2] https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/log/?h=tmp4

Alexander Lobakin (9):
EDAC: i10nm, skx: fix mixed module-builtin object platform/x86: int3472: fix object shared between several modules
mtd: tests: fix object shared between several modules
crypto: octeontx2: fix objects shared between several modules
dsa: ocelot: fix mixed module-builtin object
net: dpaa2: fix mixed module-builtin object
net: hns3: fix mixed module-builtin object
net: octeontx2: fix mixed module-builtin object
net: cpsw: fix mixed module-builtin object

Masahiro Yamada (9):
block/rnbd: fix mixed module-builtin object drm/bridge: imx: fix mixed module-builtin object drm/bridge: imx: turn imx8{qm,qxp}-ldb into single-object modules
sound: fix mixed module-builtin object
mfd: rsmu: fix mixed module-builtin object
mfd: rsmu: turn rsmu-{core,i2c,spi} into single-object modules
net: liquidio: fix mixed module-builtin object
net: enetc: fix mixed module-builtin object
net: emac, cpsw: fix mixed module-builtin object (davinci_cpdma)

 drivers/block/rnbd/Makefile                   |   6 +-
 drivers/block/rnbd/rnbd-common.c              |  23 -
 drivers/block/rnbd/rnbd-proto.h               |  14 +-
 drivers/crypto/marvell/octeontx2/Makefile     |  11 +-
 drivers/crypto/marvell/octeontx2/cn10k_cpt.c  |   9 +-
 drivers/crypto/marvell/octeontx2/cn10k_cpt.h  |   2 -
 .../marvell/octeontx2/otx2_cpt_common.h       |   2 -
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |  14 +-
 drivers/crypto/marvell/octeontx2/otx2_cptlf.c |  11 +
 .../marvell/octeontx2/otx2_cptpf_main.c       |   2 +
 .../marvell/octeontx2/otx2_cptvf_main.c       |   2 +
 drivers/edac/Kconfig                          |  11 +-
 drivers/edac/Makefile                         |   7 +-
 drivers/edac/i10nm_base.c                     |   2 +
 drivers/edac/skx_base.c                       |   2 +
 drivers/edac/skx_common.c                     |  21 +-
 drivers/edac/skx_common.h                     |   4 +-
 drivers/gpu/drm/bridge/imx/Makefile           |   4 -
 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c   | 221 -----
 drivers/gpu/drm/bridge/imx/imx-ldb-helper.h   | 213 +++-
 .../imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c}    |   0
 .../imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c}  |   0
 drivers/mfd/Kconfig                           |   8 +-
 drivers/mfd/Makefile                          |   3 +-
 drivers/mfd/{rsmu_core.c => rsmu-core.c}      |   3 +
 drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c}        |   0
 drivers/mfd/{rsmu_spi.c => rsmu-spi.c}        |   0
 drivers/mtd/tests/Makefile                    |  17 +-
 drivers/mtd/tests/mtd_test.c                  |   9 +
 drivers/mtd/tests/nandbiterrs.c               |   2 +
 drivers/mtd/tests/oobtest.c                   |   2 +
 drivers/mtd/tests/pagetest.c                  |   2 +
 drivers/mtd/tests/readtest.c                  |   2 +
 drivers/mtd/tests/speedtest.c                 |   2 +
 drivers/mtd/tests/stresstest.c                |   2 +
 drivers/mtd/tests/subpagetest.c               |   2 +
 drivers/mtd/tests/torturetest.c               |   2 +
 drivers/net/dsa/ocelot/Kconfig                |  18 +-
 drivers/net/dsa/ocelot/Makefile               |  12 +-
 drivers/net/dsa/ocelot/felix.c                |   6 +
 drivers/net/dsa/ocelot/felix_vsc9959.c        |   2 +
 drivers/net/dsa/ocelot/seville_vsc9953.c      |   2 +
 drivers/net/ethernet/cavium/Kconfig           |   5 +
 drivers/net/ethernet/cavium/liquidio/Makefile |   4 +-
 .../cavium/liquidio/cn23xx_pf_device.c        |   4 +
 .../cavium/liquidio/cn23xx_vf_device.c        |   3 +
 .../ethernet/cavium/liquidio/cn66xx_device.c  |   1 +
 .../ethernet/cavium/liquidio/cn68xx_device.c  |   1 +
 .../net/ethernet/cavium/liquidio/lio_core.c   |  16 +
 .../ethernet/cavium/liquidio/lio_ethtool.c    |   1 +
 .../ethernet/cavium/liquidio/octeon_device.c  |  24 +
 .../ethernet/cavium/liquidio/octeon_droq.c    |   4 +
 .../ethernet/cavium/liquidio/octeon_mem_ops.c |   5 +
 .../net/ethernet/cavium/liquidio/octeon_nic.c |   3 +
 .../cavium/liquidio/request_manager.c         |  14 +
 .../cavium/liquidio/response_manager.c        |   3 +
 drivers/net/ethernet/freescale/dpaa2/Kconfig  |   6 +
 drivers/net/ethernet/freescale/dpaa2/Makefile |   6 +-
 .../net/ethernet/freescale/dpaa2/dpaa2-eth.c  |   2 +
 .../net/ethernet/freescale/dpaa2/dpaa2-mac.c  |  15 +-
 .../ethernet/freescale/dpaa2/dpaa2-switch.c   |   2 +
 drivers/net/ethernet/freescale/enetc/Kconfig  |   5 +
 drivers/net/ethernet/freescale/enetc/Makefile |   7 +-
 drivers/net/ethernet/freescale/enetc/enetc.c  |  21 +
 .../net/ethernet/freescale/enetc/enetc_cbdr.c |   7 +
 .../ethernet/freescale/enetc/enetc_ethtool.c  |   2 +
 .../net/ethernet/freescale/enetc/enetc_pf.c   |   2 +
 .../net/ethernet/freescale/enetc/enetc_vf.c   |   2 +
 drivers/net/ethernet/hisilicon/Kconfig        |   5 +
 drivers/net/ethernet/hisilicon/hns3/Makefile  |  13 +-
 .../hns3/hns3_common/hclge_comm_cmd.c         |  27 +-
 .../hns3/hns3_common/hclge_comm_cmd.h         |   8 -
 .../hns3/hns3_common/hclge_comm_rss.c         |  17 +
 .../hns3/hns3_common/hclge_comm_tqp_stats.c   |   5 +
 .../hisilicon/hns3/hns3pf/hclge_main.c        |   2 +
 .../hisilicon/hns3/hns3vf/hclgevf_main.c      |   2 +
 .../net/ethernet/marvell/octeontx2/Kconfig    |   5 +
 .../ethernet/marvell/octeontx2/nic/Makefile   |  14 +-
 .../marvell/octeontx2/nic/otx2_common.h       |   1 -
 .../marvell/octeontx2/nic/otx2_dcbnl.c        |   8 +-
 .../marvell/octeontx2/nic/otx2_devlink.c      |   2 +
 .../ethernet/marvell/octeontx2/nic/otx2_pf.c  |   2 +
 .../ethernet/marvell/octeontx2/nic/otx2_ptp.c |   2 +-
 .../ethernet/marvell/octeontx2/nic/otx2_vf.c  |   2 +
 drivers/net/ethernet/ti/Kconfig               |  13 +
 drivers/net/ethernet/ti/Makefile              |  16 +-
 drivers/net/ethernet/ti/am65-cpsw-nuss.c      |   2 +
 drivers/net/ethernet/ti/cpsw.c                |   3 +
 drivers/net/ethernet/ti/cpsw_ale.c            |  20 +
 drivers/net/ethernet/ti/cpsw_ethtool.c        |  24 +
 drivers/net/ethernet/ti/cpsw_new.c            |   3 +
 drivers/net/ethernet/ti/cpsw_priv.c           |  36 +
 drivers/net/ethernet/ti/cpsw_sl.c             |   8 +
 drivers/net/ethernet/ti/davinci_cpdma.c       |  33 +
 drivers/net/ethernet/ti/davinci_emac.c        |   2 +
 drivers/net/ethernet/ti/netcp_core.c          |   2 +
 drivers/net/ethernet/ti/netcp_ethss.c         |   2 +
 drivers/platform/x86/intel/int3472/Makefile   |   8 +-
 drivers/platform/x86/intel/int3472/common.c   |   8 +
 drivers/platform/x86/intel/int3472/discrete.c |   2 +
 drivers/platform/x86/intel/int3472/tps68470.c |   2 +
 sound/soc/codecs/Makefile                     |   6 +-
 sound/soc/codecs/wcd-clsh-v2.c                | 903 -----------------
 sound/soc/codecs/wcd-clsh-v2.h                | 917 +++++++++++++++++-
 104 files changed, 1679 insertions(+), 1288 deletions(-)
 delete mode 100644 drivers/block/rnbd/rnbd-common.c
 delete mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c
 rename drivers/gpu/drm/bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} (100%)
 rename drivers/gpu/drm/bridge/imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} (100%)
 rename drivers/mfd/{rsmu_core.c => rsmu-core.c} (94%)
 rename drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} (100%)
 rename drivers/mfd/{rsmu_spi.c => rsmu-spi.c} (100%)
 delete mode 100644 sound/soc/codecs/wcd-clsh-v2.c

--
2.38.1