Revert "CHROMIUM: net: qualcomm: Refill less rx buffer when memory is low"
This reverts commit 9546d22f6d7643d34e2fdaf86802ff925e8d6373.
BUG=b:63870208
TEST=Test with auto update.
Change-Id: Ie69951c25d1bb55b622f4a1ee7377e785fabef28
Reviewed-on: https://chromium-review.googlesource.com/579667
Reviewed-by: Kan Yan <kyan@google.com>
Commit-Queue: Kan Yan <kyan@google.com>
Tested-by: Kan Yan <kyan@google.com>
(cherry picked from commit 438cb8ab27c6f0640aa9902c01e002a9fb3dff70)
Reviewed-on: https://chromium-review.googlesource.com/581987
Reviewed-by: Brian Sheehan <bsheehan@google.com>
diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c
index 9ca8471..caac3ac 100644
--- a/drivers/net/ethernet/qualcomm/essedma/edma.c
+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
@@ -191,12 +191,6 @@
i = erdr->sw_next_to_fill;
- /* If memory is critically low, take a break. 2000 pages is slightly
- * larger than 2x the minmium free memory needed to prevent OOM panic.
- */
- if (global_page_state(NR_FREE_PAGES) < 2000)
- return cleaned_count;
-
while (cleaned_count) {
sw_desc = &erdr->sw_desc[i];
length = edma_cinfo->rx_head_buffer_len;
@@ -257,11 +251,6 @@
if (++i == erdr->count)
i = 0;
cleaned_count--;
- /* System is low in memory, only refill one buffer and replenish
- * the rest of rx ring later when there is more memory.
- */
- if (global_page_state(NR_FREE_PAGES) < 4000)
- break;
}
erdr->sw_next_to_fill = i;
@@ -765,7 +754,7 @@
erdr->sw_next_to_clean = sw_next_to_clean;
/* Refill here in case refill threshold wasn't reached */
- if (unlikely(cleaned_count)) {
+ if (likely(cleaned_count)) {
ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
erdr->pending_fill = ret_count;
if (ret_count) {
