| Message ID | 20241128142738.132961-1-pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 65ae975e97d5aab3ee9dc5ec701b12090572ed43 |
| Headers | show |
| Series | [GIT,PULL] Networking for v6.13-rc1 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Pull request for net, async |
| netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
| netdev/build_tools | success | No tools touched, skip |
| netdev/build_clang | success | Errors and warnings before: 3 this patch: 3 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/build_clang_rust | success | No Rust files in patch. Skipping build |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/contest | success | net-next-2024-11-29--03-00 (tests: 792) |
Hi Paolo,
On Thu, Nov 28, 2024 at 03:27:38PM +0100, Paolo Abeni wrote:
> ipmr: add debug check for mr table cleanup
When merging this PR into linus-next, I've noticed it introduced build
errors:
/builds/linux/net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
320 | static bool ipmr_can_free_table(struct net *net)
| ^~~~~~~~~~~~~~~~~~~
1 error generated.
The commit in question isn't in linux-next and seems to be broken.
On 11/28/24 15:48, Sasha Levin wrote: > On Thu, Nov 28, 2024 at 03:27:38PM +0100, Paolo Abeni wrote: >> ipmr: add debug check for mr table cleanup > > When merging this PR into linus-next, I've noticed it introduced build > errors: > > /builds/linux/net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] > 320 | static bool ipmr_can_free_table(struct net *net) > | ^~~~~~~~~~~~~~~~~~~ > 1 error generated. > > The commit in question isn't in linux-next and seems to be broken. My fault, I'm sorry. I can't reproduce the issue here. Could you please share your kconfig and the compiler version? I'll try to address the issue and re-send the PR ASAP. Thanks, Paolo
On 11/28/24 16:46, Paolo Abeni wrote: > On 11/28/24 15:48, Sasha Levin wrote: >> On Thu, Nov 28, 2024 at 03:27:38PM +0100, Paolo Abeni wrote: >>> ipmr: add debug check for mr table cleanup >> >> When merging this PR into linus-next, I've noticed it introduced build >> errors: >> >> /builds/linux/net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] >> 320 | static bool ipmr_can_free_table(struct net *net) >> | ^~~~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> The commit in question isn't in linux-next and seems to be broken. > > My fault, I'm sorry. > > I can't reproduce the issue here. I see it now. It's clang with CONFIG_DEBUG_NET=n. Apparently clang is too smart with BUILD_BUG_ON_INVALID(). A trivial fix would be: --- diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 383ea8b91cc7..c5b8ec5c0a8c 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -437,7 +437,7 @@ static void ipmr_free_table(struct mr_table *mrt) { struct net *net = read_pnet(&mrt->net); - DEBUG_NET_WARN_ON_ONCE(!ipmr_can_free_table(net)); + WARN_ON_ONCE(!ipmr_can_free_table(net)); timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC | diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 4147890fe98f..7f1902ac3586 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -416,7 +416,7 @@ static void ip6mr_free_table(struct mr_table *mrt) { struct net *net = read_pnet(&mrt->net); - DEBUG_NET_WARN_ON_ONCE(!ip6mr_can_free_table(net)); + WARN_ON_ONCE(!ip6mr_can_free_table(net)); timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC |
On Thu, Nov 28, 2024 at 04:46:40PM +0100, Paolo Abeni wrote: >On 11/28/24 15:48, Sasha Levin wrote: >> On Thu, Nov 28, 2024 at 03:27:38PM +0100, Paolo Abeni wrote: >>> ipmr: add debug check for mr table cleanup >> >> When merging this PR into linus-next, I've noticed it introduced build >> errors: >> >> /builds/linux/net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] >> 320 | static bool ipmr_can_free_table(struct net *net) >> | ^~~~~~~~~~~~~~~~~~~ >> 1 error generated. >> >> The commit in question isn't in linux-next and seems to be broken. > >My fault, I'm sorry. > >I can't reproduce the issue here. Could you please share your kconfig >and the compiler version? I'll try to address the issue and re-send the >PR ASAP. All the build info for one for the failures is available here: https://qa-reports.linaro.org/lkft/sashal-linus-next/build/v6.11-25635-g6813e2326f1e/testrun/26111580/suite/build/test/clang-nightly-lkftconfig/details/
The pull request you sent on Thu, 28 Nov 2024 15:27:38 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net-6.13-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f6d7695b5ae22092fa2cc42529bb7462f7e0c4ad
Thank you!
Hello: This pull request was applied to netdev/net.git (main) by Linus Torvalds <torvalds@linux-foundation.org>: On Thu, 28 Nov 2024 15:27:38 +0100 you wrote: > Hi Linus! > > Very calm week, thanks to US holidays. > > The following changes since commit fcc79e1714e8c2b8e216dc3149812edd37884eef: > > Merge tag 'net-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2024-11-21 08:28:08 -0800) > > [...] Here is the summary with links: - [GIT,PULL] Networking for v6.13-rc1 https://git.kernel.org/netdev/net/c/65ae975e97d5 You are awesome, thank you!
Hi Linus! Very calm week, thanks to US holidays. The following changes since commit fcc79e1714e8c2b8e216dc3149812edd37884eef: Merge tag 'net-next-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2024-11-21 08:28:08 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net-6.13-rc1 for you to fetch changes up to 04f5cb48995d51deed0af71aaba1b8699511313f: Documentation: tls_offload: fix typos and grammar (2024-11-28 12:09:06 +0100) ---------------------------------------------------------------- Including fixes from bluetooth. Current release - regressions: - rtnetlink: fix rtnl_dump_ifinfo() error path - bluetooth: remove the redundant sco_conn_put Previous releases - regressions: - netlink: fix false positive warning in extack during dumps - sched: sch_fq: don't follow the fast path if Tx is behind now - ipv6: delete temporary address if mngtmpaddr is removed or unmanaged - tcp: fix use-after-free of nreq in reqsk_timer_handler(). - bluetooth: fix slab-use-after-free Read in set_powered_sync - l2tp: fix warning in l2tp_exit_net found - eth: bnxt_en: fix receive ring space parameters when XDP is active - eth: lan78xx: fix double free issue with interrupt buffer allocation - eth: tg3: set coherent DMA mask bits to 31 for BCM57766 chipsets Previous releases - always broken: - ipmr: fix tables suspicious RCU usage - iucv: MSG_PEEK causes memory leak in iucv_sock_destruct() - eth: octeontx2-af: fix low network performance - eth: stmmac: dwmac-socfpga: set RX watchdog interrupt as broken - eth: rtase: correct the speed for RTL907XD-V1 Misc: - some documentation fixup Signed-off-by: Paolo Abeni <pabeni@redhat.com> ---------------------------------------------------------------- Choong Yong Liang (1): net: stmmac: set initial EEE policy configuration David Wei (1): selftests: fix nested double quotes in f-string Edward Adam Davis (1): Bluetooth: SCO: remove the redundant sco_conn_put Eric Dumazet (2): rtnetlink: fix rtnl_dump_ifinfo() error path net: hsr: fix hsr_init_sk() vs network/transport headers. Guenter Roeck (1): net: microchip: vcap: Add typegroup table terminators in kunit tests Hangbin Liu (3): net/ipv6: delete temporary address if mngtmpaddr is removed or unmanaged selftests/rtnetlink.sh: add mngtempaddr test selftests: rds: move test.py to TEST_FILES Hariprasad Kelam (5): octeontx2-af: RPM: Fix mismatch in lmac type octeontx2-af: RPM: Fix low network performance octeontx2-af: RPM: fix stale RSFEC counters octeontx2-af: RPM: fix stale FCFEC counters octeontx2-af: Quiesce traffic before NIX block reset Heiner Kallweit (1): net: phy: ensure that genphy_c45_an_config_eee_aneg() sees new value of phydev->eee_cfg.eee_enabled Jakub Kicinski (3): netlink: fix false positive warning in extack during dumps selftests: net: test extacks in netlink dumps net_sched: sch_fq: don't follow the fast path if Tx is behind now James Chapman (1): net/l2tp: fix warning in l2tp_exit_net found by syzbot Justin Lai (3): rtase: Refactor the rtase_check_mac_version_valid() function rtase: Correct the speed for RTL907XD-V1 rtase: Corrects error handling of the rtase_check_mac_version_valid() Kuniyuki Iwashima (1): tcp: Fix use-after-free of nreq in reqsk_timer_handler(). Leo Stone (1): Documentation: tls_offload: fix typos and grammar Luiz Augusto von Dentz (2): Bluetooth: MGMT: Fix slab-use-after-free Read in set_powered_sync Bluetooth: MGMT: Fix possible deadlocks Maxime Chevallier (1): net: stmmac: dwmac-socfpga: Set RX watchdog interrupt as broken Michael Chan (2): bnxt_en: Refactor bnxt_ptp_init() bnxt_en: Unregister PTP during PCI shutdown and suspend Michal Luczaj (3): llc: Improve setsockopt() handling of malformed user input rxrpc: Improve setsockopt() handling of malformed user input net: Comment copy_from_sockptr() explaining its behaviour Oleksij Rempel (3): net: usb: lan78xx: Fix double free issue with interrupt buffer allocation net: usb: lan78xx: Fix memory leak on device unplug by freeing PHY device net: usb: lan78xx: Fix refcounting and autosuspend on invalid WoL configuration Paolo Abeni (10): Merge branch 'correcting-switch-hardware-versions-and-reported-speeds' Merge branch 'ipv6-fix-temporary-address-not-removed-correctly' Merge branch 'octeontx2-af-misc-rpm-fixes' Merge branch 'bnxt_en-bug-fixes' Merge branch 'net-fix-some-callers-of-copy_from_sockptr' Merge tag 'for-net-2024-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth ipmr: add debug check for mr table cleanup ip6mr: fix tables suspicious RCU usage ipmr: fix tables suspicious RCU usage Merge branch 'net-fix-mcast-rcu-splats' Pavan Chebbi (1): tg3: Set coherent DMA mask bits to 31 for BCM57766 chipsets Rosen Penev (1): net: mdio-ipq4019: add missing error check Russell King (Oracle) (1): net: phy: fix phy_ethtool_set_eee() incorrectly enabling LPI Saravanan Vajravel (1): bnxt_en: Reserve rings after PCIe AER recovery if NIC interface is down Shravya KN (2): bnxt_en: Set backplane link modes correctly for ethtool bnxt_en: Fix receive ring space parameters when XDP is active Sidraya Jayagond (1): s390/iucv: MSG_PEEK causes memory leak in iucv_sock_destruct() Somnath Kotur (1): bnxt_en: Fix queue start to update vnic RSS table Vitalii Mordan (1): marvell: pxa168_eth: fix call balance of pep->clk handling routines Vyshnav Ajith (1): Fix spelling mistake Documentation/networking/cdc_mbim.rst | 2 +- Documentation/networking/tls-offload.rst | 29 ++--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 37 +++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 3 +- drivers/net/ethernet/broadcom/tg3.c | 3 + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 70 ++++++++++- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 5 + .../ethernet/marvell/octeontx2/af/lmac_common.h | 7 +- drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 87 ++++++++++---- drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 18 ++- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 1 + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 45 +++++-- drivers/net/ethernet/marvell/pxa168_eth.c | 14 +-- .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 17 +-- drivers/net/ethernet/realtek/rtase/rtase.h | 7 +- drivers/net/ethernet/realtek/rtase/rtase_main.c | 43 ++++--- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 + drivers/net/mdio/mdio-ipq4019.c | 5 +- drivers/net/phy/phy-c45.c | 2 +- drivers/net/phy/phy.c | 52 +++++---- drivers/net/usb/lan78xx.c | 40 ++++--- include/linux/phy.h | 2 + include/linux/sockptr.h | 2 + net/bluetooth/mgmt.c | 38 ++++-- net/bluetooth/sco.c | 2 +- net/core/rtnetlink.c | 14 ++- net/hsr/hsr_device.c | 4 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/ipmr.c | 56 ++++++--- net/ipv6/addrconf.c | 41 +++++-- net/ipv6/ip6mr.c | 52 +++++++-- net/iucv/af_iucv.c | 26 +++-- net/l2tp/l2tp_core.c | 22 +++- net/llc/af_llc.c | 2 +- net/netlink/af_netlink.c | 21 ++-- net/rxrpc/af_rxrpc.c | 7 +- net/sched/sch_fq.c | 6 + .../selftests/drivers/net/hw/lib/py/linkconfig.py | 2 +- tools/testing/selftests/net/Makefile | 3 +- tools/testing/selftests/net/netlink-dumps.c | 129 +++++++++++++++++++++ tools/testing/selftests/net/rds/Makefile | 5 +- tools/testing/selftests/net/rtnetlink.sh | 95 +++++++++++++++ 46 files changed, 811 insertions(+), 226 deletions(-)