Commit e7441c92 authored Jun 19, 2018 by Denis Kenzior Committed by Johannes Berg Jun 29, 2018

mac80211: disable BHs/preemption in ieee80211_tx_control_port()



On pre-emption enabled kernels the following print was being seen due to
missing local_bh_disable/local_bh_enable calls.  mac80211 assumes that
pre-emption is disabled in the data path.

    BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
    caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
    [...]
    Call Trace:
    dump_stack+0x5c/0x80
    check_preemption_disabled.cold.0+0x46/0x51
    __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]

Fixes: 91180649 ("mac80211: Add support for tx_control_port")
Signed-off-by: Denis Kenzior <denkenz@gmail.com>
[commit message rewrite, fixes tag]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 4205c88e

net/mac80211/tx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -4845,7 +4845,9 @@ int ieee80211_tx_control_port(struct wiphy wiphy, struct net_device dev,
		skb_reset_network_header(skb);
		skb_reset_mac_header(skb);

		local_bh_disable();
		__ieee80211_subif_start_xmit(skb, skb->dev, flags);
		local_bh_enable();

		return 0;
		}

Admin message