Received-SPF: pass (google.com: domain of linux-wireless+bounces-1362-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Sun, 31 Dec 2023 05:03:51 +0000
To: Kalle Valo <kvalo@kernel.org>, Larry Finger <Larry.Finger@lwfinger.net>, =?utf-8?Q?Michael_B=C3=BCsch?= <m@bues.ch>, Julian Calaby <julian.calaby@gmail.com>
From: Rahul Rameshbabu <sergeantsagara@protonmail.com>
Cc: linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org, linux-kernel@vger.kernel.org, Rahul Rameshbabu <sergeantsagara@protonmail.com>
Subject: [PATCH wireless v2 3/4] wifi: b43: Stop correct queue in DMA worker when QoS is disabled
Message-ID: <20231231050300.122806-4-sergeantsagara@protonmail.com>
In-Reply-To: <20231231050300.122806-1-sergeantsagara@protonmail.com>
References: <20231231050300.122806-1-sergeantsagara@protonmail.com>
Feedback-ID: 26003777:user:proton
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

When QoS is disabled, the queue priority value will not map to the correct
ieee80211 queue since there is only one queue. Stop queue 0 when QoS is
disabled to prevent trying to stop a non-existent queue and failing to stop
the actual queue instantiated.

Fixes: bad691946966 ("b43: avoid packet losses in the dma worker code.")
Signed-off-by: Rahul Rameshbabu <sergeantsagara@protonmail.com>
---

Notes:
    Changes:
   =20
        v1->v2:
            - Refactored logic with helpers (suggested by Larry Finger
              <Larry.Finger@lwfinger.net>)
   =20
    Issue Details:
   =20
        When QoS was first introduced to the b43 driver in commit
        e6f5b934fba8 ("b43: Add QOS support"), four rings were allocated fo=
r
        different QoS priorities for video, voice, best effort, and backgro=
und.
        The core networking stack maps these priorities in the skb, and the=
se
        mappings are noted in the ring's queue_prio member. When disabling =
QoS
        in the driver, the skb will still contain the mapping for the core
        stack while only one queue is actually considered active (the best
        effort queue). In the situation that QoS is disabled, b43 needs to =
pass
        0 to ieee80211 queue functions since the number of queues is set to=
 1
        in the struct ieee80211_hw queues member. This issue was then exten=
ded
        to the changes in commit bad691946966 ("b43: avoid packet losses in=
 the
        dma worker code.").

 drivers/net/wireless/broadcom/b43/main.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireles=
s/broadcom/b43/main.c
index 92ca0b2ca286..97d8bdeaa06c 100644
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
@@ -3603,7 +3603,7 @@ static void b43_tx_work(struct work_struct *work)
 =09=09=09=09err =3D b43_dma_tx(dev, skb);
 =09=09=09if (err =3D=3D -ENOSPC) {
 =09=09=09=09wl->tx_queue_stopped[queue_num] =3D true;
-=09=09=09=09ieee80211_stop_queue(wl->hw, queue_num);
+=09=09=09=09b43_stop_queue(dev, queue_num);
 =09=09=09=09skb_queue_head(&wl->tx_queue[queue_num], skb);
 =09=09=09=09break;
 =09=09=09}
@@ -3627,6 +3627,7 @@ static void b43_op_tx(struct ieee80211_hw *hw,
 =09=09      struct sk_buff *skb)
 {
 =09struct b43_wl *wl =3D hw_to_b43_wl(hw);
+=09u16 skb_queue_mapping;
=20
 =09if (unlikely(skb->len < 2 + 2 + 6)) {
 =09=09/* Too short, this can't be a valid frame. */
@@ -3635,12 +3636,12 @@ static void b43_op_tx(struct ieee80211_hw *hw,
 =09}
 =09B43_WARN_ON(skb_shinfo(skb)->nr_frags);
=20
-=09skb_queue_tail(&wl->tx_queue[skb->queue_mapping], skb);
-=09if (!wl->tx_queue_stopped[skb->queue_mapping]) {
+=09skb_queue_mapping =3D skb_get_queue_mapping(skb);
+=09skb_queue_tail(&wl->tx_queue[skb_queue_mapping], skb);
+=09if (!wl->tx_queue_stopped[skb_queue_mapping])
 =09=09ieee80211_queue_work(wl->hw, &wl->tx_work);
-=09} else {
-=09=09ieee80211_stop_queue(wl->hw, skb->queue_mapping);
-=09}
+=09else
+=09=09b43_stop_queue(wl->current_dev, skb_queue_mapping);
 }
=20
 static void b43_qos_params_upload(struct b43_wldev *dev,
--=20
2.42.0