lkml.org 
[lkml]   [2022]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 079/101] wifi: mac80211: fix regression with non-QoS drivers
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ Upstream commit d873697ef2b7e1b6fdd8e9d449d9354bd5d29a4a ]

    Commit 10cb8e617560 ("mac80211: enable QoS support for nl80211 ctrl port")
    changed ieee80211_tx_control_port() to aways call
    __ieee80211_select_queue() without checking local->hw.queues.

    __ieee80211_select_queue() returns a queue-id between 0 and 3, which means
    that now ieee80211_tx_control_port() may end up setting the queue-mapping
    for a skb to a value higher then local->hw.queues if local->hw.queues
    is less then 4.

    Specifically this is a problem for ralink rt2500-pci cards where
    local->hw.queues is 2. There this causes rt2x00queue_get_tx_queue() to
    return NULL and the following error to be logged: "ieee80211 phy0:
    rt2x00mac_tx: Error - Attempt to send packet over invalid queue 2",
    after which association with the AP fails.

    Other callers of __ieee80211_select_queue() skip calling it when
    local->hw.queues < IEEE80211_NUM_ACS, add the same check to
    ieee80211_tx_control_port(). This fixes ralink rt2500-pci and
    similar cards when less then 4 tx-queues no longer working.

    Fixes: 10cb8e617560 ("mac80211: enable QoS support for nl80211 ctrl port")
    Cc: Markus Theil <markus.theil@tu-ilmenau.de>
    Suggested-by: Stanislaw Gruszka <stf_xl@wp.pl>
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20220918192052.443529-1-hdegoede@redhat.com
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/tx.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
    index 3cd24d8170d3..f6f09a3506aa 100644
    --- a/net/mac80211/tx.c
    +++ b/net/mac80211/tx.c
    @@ -5761,6 +5761,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
    skb_reset_network_header(skb);
    skb_reset_mac_header(skb);

    + if (local->hw.queues < IEEE80211_NUM_ACS)
    + goto start_xmit;
    +
    /* update QoS header to prioritize control port frames if possible,
    * priorization also happens for control port frames send over
    * AF_PACKET
    @@ -5776,6 +5779,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,

    rcu_read_unlock();

    +start_xmit:
    /* mutex lock is only needed for incrementing the cookie counter */
    mutex_lock(&local->mtx);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-03 09:41    [W:5.838 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site