aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Bogdanov <dmitry.bogdanov@aquantia.com>2019-08-30 08:08:38 -0400
committerDavid S. Miller <davem@davemloft.net>2019-08-31 22:07:11 -0400
commitbe6cef69ba570ebb327eba1ef6438f7af49aaf86 (patch)
tree0e3824a92a0457171c47d333897abd5ec9376d65
parent5c47e3ba6fe52465603cf9d816b3371e6881d649 (diff)
net: aquantia: fix out of memory condition on rx side
On embedded environments with hard memory limits it is a normal although rare case when skb can't be allocated on rx part under high traffic. In such OOM cases napi_complete_done() was not called. So the napi object became in an invalid state like it is "scheduled". Kernel do not re-schedules the poll of that napi object. Consequently, kernel can not remove that object the system hangs on `ifconfig down` waiting for a poll. We are fixing this by gracefully closing napi poll routine with correct invocation of napi_complete_done. This was reproduced with artificially failing the allocation of skb to simulate an "out of memory" error case and check that traffic does not get stuck. Fixes: 970a2e9864b0 ("net: ethernet: aquantia: Vector operations") Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/aquantia/atlantic/aq_vec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
index 715685aa48c3..28892b8acd0e 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
@@ -86,6 +86,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)
86 } 86 }
87 } 87 }
88 88
89err_exit:
89 if (!was_tx_cleaned) 90 if (!was_tx_cleaned)
90 work_done = budget; 91 work_done = budget;
91 92
@@ -95,7 +96,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)
95 1U << self->aq_ring_param.vec_idx); 96 1U << self->aq_ring_param.vec_idx);
96 } 97 }
97 } 98 }
98err_exit: 99
99 return work_done; 100 return work_done;
100} 101}
101 102