From: Ryan Hsu <[email protected]>
In napi_poll, the budget number is used to control the amount of packets
we should handle per poll to balance the resource in the system.
In the list of the amsdu packets reception, we check if there is budget
count left and handle the complete list of the packets, that it will have
chances the very last list will over the budget leftover.
So adding one more parameter - budget_left, this would help while
traversing the list to avoid handling more than the budget given.
Reported-by: Andrey Ryabinin <[email protected]>
Fix-suggested-by: Igor Mitsyanko <[email protected]>
Signed-off-by: Ryan Hsu <[email protected]>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 0b4c156..95a5a18 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -1718,7 +1718,8 @@ static void ath10k_htt_rx_delba(struct ath10k *ar, struct htt_resp *resp)
}
static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,
- struct sk_buff_head *amsdu)
+ struct sk_buff_head *amsdu,
+ int budget_left)
{
struct sk_buff *msdu;
struct htt_rx_desc *rxd;
@@ -1729,8 +1730,9 @@ static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,
if (WARN_ON(!skb_queue_empty(amsdu)))
return -EINVAL;
- while ((msdu = __skb_dequeue(list))) {
+ while ((msdu = __skb_dequeue(list)) && budget_left) {
__skb_queue_tail(amsdu, msdu);
+ budget_left--;
rxd = (void *)msdu->data - sizeof(*rxd);
if (rxd->msdu_end.common.info0 &
@@ -1821,7 +1823,8 @@ static int ath10k_htt_rx_h_rx_offload(struct ath10k *ar,
return num_msdu;
}
-static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
+static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb,
+ int budget_left)
{
struct ath10k_htt *htt = &ar->htt;
struct htt_resp *resp = (void *)skb->data;
@@ -1878,9 +1881,9 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
if (offload)
num_msdus = ath10k_htt_rx_h_rx_offload(ar, &list);
- while (!skb_queue_empty(&list)) {
+ while (!skb_queue_empty(&list) && budget_left) {
__skb_queue_head_init(&amsdu);
- ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu);
+ ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu, budget_left);
switch (ret) {
case 0:
/* Note: The in-order indication may report interleaved
@@ -1890,6 +1893,7 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
* should still give an idea about rx rate to the user.
*/
num_msdus += skb_queue_len(&amsdu);
+ budget_left -= skb_queue_len(&amsdu);
ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id);
ath10k_htt_rx_h_filter(ar, &amsdu, status);
ath10k_htt_rx_h_mpdu(ar, &amsdu, status);
@@ -2400,7 +2404,8 @@ int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget)
}
spin_lock_bh(&htt->rx_ring.lock);
- num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb);
+ num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb,
+ (budget - quota));
spin_unlock_bh(&htt->rx_ring.lock);
if (num_rx_msdus < 0) {
resched_napi = true;
--
1.9.1
DQpPbiAwOC8yNC8yMDE3IDAyOjA3IEFNLCBLYWxsZSBWYWxvIHdyb3RlOg0KPiByeWFuaHN1QHF0
aS5xdWFsY29tbS5jb20gd3JvdGU6DQo+DQo+PiBGcm9tOiBSeWFuIEhzdSA8cnlhbmhzdUBxdGku
cXVhbGNvbW0uY29tPg0KPj4NCj4+IEluIG5hcGlfcG9sbCwgdGhlIGJ1ZGdldCBudW1iZXIgaXMg
dXNlZCB0byBjb250cm9sIHRoZSBhbW91bnQgb2YgcGFja2V0cw0KPj4gd2Ugc2hvdWxkIGhhbmRs
ZSBwZXIgcG9sbCB0byBiYWxhbmNlIHRoZSByZXNvdXJjZSBpbiB0aGUgc3lzdGVtLg0KPj4NCj4+
IEluIHRoZSBsaXN0IG9mIHRoZSBhbXNkdSBwYWNrZXRzIHJlY2VwdGlvbiwgd2UgY2hlY2sgaWYg
dGhlcmUgaXMgYnVkZ2V0DQo+PiBjb3VudCBsZWZ0IGFuZCBoYW5kbGUgdGhlIGNvbXBsZXRlIGxp
c3Qgb2YgdGhlIHBhY2tldHMsIHRoYXQgaXQgd2lsbCBoYXZlDQo+PiBjaGFuY2VzIHRoZSB2ZXJ5
IGxhc3QgbGlzdCB3aWxsIG92ZXIgdGhlIGJ1ZGdldCBsZWZ0b3Zlci4NCj4+DQo+PiBTbyBhZGRp
bmcgb25lIG1vcmUgcGFyYW1ldGVyIC0gYnVkZ2V0X2xlZnQsIHRoaXMgd291bGQgaGVscCB3aGls
ZQ0KPj4gdHJhdmVyc2luZyB0aGUgbGlzdCB0byBhdm9pZCBoYW5kbGluZyBtb3JlIHRoYW4gdGhl
IGJ1ZGdldCBnaXZlbi4NCj4+DQo+PiBSZXBvcnRlZC1ieTogQW5kcmV5IFJ5YWJpbmluIDxhcnlh
YmluaW5AdmlydHVvenpvLmNvbT4NCj4+IEZpeC1zdWdnZXN0ZWQtYnk6IElnb3IgTWl0c3lhbmtv
IDxpZ29yLm1pdHN5YW5rby5vc0BxdWFudGVubmEuY29tPg0KPj4NCj4+IFNpZ25lZC1vZmYtYnk6
IFJ5YW4gSHN1IDxyeWFuaHN1QHF0aS5xdWFsY29tbS5jb20+DQo+IFdhcyB0aGVyZSBhIGJ1ZyBy
ZXBvcnQgYWJvdXQgdGhpcz8gSSBjYW4gYWRkIGEgbGluayB0byB0aGF0IGFuZCBtYXliZSBhbHNv
DQo+IGluY2x1ZGUgdGhlIHdhcm5pbmcuDQoNCmh0dHBzOi8vbWFyYy5pbmZvLz9sPWxpbnV4LW5l
dGRldiZtPTE0OTg4NDA0NzgyMzg3MCZ3PTINCg0KLS0gDQpSeWFuIEhzdQ0K
[email protected] wrote:
> From: Ryan Hsu <[email protected]>
>
> In napi_poll, the budget number is used to control the amount of packets
> we should handle per poll to balance the resource in the system.
>
> In the list of the amsdu packets reception, we check if there is budget
> count left and handle the complete list of the packets, that it will have
> chances the very last list will over the budget leftover.
>
> So adding one more parameter - budget_left, this would help while
> traversing the list to avoid handling more than the budget given.
>
> Reported-by: Andrey Ryabinin <[email protected]>
> Fix-suggested-by: Igor Mitsyanko <[email protected]>
>
> Signed-off-by: Ryan Hsu <[email protected]>
Was there a bug report about this? I can add a link to that and maybe also
include the warning.
--
https://patchwork.kernel.org/patch/9916207/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
[email protected] wrote:
> In napi_poll, the budget number is used to control the amount of packets
> we should handle per poll to balance the resource in the system.
>
> In the list of the amsdu packets reception, we check if there is budget
> count left and handle the complete list of the packets, that it will have
> chances the very last list will over the budget leftover.
>
> So adding one more parameter - budget_left, this would help while
> traversing the list to avoid handling more than the budget given.
>
> Reported-by: Andrey Ryabinin <[email protected]>
> Fix-suggested-by: Igor Mitsyanko <[email protected]>
> Link: https://lkml.kernel.org/r/[email protected]
> Signed-off-by: Ryan Hsu <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
c9353bf483d3 ath10k: fix napi_poll budget overflow
--
https://patchwork.kernel.org/patch/9916207/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches