AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-23 20:28:17 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: hns3: minor cleanup for hns3_handle_rx_bd()

Browse Source 
Since commit e559709505 ("net: hns3: Add handling of GRO Pkts
not fully RX'ed in NAPI poll"), ring->skb is used to record the
current SKB when processing the RX BD in hns3_handle_rx_bd(),
so the parameter out_skb is unnecessary.

This patch also adjusts the err checking to reduce duplication
in hns3_handle_rx_bd(), and "err == -ENXIO" is rare case, so put
it in the unlikely annotation.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yunsheng Lin 2019-10-19 16:03:54 +08:00 committed by David S. Miller
parent 76643555a1
commit d35bced88f
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -2831,10 +2831,10 @@ static int hns3_alloc_skb(struct hns3_enet_ring *ring, unsigned int length,
} }
static int hns3_add_frag(struct hns3_enet_ring *ring, struct hns3_desc *desc, static int hns3_add_frag(struct hns3_enet_ring *ring, struct hns3_desc *desc,
struct sk_buff **out_skb, bool pending) bool pending)
{ {
struct sk_buff *skb = *out_skb; struct sk_buff *skb = ring->skb;
struct sk_buff *head_skb = *out_skb; struct sk_buff *head_skb = skb;
struct sk_buff *new_skb; struct sk_buff *new_skb;
struct hns3_desc_cb *desc_cb; struct hns3_desc_cb *desc_cb;
struct hns3_desc *pre_desc; struct hns3_desc *pre_desc;
@ -3017,8 +3017,7 @@ static int hns3_handle_bdinfo(struct hns3_enet_ring *ring, struct sk_buff *skb)
return 0; return 0;
} }
static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, static int hns3_handle_rx_bd(struct hns3_enet_ring *ring)
struct sk_buff **out_skb)
{ {
struct sk_buff *skb = ring->skb; struct sk_buff *skb = ring->skb;
struct hns3_desc_cb *desc_cb; struct hns3_desc_cb *desc_cb;
@ -3056,12 +3055,12 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,
if (!skb) { if (!skb) {
ret = hns3_alloc_skb(ring, length, ring->va); ret = hns3_alloc_skb(ring, length, ring->va);
*out_skb = skb = ring->skb; skb = ring->skb;
if (ret < 0) /* alloc buffer fail */ if (ret < 0) /* alloc buffer fail */
return ret; return ret;
if (ret > 0) { /* need add frag */ if (ret > 0) { /* need add frag */
ret = hns3_add_frag(ring, desc, &skb, false); ret = hns3_add_frag(ring, desc, false);
if (ret) if (ret)
return ret; return ret;
@ -3072,7 +3071,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,
ALIGN(ring->pull_len, sizeof(long))); ALIGN(ring->pull_len, sizeof(long)));
} }
} else { } else {
ret = hns3_add_frag(ring, desc, &skb, true); ret = hns3_add_frag(ring, desc, true);
if (ret) if (ret)
return ret; return ret;
@ -3090,8 +3089,6 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,
} }
skb_record_rx_queue(skb, ring->tqp->tqp_index); skb_record_rx_queue(skb, ring->tqp->tqp_index);
*out_skb = skb;
return 0; return 0;
} }
@ -3100,7 +3097,6 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget,
{ {
#define RCB_NOF_ALLOC_RX_BUFF_ONCE 16 #define RCB_NOF_ALLOC_RX_BUFF_ONCE 16
int unused_count = hns3_desc_unused(ring); int unused_count = hns3_desc_unused(ring);
struct sk_buff *skb = ring->skb;
int recv_pkts = 0; int recv_pkts = 0;
int recv_bds = 0; int recv_bds = 0;
int err, num; int err, num;
@ -3123,27 +3119,19 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget,
} }
/* Poll one pkt */ /* Poll one pkt */
err = hns3_handle_rx_bd(ring, &skb); err = hns3_handle_rx_bd(ring);
if (unlikely(!skb)) /* This fault cannot be repaired */ /* Do not get FE for the packet or failed to alloc skb */
if (unlikely(!ring->skb || err == -ENXIO)) {
goto out; goto out;
} else if (likely(!err)) {
if (err == -ENXIO) { /* Do not get FE for the packet */ rx_fn(ring, ring->skb);
goto out; recv_pkts++;
} else if (unlikely(err)) { /* Do jump the err */
recv_bds += ring->pending_buf;
unused_count += ring->pending_buf;
ring->skb = NULL;
ring->pending_buf = 0;
continue;
} }
rx_fn(ring, skb);
recv_bds += ring->pending_buf; recv_bds += ring->pending_buf;
unused_count += ring->pending_buf; unused_count += ring->pending_buf;
ring->skb = NULL; ring->skb = NULL;
ring->pending_buf = 0; ring->pending_buf = 0;
recv_pkts++;
} }
out: out: