Skip to content

L
linux
Commit cde4ffad authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files
Options

net: hns3: replace hnae3_set_bit and hnae3_set_field in data path 

hnae3_set_bit and hnae3_set_field masks the data before setting
the field or bit, which is unnecessary because the data is already
zero initialized.
Suggested-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cccebac
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 69 deletions
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View file @ cde4ffad
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "hnae3.h" #include "hnae3.h"
#include "hns3_enet.h" #include "hns3_enet.h"
#define hns3_set_field(origin, shift, val) ((origin) |= ((val) << (shift)))
static void hns3_clear_all_ring(struct hnae3_handle *h); static void hns3_clear_all_ring(struct hnae3_handle *h);
static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h); static void hns3_force_clear_all_rx_ring(struct hnae3_handle *h);
static void hns3_remove_hw_addr(struct net_device *netdev); static void hns3_remove_hw_addr(struct net_device *netdev);
...@@ -667,8 +669,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen, ...@@ -667,8 +669,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen,
/* find the txbd field values */ /* find the txbd field values */
*paylen = skb->len - hdr_len; *paylen = skb->len - hdr_len;
hnae3_set_bit(*type_cs_vlan_tso, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_TSO_B, 1);
HNS3_TXD_TSO_B, 1);
/* get MSS for TSO */ /* get MSS for TSO */
*mss = skb_shinfo(skb)->gso_size; *mss = skb_shinfo(skb)->gso_size;
...@@ -747,21 +748,19 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, ...@@ -747,21 +748,19 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,
/* compute L2 header size for normal packet, defined in 2 Bytes */ /* compute L2 header size for normal packet, defined in 2 Bytes */
l2_len = l3.hdr - skb->data; l2_len = l3.hdr - skb->data;
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S, l2_len >> 1);
HNS3_TXD_L2LEN_S, l2_len >> 1);
/* tunnel packet*/ /* tunnel packet*/
if (skb->encapsulation) { if (skb->encapsulation) {
/* compute OL2 header size, defined in 2 Bytes */ /* compute OL2 header size, defined in 2 Bytes */
ol2_len = l2_len; ol2_len = l2_len;
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_L2LEN_M, HNS3_TXD_L2LEN_S, ol2_len >> 1);
HNS3_TXD_L2LEN_S, ol2_len >> 1);
/* compute OL3 header size, defined in 4 Bytes */ /* compute OL3 header size, defined in 4 Bytes */
ol3_len = l4.hdr - l3.hdr; ol3_len = l4.hdr - l3.hdr;
hnae3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_M, hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_S,
HNS3_TXD_L3LEN_S, ol3_len >> 2); ol3_len >> 2);
/* MAC in UDP, MAC in GRE (0x6558)*/ /* MAC in UDP, MAC in GRE (0x6558)*/
if ((ol4_proto == IPPROTO_UDP) || (ol4_proto == IPPROTO_GRE)) { if ((ol4_proto == IPPROTO_UDP) || (ol4_proto == IPPROTO_GRE)) {
...@@ -770,17 +769,16 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, ...@@ -770,17 +769,16 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,
/* compute OL4 header size, defined in 4 Bytes. */ /* compute OL4 header size, defined in 4 Bytes. */
ol4_len = l2_hdr - l4.hdr; ol4_len = l2_hdr - l4.hdr;
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_L4LEN_M, HNS3_TXD_L4LEN_S, HNS3_TXD_L4LEN_S, ol4_len >> 2);
ol4_len >> 2);
/* switch IP header ptr from outer to inner header */ /* switch IP header ptr from outer to inner header */
l3.hdr = skb_inner_network_header(skb); l3.hdr = skb_inner_network_header(skb);
/* compute inner l2 header size, defined in 2 Bytes. */ /* compute inner l2 header size, defined in 2 Bytes. */
l2_len = l3.hdr - l2_hdr; l2_len = l3.hdr - l2_hdr;
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L2LEN_S,
HNS3_TXD_L2LEN_S, l2_len >> 1); l2_len >> 1);
} else { } else {
/* skb packet types not supported by hardware, /* skb packet types not supported by hardware,
* txbd len fild doesn't be filled. * txbd len fild doesn't be filled.
...@@ -796,24 +794,21 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto, ...@@ -796,24 +794,21 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,
/* compute inner(/normal) L3 header size, defined in 4 Bytes */ /* compute inner(/normal) L3 header size, defined in 4 Bytes */
l3_len = l4.hdr - l3.hdr; l3_len = l4.hdr - l3.hdr;
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3LEN_S, l3_len >> 2);
HNS3_TXD_L3LEN_S, l3_len >> 2);
/* compute inner(/normal) L4 header size, defined in 4 Bytes */ /* compute inner(/normal) L4 header size, defined in 4 Bytes */
switch (l4_proto) { switch (l4_proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,
HNS3_TXD_L4LEN_S, l4.tcp->doff); l4.tcp->doff);
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,
HNS3_TXD_L4LEN_S, (sizeof(struct sctphdr) >> 2));
(sizeof(struct sctphdr) >> 2));
break; break;
case IPPROTO_UDP: case IPPROTO_UDP:
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4LEN_S,
HNS3_TXD_L4LEN_S, (sizeof(struct udphdr) >> 2));
(sizeof(struct udphdr) >> 2));
break; break;
default: default:
/* skb packet types not supported by hardware, /* skb packet types not supported by hardware,
...@@ -858,34 +853,30 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, ...@@ -858,34 +853,30 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,
/* define outer network header type.*/ /* define outer network header type.*/
if (skb->protocol == htons(ETH_P_IP)) { if (skb->protocol == htons(ETH_P_IP)) {
if (skb_is_gso(skb)) if (skb_is_gso(skb))
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_OL3T_M, HNS3_TXD_OL3T_S,
HNS3_TXD_OL3T_S, HNS3_OL3T_IPV4_CSUM);
HNS3_OL3T_IPV4_CSUM);
else else
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_OL3T_M, HNS3_TXD_OL3T_S,
HNS3_TXD_OL3T_S, HNS3_OL3T_IPV4_NO_CSUM);
HNS3_OL3T_IPV4_NO_CSUM);
} else if (skb->protocol == htons(ETH_P_IPV6)) { } else if (skb->protocol == htons(ETH_P_IPV6)) {
hnae3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_M, hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_S,
HNS3_TXD_OL3T_S, HNS3_OL3T_IPV6); HNS3_OL3T_IPV6);
} }
/* define tunnel type(OL4).*/ /* define tunnel type(OL4).*/
switch (l4_proto) { switch (l4_proto) {
case IPPROTO_UDP: case IPPROTO_UDP:
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_TUNTYPE_M, HNS3_TXD_TUNTYPE_S,
HNS3_TXD_TUNTYPE_S, HNS3_TUN_MAC_IN_UDP);
HNS3_TUN_MAC_IN_UDP);
break; break;
case IPPROTO_GRE: case IPPROTO_GRE:
hnae3_set_field(*ol_type_vlan_len_msec, hns3_set_field(*ol_type_vlan_len_msec,
HNS3_TXD_TUNTYPE_M, HNS3_TXD_TUNTYPE_S,
HNS3_TXD_TUNTYPE_S, HNS3_TUN_NVGRE);
HNS3_TUN_NVGRE);
break; break;
default: default:
/* drop the skb tunnel packet if hardware don't support, /* drop the skb tunnel packet if hardware don't support,
...@@ -906,43 +897,37 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, ...@@ -906,43 +897,37 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,
} }
if (l3.v4->version == 4) { if (l3.v4->version == 4) {
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,
HNS3_TXD_L3T_S, HNS3_L3T_IPV4); HNS3_L3T_IPV4);
/* the stack computes the IP header already, the only time we /* the stack computes the IP header already, the only time we
* need the hardware to recompute it is in the case of TSO. * need the hardware to recompute it is in the case of TSO.
*/ */
if (skb_is_gso(skb)) if (skb_is_gso(skb))
hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L3CS_B, 1); hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3CS_B, 1);
} else if (l3.v6->version == 6) { } else if (l3.v6->version == 6) {
hnae3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_M, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,
HNS3_TXD_L3T_S, HNS3_L3T_IPV6); HNS3_L3T_IPV6);
} }
switch (l4_proto) { switch (l4_proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1); hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);
hnae3_set_field(*type_cs_vlan_tso, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,
HNS3_TXD_L4T_M, HNS3_L4T_TCP);
HNS3_TXD_L4T_S,
HNS3_L4T_TCP);
break; break;
case IPPROTO_UDP: case IPPROTO_UDP:
if (hns3_tunnel_csum_bug(skb)) if (hns3_tunnel_csum_bug(skb))
break; break;
hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1); hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);
hnae3_set_field(*type_cs_vlan_tso, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,
HNS3_TXD_L4T_M, HNS3_L4T_UDP);
HNS3_TXD_L4T_S,
HNS3_L4T_UDP);
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
hnae3_set_bit(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1); hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4CS_B, 1);
hnae3_set_field(*type_cs_vlan_tso, hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,
HNS3_TXD_L4T_M, HNS3_L4T_SCTP);
HNS3_TXD_L4T_S,
HNS3_L4T_SCTP);
break; break;
default: default:
/* drop the skb tunnel packet if hardware don't support, /* drop the skb tunnel packet if hardware don't support,
...@@ -964,11 +949,8 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto, ...@@ -964,11 +949,8 @@ static int hns3_set_l3l4_type_csum(struct sk_buff *skb, u8 ol4_proto,
static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end) static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end)
{ {
/* Config bd buffer end */ /* Config bd buffer end */
hnae3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_BDTYPE_M, hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);
HNS3_TXD_BDTYPE_S, 0); hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);
hnae3_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);
hnae3_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);
hnae3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_SC_M, HNS3_TXD_SC_S, 0);
} }
static int hns3_fill_desc_vtags(struct sk_buff *skb, static int hns3_fill_desc_vtags(struct sk_buff *skb,
...@@ -1001,10 +983,10 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb, ...@@ -1001,10 +983,10 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,
* and use inner_vtag in one tag case. * and use inner_vtag in one tag case.
*/ */
if (skb->protocol == htons(ETH_P_8021Q)) { if (skb->protocol == htons(ETH_P_8021Q)) {
hnae3_set_bit(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1); hns3_set_field(*out_vlan_flag, HNS3_TXD_OVLAN_B, 1);
*out_vtag = vlan_tag; *out_vtag = vlan_tag;
} else { } else {
hnae3_set_bit(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1); hns3_set_field(*inner_vlan_flag, HNS3_TXD_VLAN_B, 1);
*inner_vtag = vlan_tag; *inner_vtag = vlan_tag;
} }
} else if (skb->protocol == htons(ETH_P_8021Q)) { } else if (skb->protocol == htons(ETH_P_8021Q)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7