Skip to content

net: in_interrupt() cleanup and fixes

Thomas Gleixner intel-wired-lan linux-doc linux-usb linux-wireless lkml netdev 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest36 patches 7 repliesIn review
  2. v135 patches 18 repliesSuperseded

Changes in v2 from the cover letter

- Rebased to net-next

- Fixed the half done rename sillyness in the ENIC patch.

- Fixed the IONIC driver fallout.

- Picked up the SFC fix from Edward and adjusted the GFP_KERNEL change accordingly.

- Addressed the review comments vs. BCRFMAC.

- Collected Reviewed/Acked-by tags as appropriate.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/36net: enic: Cure the enic api locking trainwreckdrivers/net/ethernet/cisco/enic/enic.h drivers/net/ethernet/cisco/enic/enic_api.c drivers/net/ethernet/cisco/enic/enic_main.c+28 -60 replies
2/36net: caif: Remove unused caif SPI driverDocumentation/networking/caif/index.rst Documentation/networking/caif/spi_porting.rst drivers/net/caif/Kconfig +4 more+0 -15360 replies
3/36net: Add netif_rx_any_context()include/linux/netdevice.h net/core/dev.c+16 -00 replies
4/36net: caif: Use netif_rx_any_context()drivers/net/caif/caif_hsi.c+2 -170 replies
5/36net: atheros: Remove WARN_ON(in_interrupt())drivers/net/ethernet/atheros/atl1c/atl1c_main.c drivers/net/ethernet/atheros/atl1e/atl1e_main.c drivers/net/ethernet/atheros/atlx/atl2.c+0 -40 replies
6/36net: cxgb3: Cleanup in_interrupt() usagedrivers/net/ethernet/chelsio/cxgb3/adapter.h drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c drivers/net/ethernet/chelsio/cxgb3/sge.c+29 -180 replies
7/36net: cxbg4: Remove pointless in_interrupt() checkdrivers/net/ethernet/chelsio/cxgb4/sge.c+0 -30 replies
8/36net: e100: Remove in_interrupt() usage and pointless GFP_ATOMIC allocationdrivers/net/ethernet/intel/e100.c+2 -20 replies
9/36net: fec_mpc52xx: Replace in_interrupt() usagedrivers/net/ethernet/freescale/fec_mpc52xx.c+5 -50 replies
10/36net: intel: Remove in_interrupt() warningsdrivers/net/ethernet/intel/e1000/e1000_main.c drivers/net/ethernet/intel/fm10k/fm10k_pci.c drivers/net/ethernet/intel/i40e/i40e_main.c +5 more+0 -130 replies
11/36net: ionic: Replace in_interrupt() usage.drivers/net/ethernet/pensando/ionic/ionic_dev.c drivers/net/ethernet/pensando/ionic/ionic_lif.c drivers/net/ethernet/pensando/ionic/ionic_lif.h+47 -211 reply
12/36net: ionic: Remove WARN_ON(in_interrupt()).drivers/net/ethernet/pensando/ionic/ionic_main.c+0 -40 replies
13/36net: mdiobus: Remove WARN_ON_ONCE(in_interrupt())drivers/net/phy/mdio_bus.c+0 -150 replies
14/36net: natsemi: Replace in_interrupt() usage.drivers/net/ethernet/natsemi/sonic.c drivers/net/ethernet/natsemi/sonic.h+13 -130 replies
15/36net: sfc: Replace in_interrupt() usagedrivers/net/ethernet/sfc/ef10.c drivers/net/ethernet/sfc/efx_common.c drivers/net/ethernet/sfc/net_driver.h +1 more+26 -100 replies
16/36net: sfc: Use GFP_KERNEL in efx_ef10_try_update_nic_stats()drivers/net/ethernet/sfc/ef10.c+1 -11 reply
17/36net: sunbmac: Replace in_interrupt() usagedrivers/net/ethernet/sun/sunbmac.c+9 -90 replies
18/36net: sun3lance: Remove redundant checks in interrupt handlerdrivers/net/ethernet/amd/sun3lance.c+0 -110 replies
19/36net: vxge: Remove in_interrupt() conditionalsdrivers/net/ethernet/neterion/vxge/vxge-config.c drivers/net/ethernet/neterion/vxge/vxge-config.h+2 -140 replies
20/36net: zd1211rw: Remove ZD_ASSERT(in_interrupt())drivers/net/wireless/zydas/zd1211rw/zd_usb.c+0 -10 replies
21/36net: usb: kaweth: Replace kaweth_control() with usb_control_msg()drivers/net/usb/kaweth.c+30 -631 reply
22/36net: usb: kaweth: Remove last user of kaweth_control()drivers/net/usb/kaweth.c+17 -1510 replies
23/36net: usb: net1080: Remove in_interrupt() commentdrivers/net/usb/net1080.c+0 -10 replies
24/36net: wan/lmc: Remove lmc_trace()drivers/net/wan/lmc/lmc_debug.c drivers/net/wan/lmc/lmc_debug.h drivers/net/wan/lmc/lmc_main.c +2 more+8 -1360 replies
25/36net: brcmfmac: Replace in_interrupt()drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h+5 -50 replies
26/36net: brcmfmac: Convey execution context via argument to brcmf_netif_rx()drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +7 more+29 -251 reply
27/36net: brcmfmac: Convey allocation mode as argumentdrivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h +1 more+13 -141 reply
28/36net: ipw2x00,iwlegacy,iwlwifi: Remove in_interrupt() from debug macrosdrivers/net/wireless/intel/ipw2x00/ipw2100.c drivers/net/wireless/intel/ipw2x00/ipw2200.h drivers/net/wireless/intel/ipw2x00/libipw.h +2 more+7 -120 replies
29/36net: iwlwifi: Remove in_interrupt() from tracing macro.drivers/net/wireless/intel/iwlwifi/iwl-debug.c drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h+3 -50 replies
30/36net: hostap: Remove in_interrupt() usagedrivers/net/wireless/intersil/hostap/hostap_hw.c+0 -120 replies
31/36net: mwifiex: Use netif_rx_any_context().drivers/net/wireless/marvell/mwifiex/uap_txrx.c drivers/net/wireless/marvell/mwifiex/util.c+2 -100 replies
32/36net: libertas libertas_tf: Remove in_interrupt() from debug macro.drivers/net/wireless/marvell/libertas/defs.h drivers/net/wireless/marvell/libertas_tf/deb_defs.h+2 -40 replies
33/36net: libertas: Use netif_rx_any_context()drivers/net/wireless/marvell/libertas/rx.c+2 -91 reply
34/36net: rtlwifi: Remove void* casts related to delayed workdrivers/net/wireless/realtek/rtlwifi/base.c drivers/net/wireless/realtek/rtlwifi/base.h drivers/net/wireless/realtek/rtlwifi/ps.c +2 more+31 -390 replies
35/36net: rtlwifi: Remove in_interrupt() from debug macrodrivers/net/wireless/realtek/rtlwifi/debug.c drivers/net/wireless/realtek/rtlwifi/debug.h+2 -260 replies
36/36net: rtlwifi: Replace in_interrupt() for context detectiondrivers/net/wireless/realtek/rtlwifi/base.c drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c drivers/net/wireless/realtek/rtlwifi/core.c +3 more+23 -190 replies

