Skip to content

Commit 0c32a28

Browse files
emuslnkuba-moo
authored andcommitted
ionic: fix mem leak in rx_empty
The sentinel descriptor entry was getting missed in the traverse of the ring from head to tail, so change to a loop of 0 to the end. Fixes: f1d2e89 ("ionic: use index not pointer for queue tracking") Signed-off-by: Shannon Nelson <snelson@pensando.io> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 43ecf7b commit 0c32a28

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

drivers/net/ethernet/pensando/ionic/ionic_txrx.c

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -400,22 +400,20 @@ static void ionic_rx_fill_cb(void *arg)
400400
void ionic_rx_empty(struct ionic_queue *q)
401401
{
402402
struct ionic_desc_info *desc_info;
403-
struct ionic_rxq_desc *desc;
404-
unsigned int i;
405-
u16 idx;
406-
407-
idx = q->tail_idx;
408-
while (idx != q->head_idx) {
409-
desc_info = &q->info[idx];
410-
desc = desc_info->desc;
411-
desc->addr = 0;
412-
desc->len = 0;
403+
struct ionic_page_info *page_info;
404+
unsigned int i, j;
413405

414-
for (i = 0; i < desc_info->npages; i++)
415-
ionic_rx_page_free(q, &desc_info->pages[i]);
406+
for (i = 0; i < q->num_descs; i++) {
407+
desc_info = &q->info[i];
408+
for (j = 0; j < IONIC_RX_MAX_SG_ELEMS + 1; j++) {
409+
page_info = &desc_info->pages[j];
410+
if (page_info->page)
411+
ionic_rx_page_free(q, page_info);
412+
}
416413

414+
desc_info->npages = 0;
415+
desc_info->cb = NULL;
417416
desc_info->cb_arg = NULL;
418-
idx = (idx + 1) & (q->num_descs - 1);
419417
}
420418
}
421419

0 commit comments

Comments
 (0)