Skip to content

Commit eb59200

Browse files
Aleksandr Mishinlunn
authored andcommitted
octeon_ep: Add SKB allocation failures handling in __octep_oq_process_rx()
build_skb() returns NULL in case of a memory allocation failure so handle it inside __octep_oq_process_rx() to avoid NULL pointer dereference. __octep_oq_process_rx() is called during NAPI polling by the driver. If skb allocation fails, keep on pulling packets out of the Rx DMA queue: we shouldn't break the polling immediately and thus falsely indicate to the octep_napi_poll() that the Rx pressure is going down. As there is no associated skb in this case, don't process the packets and don't push them up the network stack - they are skipped. Helper function is implemented to unmmap/flush all the fragment buffers used by the dropped packet. 'alloc_failures' counter is incremented to mark the skb allocation error in driver statistics. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 37d79d0 ("octeon_ep: add Tx/Rx processing and interrupt support") Suggested-by: Paolo Abeni <[email protected]> Signed-off-by: Aleksandr Mishin <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
1 parent bd28df2 commit eb59200

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

drivers/net/ethernet/marvell/octeon_ep/octep_rx.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,27 @@ static void octep_oq_next_pkt(struct octep_oq *oq,
360360
*read_idx = 0;
361361
}
362362

363+
/**
364+
* octep_oq_drop_rx() - Free the resources associated with a packet.
365+
*
366+
* @oq: Octeon Rx queue data structure.
367+
* @buff_info: Current packet buffer info.
368+
* @read_idx: Current packet index in the ring.
369+
* @desc_used: Current packet descriptor number.
370+
*
371+
*/
372+
static void octep_oq_drop_rx(struct octep_oq *oq,
373+
struct octep_rx_buffer *buff_info,
374+
u32 *read_idx, u32 *desc_used)
375+
{
376+
int data_len = buff_info->len - oq->max_single_buffer_size;
377+
378+
while (data_len > 0) {
379+
octep_oq_next_pkt(oq, buff_info, read_idx, desc_used);
380+
data_len -= oq->buffer_size;
381+
};
382+
}
383+
363384
/**
364385
* __octep_oq_process_rx() - Process hardware Rx queue and push to stack.
365386
*
@@ -419,6 +440,12 @@ static int __octep_oq_process_rx(struct octep_device *oct,
419440
octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
420441

421442
skb = build_skb((void *)resp_hw, PAGE_SIZE);
443+
if (!skb) {
444+
octep_oq_drop_rx(oq, buff_info,
445+
&read_idx, &desc_used);
446+
oq->stats.alloc_failures++;
447+
continue;
448+
}
422449
skb_reserve(skb, data_offset);
423450

424451
rx_bytes += buff_info->len;

0 commit comments

Comments
 (0)