Reviews trailers per patch

21 of 36 patches have a Reviewed-by or Acked-by.

PatchAlexander DuyckShannon NelsonAndrew LunnMartin HabetsKalle ValoGreg Kroah-HartmanArend van SprielLuca CoelhoJames Cameron
1/36
2/36
3/36
4/36
5/36
6/36
7/36
8/36
9/36
10/36R-b
11/36A-b
12/36A-b
13/36R-b
14/36
15/36R-b
16/36A-b
17/36
18/36
19/36
20/36A-b
21/36R-b
22/36R-b
23/36
24/36
25/36A-b R-b
26/36R-b
27/36R-b
28/36A-b
29/36A-b A-b
30/36A-b
31/36A-b
32/36A-b
33/36A-b R-b
34/36A-b
35/36A-b
36/36A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 9 reviewers.

Read the v2 thread

Cover letter [patch V2 00/36] net: in_interrupt() cleanup and fixes

Folks,

in the discussion about preempt count consistency accross kernel configurations:

https://lore.kernel.org/r/20200914204209.256266093 at linutronix.de/

Linus clearly requested that code in drivers and libraries which changes behaviour based on execution context should either be split up so that e.g. task context invocations and BH invocations have different interfaces or if that's not possible the context information has to be provided by the caller which knows in which context it is executing.

This includes conditional locking, allocation mode (GFP_*) decisions and avoidance of code paths which might sleep.

In the long run, usage of 'preemptible, in_*irq etc.' should be banned from driver code completely.

This is the second version of the first batch of related changes. V1 can be found here:

     https://lore.kernel.org/r/20200927194846.045411263 at linutronix.de

Changes vs. V1:

- Rebased to net-next

- Fixed the half done rename sillyness in the ENIC patch.

- Fixed the IONIC driver fallout.

- Picked up the SFC fix from Edward and adjusted the GFP_KERNEL change accordingly.

- Addressed the review comments vs. BCRFMAC.

- Collected Reviewed/Acked-by tags as appropriate.

The pile is also available from:

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git net/cleanup

Thanks,

tglx

---
 Documentation/networking/caif/spi_porting.rst                   |  229 --
 b/Documentation/networking/caif/index.rst                       |    1 
 b/drivers/net/caif/Kconfig                                      |   19 
 b/drivers/net/caif/Makefile                                     |    4 
 b/drivers/net/caif/caif_hsi.c                                   |   19 
 b/drivers/net/ethernet/amd/sun3lance.c                          |   11 
 b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c               |    1 
 b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c               |    2 
 b/drivers/net/ethernet/atheros/atlx/atl2.c                      |    1 
 b/drivers/net/ethernet/chelsio/cxgb3/adapter.h                  |    1 
 b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c               |    2 
 b/drivers/net/ethernet/chelsio/cxgb3/sge.c                      |   44 
 b/drivers/net/ethernet/chelsio/cxgb4/sge.c                      |    3 
 b/drivers/net/ethernet/cisco/enic/enic.h                        |    1 
 b/drivers/net/ethernet/cisco/enic/enic_api.c                    |    6 
 b/drivers/net/ethernet/cisco/enic/enic_main.c                   |   27 
 b/drivers/net/ethernet/freescale/fec_mpc52xx.c                  |   10 
 b/drivers/net/ethernet/intel/e100.c                             |    4 
 b/drivers/net/ethernet/intel/e1000/e1000_main.c                 |    1 
 b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c                  |    2 
 b/drivers/net/ethernet/intel/i40e/i40e_main.c                   |    4 
 b/drivers/net/ethernet/intel/ice/ice_main.c                     |    1 
 b/drivers/net/ethernet/intel/igb/igb_main.c                     |    1 
 b/drivers/net/ethernet/intel/igc/igc_main.c                     |    1 
 b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c                 |    1 
 b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c             |    2 
 b/drivers/net/ethernet/natsemi/sonic.c                          |   24 
 b/drivers/net/ethernet/natsemi/sonic.h                          |    2 
 b/drivers/net/ethernet/neterion/vxge/vxge-config.c              |    9 
 b/drivers/net/ethernet/neterion/vxge/vxge-config.h              |    7 
 b/drivers/net/ethernet/pensando/ionic/ionic_dev.c               |    2 
 b/drivers/net/ethernet/pensando/ionic/ionic_lif.c               |   64 
 b/drivers/net/ethernet/pensando/ionic/ionic_lif.h               |    2 
 b/drivers/net/ethernet/pensando/ionic/ionic_main.c              |    4 
 b/drivers/net/ethernet/sfc/ef10.c                               |   24 
 b/drivers/net/ethernet/sfc/efx_common.c                         |    2 
 b/drivers/net/ethernet/sfc/net_driver.h                         |    5 
 b/drivers/net/ethernet/sfc/nic_common.h                         |    7 
 b/drivers/net/ethernet/sun/sunbmac.c                            |   18 
 b/drivers/net/phy/mdio_bus.c                                    |   15 
 b/drivers/net/usb/kaweth.c                                      |  261 --
 b/drivers/net/usb/net1080.c                                     |    1 
 b/drivers/net/wan/lmc/lmc_debug.c                               |   18 
 b/drivers/net/wan/lmc/lmc_debug.h                               |    1 
 b/drivers/net/wan/lmc/lmc_main.c                                |  105 -
 b/drivers/net/wan/lmc/lmc_media.c                               |    4 
 b/drivers/net/wan/lmc/lmc_proto.c                               |   16 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c       |    4 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c     |    4 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h        |    3 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c       |   26 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h       |    2 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c       |    8 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h       |    7 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c   |   10 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h   |    2 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c     |    7 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h      |    6 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c       |    8 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h       |    2 
 b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c        |    2 
 b/drivers/net/wireless/intel/ipw2x00/ipw2100.c                  |    3 
 b/drivers/net/wireless/intel/ipw2x00/ipw2200.h                  |    6 
 b/drivers/net/wireless/intel/ipw2x00/libipw.h                   |    3 
 b/drivers/net/wireless/intel/iwlegacy/common.h                  |    4 
 b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c                |    5 
 b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h         |    6 
 b/drivers/net/wireless/intersil/hostap/hostap_hw.c              |   12 
 b/drivers/net/wireless/marvell/libertas/defs.h                  |    3 
 b/drivers/net/wireless/marvell/libertas/rx.c                    |   11 
 b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h           |    3 
 b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c               |    6 
 b/drivers/net/wireless/marvell/mwifiex/util.c                   |    6 
 b/drivers/net/wireless/realtek/rtlwifi/base.c                   |   47 
 b/drivers/net/wireless/realtek/rtlwifi/base.h                   |    3 
 b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c |   12 
 b/drivers/net/wireless/realtek/rtlwifi/core.c                   |    6 
 b/drivers/net/wireless/realtek/rtlwifi/debug.c                  |   20 
 b/drivers/net/wireless/realtek/rtlwifi/debug.h                  |    8 
 b/drivers/net/wireless/realtek/rtlwifi/pci.c                    |    4 
 b/drivers/net/wireless/realtek/rtlwifi/ps.c                     |   27 
 b/drivers/net/wireless/realtek/rtlwifi/ps.h                     |   10 
 b/drivers/net/wireless/realtek/rtlwifi/wifi.h                   |    3 
 b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c                  |    1 
 b/include/linux/netdevice.h                                     |    1 
 b/net/core/dev.c                                                |   15 
 drivers/net/caif/caif_spi.c                                     |  874 ----------
 drivers/net/caif/caif_spi_slave.c                               |  254 --
 include/net/caif/caif_spi.h                                     |  155 -
 89 files changed, 354 insertions(+), 2234 deletions(-)