UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'net-gro-gro_drop-deprecation' 

Eric Dumazet says:

====================
net-gro: GRO_DROP deprecation

GRO_DROP has no practical use and can be removed,
once ice driver is cleaned up.

This removes one useless conditional test in napi_gro_frags().
====================

Link: https://lore.kernel.org/r/20210108113903.3779510-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2021-01-09 14:24:29 -08:00
parent efb5b338da 1d11fa6967
commit 38f7b44925
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/intel/ice/ice_txrx_lib.c
View File

@ -191,12 +191,7 @@ ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)
if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) && if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
(vlan_tag & VLAN_VID_MASK)) (vlan_tag & VLAN_VID_MASK))
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag); __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
if (napi_gro_receive(&rx_ring->q_vector->napi, skb) == GRO_DROP) { napi_gro_receive(&rx_ring->q_vector->napi, skb);
/* this is tracked separately to help us debug stack drops */
rx_ring->rx_stats.gro_dropped++;
netdev_dbg(rx_ring->netdev, "Receive Queue %d: Dropped packet from GRO\n",
rx_ring->q_index);
}
} }
/** /**

1
include/linux/netdevice.h
View File

@ -376,7 +376,6 @@ enum gro_result {
GRO_MERGED_FREE, GRO_MERGED_FREE,
GRO_HELD, GRO_HELD,
GRO_NORMAL, GRO_NORMAL,
GRO_DROP,
GRO_CONSUMED, GRO_CONSUMED,
}; };
typedef enum gro_result gro_result_t; typedef enum gro_result gro_result_t;

11
net/core/dev.c
View File

@ -6070,10 +6070,6 @@ static gro_result_t napi_skb_finish(struct napi_struct *napi,
gro_normal_one(napi, skb); gro_normal_one(napi, skb);
break; break;
case GRO_DROP:
kfree_skb(skb);
break;
case GRO_MERGED_FREE: case GRO_MERGED_FREE:
if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
napi_skb_free_stolen_head(skb); napi_skb_free_stolen_head(skb);
@ -6158,10 +6154,6 @@ static gro_result_t napi_frags_finish(struct napi_struct *napi,
gro_normal_one(napi, skb); gro_normal_one(napi, skb);
break; break;
case GRO_DROP:
napi_reuse_skb(napi, skb);
break;
case GRO_MERGED_FREE: case GRO_MERGED_FREE:
if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
napi_skb_free_stolen_head(skb); napi_skb_free_stolen_head(skb);
@ -6223,9 +6215,6 @@ gro_result_t napi_gro_frags(struct napi_struct *napi)
gro_result_t ret; gro_result_t ret;
struct sk_buff *skb = napi_frags_skb(napi); struct sk_buff *skb = napi_frags_skb(napi);
if (!skb)
return GRO_DROP;
trace_napi_gro_frags_entry(skb); trace_napi_gro_frags_entry(skb);
ret = napi_frags_finish(napi, skb, dev_gro_receive(napi, skb)); ret = napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));