MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-18 15:19:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

octeon_ep: Implement helper for iterating packets in Rx queue

Browse Source 
[ Upstream commit bd28df2619 ]

The common code with some packet and index manipulations is extracted and
moved to newly implemented helper to make the code more readable and avoid
duplication. This is a preparation for skb allocation failure handling.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Suggested-by: Simon Horman <horms@kernel.org>
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Stable-dep-of: eb592008f7 ("octeon_ep: Add SKB allocation failures handling in __octep_oq_process_rx()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Aleksandr Mishin 2024-10-17 13:06:50 +03:00 committed by Greg Kroah-Hartman
parent 64854b2187
commit e71146ff37
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
View File

@ -336,6 +336,30 @@ static int octep_oq_check_hw_for_pkts(struct octep_device *oct,
return new_pkts; return new_pkts;
} }
/**
* octep_oq_next_pkt() - Move to the next packet in Rx queue.
*
* @oq: Octeon Rx queue data structure.
* @buff_info: Current packet buffer info.
* @read_idx: Current packet index in the ring.
* @desc_used: Current packet descriptor number.
*
* Free the resources associated with a packet.
* Increment packet index in the ring and packet descriptor number.
*/
static void octep_oq_next_pkt(struct octep_oq *oq,
struct octep_rx_buffer *buff_info,
u32 *read_idx, u32 *desc_used)
{
dma_unmap_page(oq->dev, oq->desc_ring[*read_idx].buffer_ptr,
PAGE_SIZE, DMA_FROM_DEVICE);
buff_info->page = NULL;
(*read_idx)++;
(*desc_used)++;
if (*read_idx == oq->max_count)
*read_idx = 0;
}
/** /**
* __octep_oq_process_rx() - Process hardware Rx queue and push to stack. * __octep_oq_process_rx() - Process hardware Rx queue and push to stack.
* *
@ -365,10 +389,7 @@ static int __octep_oq_process_rx(struct octep_device *oct,
desc_used = 0; desc_used = 0;
for (pkt = 0; pkt < pkts_to_process; pkt++) { for (pkt = 0; pkt < pkts_to_process; pkt++) {
buff_info = (struct octep_rx_buffer *)&oq->buff_info[read_idx]; buff_info = (struct octep_rx_buffer *)&oq->buff_info[read_idx];
dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
PAGE_SIZE, DMA_FROM_DEVICE);
resp_hw = page_address(buff_info->page); resp_hw = page_address(buff_info->page);
buff_info->page = NULL;
/* Swap the length field that is in Big-Endian to CPU */ /* Swap the length field that is in Big-Endian to CPU */
buff_info->len = be64_to_cpu(resp_hw->length); buff_info->len = be64_to_cpu(resp_hw->length);
@ -390,36 +411,27 @@ static int __octep_oq_process_rx(struct octep_device *oct,
*/ */
data_offset = OCTEP_OQ_RESP_HW_SIZE; data_offset = OCTEP_OQ_RESP_HW_SIZE;
} }
octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
skb = build_skb((void *)resp_hw, PAGE_SIZE);
skb_reserve(skb, data_offset);
rx_bytes += buff_info->len; rx_bytes += buff_info->len;
if (buff_info->len <= oq->max_single_buffer_size) { if (buff_info->len <= oq->max_single_buffer_size) {
skb = build_skb((void *)resp_hw, PAGE_SIZE);
skb_reserve(skb, data_offset);
skb_put(skb, buff_info->len); skb_put(skb, buff_info->len);
read_idx++;
desc_used++;
if (read_idx == oq->max_count)
read_idx = 0;
} else { } else {
struct skb_shared_info *shinfo; struct skb_shared_info *shinfo;
u16 data_len; u16 data_len;
skb = build_skb((void *)resp_hw, PAGE_SIZE);
skb_reserve(skb, data_offset);
/* Head fragment includes response header(s); /* Head fragment includes response header(s);
* subsequent fragments contains only data. * subsequent fragments contains only data.
*/ */
skb_put(skb, oq->max_single_buffer_size); skb_put(skb, oq->max_single_buffer_size);
read_idx++;
desc_used++;
if (read_idx == oq->max_count)
read_idx = 0;
shinfo = skb_shinfo(skb); shinfo = skb_shinfo(skb);
data_len = buff_info->len - oq->max_single_buffer_size; data_len = buff_info->len - oq->max_single_buffer_size;
while (data_len) { while (data_len) {
dma_unmap_page(oq->dev, oq->desc_ring[read_idx].buffer_ptr,
PAGE_SIZE, DMA_FROM_DEVICE);
buff_info = (struct octep_rx_buffer *) buff_info = (struct octep_rx_buffer *)
&oq->buff_info[read_idx]; &oq->buff_info[read_idx];
if (data_len < oq->buffer_size) { if (data_len < oq->buffer_size) {
@ -434,11 +446,8 @@ static int __octep_oq_process_rx(struct octep_device *oct,
buff_info->page, 0, buff_info->page, 0,
buff_info->len, buff_info->len,
buff_info->len); buff_info->len);
buff_info->page = NULL;
read_idx++; octep_oq_next_pkt(oq, buff_info, &read_idx, &desc_used);
desc_used++;
if (read_idx == oq->max_count)
read_idx = 0;
} }
} }