在 2021/8/11 22:45, Jian Shen 写道:
Use netdev_feature_xxx helpers to replace the logical operation for netdev features.
Signed-off-by: Jian Shen shenjian15@huawei.com
drivers/net/ethernet/cavium/liquidio/lio_core.c | 6 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 89 +++++++++++++--------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 73 +++++++++++------- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 44 ++++++----- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 +- 5 files changed, 133 insertions(+), 81 deletions(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index 2a0d64e..70e8361 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -660,7 +660,8 @@ liquidio_push_packet(u32 __maybe_unused octeon_id, skb_pull(skb, rh->r_dh.len * BYTES_PER_DHLEN_UNIT); skb->protocol = eth_type_trans(skb, skb->dev);
if ((netdev->features & NETIF_F_RXCSUM) &&
if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT,netdev->features) &&@@ -681,7 +682,8 @@ liquidio_push_packet(u32 __maybe_unused octeon_id, }
/* inbound VLAN tag */
if ((netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
if (netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT,netdev->features) &&diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 0230a63..a0aa543 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2721,31 +2721,37 @@ static void liquidio_fix_features(struct net_device *netdev, { struct lio *lio = netdev_priv(netdev);
- if ((*request & NETIF_F_RXCSUM) &&
- if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, *request) && !(lio->dev_capability & NETIF_F_RXCSUM))
*request &= ~NETIF_F_RXCSUM;
netdev_feature_clear_bit(NETIF_F_RXCSUM_BIT, request);
- if ((*request & NETIF_F_HW_CSUM) &&
- if (netdev_feature_test_bit(NETIF_F_HW_CSUM_BIT, *request) && !(lio->dev_capability & NETIF_F_HW_CSUM))
*request &= ~NETIF_F_HW_CSUM;
netdev_feature_clear_bit(NETIF_F_RXCSUM_BIT, request);
it should be "NETIF_F_HW_CSUM_BIT", not "NETIF_F_RXCSUM_BIT"
- if ((*request & NETIF_F_TSO) && !(lio->dev_capability & NETIF_F_TSO))
*request &= ~NETIF_F_TSO;
- if (netdev_feature_test_bit(NETIF_F_TSO_BIT, *request) &&
!(lio->dev_capability & NETIF_F_TSO))netdev_feature_clear_bit(NETIF_F_TSO_BIT, request);
- if ((*request & NETIF_F_TSO6) && !(lio->dev_capability & NETIF_F_TSO6))
*request &= ~NETIF_F_TSO6;
- if (netdev_feature_test_bit(NETIF_F_TSO6_BIT, *request) &&
!(lio->dev_capability & NETIF_F_TSO6))netdev_feature_clear_bit(NETIF_F_TSO6_BIT, request);
- if ((*request & NETIF_F_LRO) && !(lio->dev_capability & NETIF_F_LRO))
*request &= ~NETIF_F_LRO;
if (netdev_feature_test_bit(NETIF_F_LRO_BIT, *request) &&
!(lio->dev_capability & NETIF_F_LRO))netdev_feature_clear_bit(NETIF_F_LRO_BIT, request);/*Disable LRO if RXCSUM is off */
- if (!(*request & NETIF_F_RXCSUM) && (netdev->features & NETIF_F_LRO) &&
- if (!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, *request) &&
netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features) && (lio->dev_capability & NETIF_F_LRO))
*request &= ~NETIF_F_LRO;
netdev_feature_clear_bit(NETIF_F_LRO_BIT, request);
- if ((*request & NETIF_F_HW_VLAN_CTAG_FILTER) &&
- if (netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
*request) &&
*request &= ~NETIF_F_HW_VLAN_CTAG_FILTER;
netdev_feature_clear_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,request);}
/**
@@ -2758,40 +2764,45 @@ static int liquidio_set_features(struct net_device *netdev, { struct lio *lio = netdev_priv(netdev);
- if ((features & NETIF_F_LRO) &&
- if (netdev_feature_test_bit(NETIF_F_LRO_BIT, features) && (lio->dev_capability & NETIF_F_LRO) &&
!(netdev->features & NETIF_F_LRO))
!netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features))
- else if (!(features & NETIF_F_LRO) &&
- else if (!netdev_feature_test_bit(NETIF_F_LRO_BIT, features) && (lio->dev_capability & NETIF_F_LRO) &&
(netdev->features & NETIF_F_LRO))
netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features))liquidio_set_feature(netdev, OCTNET_CMD_LRO_DISABLE, OCTNIC_LROIPV4 | OCTNIC_LROIPV6);
/* Sending command to firmware to enable/disable RX checksum
- offload settings using ethtool
*/
- if (!(netdev->features & NETIF_F_RXCSUM) &&
- if (!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, netdev->features) && (lio->enc_dev_capability & NETIF_F_RXCSUM) &&
(features & NETIF_F_RXCSUM))
netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, features))
- else if ((netdev->features & NETIF_F_RXCSUM) &&
- else if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT,
netdev->features) &&
!(features & NETIF_F_RXCSUM))
!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, features))
- if ((features & NETIF_F_HW_VLAN_CTAG_FILTER) &&
- if (netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
features) &&
!(netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER))
!netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,netdev->features))
- else if (!(features & NETIF_F_HW_VLAN_CTAG_FILTER) &&
- else if (!netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
features) &&
(netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER))
netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,netdev->features))@@ -3576,25 +3587,35 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_LRO;
netdev->hw_enc_features = (lio->enc_dev_capability &~NETIF_F_LRO);
netdev_feature_zero(&netdev->hw_enc_features);netdev_feature_set_bits(lio->enc_dev_capability,&netdev->hw_enc_features);netdev_feature_clear_bit(NETIF_F_LRO_BIT,&netdev->hw_enc_features);netdev->udp_tunnel_nic_info = &liquidio_udp_tunnels;
lio->dev_capability |= NETIF_F_GSO_UDP_TUNNEL;
netdev->vlan_features = lio->dev_capability;
netdev_feature_zero(&netdev->vlan_features);netdev_feature_set_bits(lio->dev_capability,&netdev->vlan_features);
netdev->features = (lio->dev_capability & ~NETIF_F_LRO);
netdev_feature_zero(&netdev->features);netdev_feature_set_bits(lio->dev_capability,&netdev->features);netdev_feature_clear_bit(NETIF_F_LRO_BIT, &netdev->features);
netdev->hw_features = lio->dev_capability;
netdev_feature_zero(&netdev->hw_features);netdev_feature_set_bits(lio->dev_capability,&netdev->hw_features);
netdev->hw_features = netdev->hw_features &~NETIF_F_HW_VLAN_CTAG_RX;
netdev_feature_clear_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT,&netdev->hw_features);/* MTU range: 68 - 16000 */ netdev->min_mtu = LIO_MIN_MTU_SIZE;
@@ -3662,7 +3683,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) else octeon_dev->priv_flags = 0x0;
if (netdev->features & NETIF_F_LRO)
if (netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features)) liquidio_set_feature(netdev, OCTNET_CMD_LRO_ENABLE, OCTNIC_LROIPV4 | OCTNIC_LROIPV6);diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index cec5b9c..e5f242e 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1820,27 +1820,31 @@ static void liquidio_fix_features(struct net_device *netdev, { struct lio *lio = netdev_priv(netdev);
- if ((*request & NETIF_F_RXCSUM) &&
- if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, *request) && !(lio->dev_capability & NETIF_F_RXCSUM))
*request &= ~NETIF_F_RXCSUM;
netdev_feature_clear_bit(NETIF_F_RXCSUM_BIT, request);
- if ((*request & NETIF_F_HW_CSUM) &&
- if (netdev_feature_test_bit(NETIF_F_HW_CSUM_BIT, *request) && !(lio->dev_capability & NETIF_F_HW_CSUM))
*request &= ~NETIF_F_HW_CSUM;
netdev_feature_clear_bit(NETIF_F_HW_CSUM_BIT, request);
- if ((*request & NETIF_F_TSO) && !(lio->dev_capability & NETIF_F_TSO))
*request &= ~NETIF_F_TSO;
- if (netdev_feature_test_bit(NETIF_F_TSO_BIT, *request) &&
!(lio->dev_capability & NETIF_F_TSO))netdev_feature_clear_bit(NETIF_F_TSO_BIT, request);
- if ((*request & NETIF_F_TSO6) && !(lio->dev_capability & NETIF_F_TSO6))
*request &= ~NETIF_F_TSO6;
- if (netdev_feature_test_bit(NETIF_F_TSO6_BIT, *request) &&
!(lio->dev_capability & NETIF_F_TSO6))netdev_feature_clear_bit(NETIF_F_TSO6_BIT, request);
- if ((*request & NETIF_F_LRO) && !(lio->dev_capability & NETIF_F_LRO))
*request &= ~NETIF_F_LRO;
if (netdev_feature_test_bit(NETIF_F_LRO_BIT, *request) &&
!(lio->dev_capability & NETIF_F_LRO))netdev_feature_clear_bit(NETIF_F_LRO_BIT, request);/* Disable LRO if RXCSUM is off */
- if (!(*request & NETIF_F_RXCSUM) && (netdev->features & NETIF_F_LRO) &&
- if (!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, *request) &&
netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features) && (lio->dev_capability & NETIF_F_LRO))
*request &= ~NETIF_F_LRO;
netdev_feature_clear_bit(NETIF_F_LRO_BIT, request);}
/** \brief Net device set features
@@ -1851,25 +1855,29 @@ static int liquidio_set_features(struct net_device *netdev, netdev_features_t features) { struct lio *lio = netdev_priv(netdev);
- netdev_features_t changed;
- if (!((netdev->features ^ features) & NETIF_F_LRO))
- netdev_feature_xor(&changed, netdev->features, features);
- if (!netdev_feature_test_bit(NETIF_F_LRO_BIT, changed)) return 0;
- if ((features & NETIF_F_LRO) && (lio->dev_capability & NETIF_F_LRO))
- if (netdev_feature_test_bit(NETIF_F_LRO_BIT, features) &&
(lio->dev_capability & NETIF_F_LRO))
- else if (!(features & NETIF_F_LRO) &&
- else if (!netdev_feature_test_bit(NETIF_F_LRO_BIT, features) && (lio->dev_capability & NETIF_F_LRO)) liquidio_set_feature(netdev, OCTNET_CMD_LRO_DISABLE, OCTNIC_LROIPV4 | OCTNIC_LROIPV6);
- if (!(netdev->features & NETIF_F_RXCSUM) &&
- if (!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, netdev->features) && (lio->enc_dev_capability & NETIF_F_RXCSUM) &&
(features & NETIF_F_RXCSUM))
netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, features))
- else if ((netdev->features & NETIF_F_RXCSUM) &&
- else if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT,
netdev->features) &&
!(features & NETIF_F_RXCSUM))
!netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, features))@@ -2108,20 +2116,33 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_LRO;
netdev->hw_enc_features =(lio->enc_dev_capability & ~NETIF_F_LRO);
netdev_feature_zero(&netdev->hw_enc_features);netdev_feature_set_bits(lio->enc_dev_capability,&netdev->hw_enc_features);netdev_feature_clear_bit(NETIF_F_LRO_BIT,&netdev->hw_enc_features);- netdev->udp_tunnel_nic_info = &liquidio_udp_tunnels;
netdev->vlan_features = lio->dev_capability;
netdev_feature_zero(&netdev->vlan_features);netdev_feature_set_bits(lio->enc_dev_capability,&netdev->vlan_features);- /* Add any unchangeable hw features */ lio->dev_capability |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
netdev->features = (lio->dev_capability & ~NETIF_F_LRO);
netdev_feature_zero(&netdev->features);netdev_feature_set_bits(lio->enc_dev_capability,&netdev->features);netdev_feature_clear_bit(NETIF_F_LRO_BIT, &netdev->features);
netdev->hw_features = lio->dev_capability;netdev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX;
netdev_feature_zero(&netdev->hw_features);netdev_feature_set_bits(lio->enc_dev_capability,&netdev->hw_features);netdev_feature_clear_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT,&netdev->hw_features);/* MTU range: 68 - 16000 */ netdev->min_mtu = LIO_MIN_MTU_SIZE;
@@ -2185,7 +2206,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) else octeon_dev->priv_flags = 0x0;
if (netdev->features & NETIF_F_LRO)
if (netdev_feature_test_bit(NETIF_F_LRO_BIT, netdev->features)) liquidio_set_feature(netdev, OCTNET_CMD_LRO_ENABLE, OCTNIC_LROIPV4 | OCTNIC_LROIPV6);diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index 9f736ef..2887d71 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -732,7 +732,7 @@ static inline void nicvf_set_rxhash(struct net_device *netdev, u8 hash_type; u32 hash;
- if (!(netdev->features & NETIF_F_RXHASH))
if (!netdev_feature_test_bit(NETIF_F_RXHASH_BIT, netdev->features)) return;
switch (cqe_rx->rss_alg) {
@@ -823,7 +823,7 @@ static void nicvf_rcv_pkt_handler(struct net_device *netdev, nicvf_set_rxhash(netdev, cqe_rx, skb);
skb_record_rx_queue(skb, rq_idx);
- if (netdev->hw_features & NETIF_F_RXCSUM) {
- if (netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, netdev->hw_features)) { /* HW by default verifies TCP/UDP/SCTP checksums */ skb->ip_summed = CHECKSUM_UNNECESSARY; } else {
@@ -837,7 +837,7 @@ static void nicvf_rcv_pkt_handler(struct net_device *netdev, __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs((__force __be16)cqe_rx->vlan_tci));
- if (napi && (netdev->features & NETIF_F_GRO))
- if (napi && netdev_feature_test_bit(NETIF_F_GRO_BIT, netdev->features)) napi_gro_receive(napi, skb); else netif_receive_skb(skb);
@@ -1768,7 +1768,8 @@ static int nicvf_config_loopback(struct nicvf *nic,
mbx.lbk.msg = NIC_MBOX_MSG_LOOPBACK; mbx.lbk.vf_id = nic->vf_id;
- mbx.lbk.enable = (features & NETIF_F_LOOPBACK) != 0;
mbx.lbk.enable = netdev_feature_test_bit(NETIF_F_LOOPBACK_BIT,
features);return nicvf_send_msg_to_pf(nic, &mbx); }
@@ -1778,21 +1779,24 @@ static void nicvf_fix_features(struct net_device *netdev, { struct nicvf *nic = netdev_priv(netdev);
- if ((*features & NETIF_F_LOOPBACK) &&
- if (netdev_feature_test_bit(NETIF_F_LOOPBACK_BIT, *features) && netif_running(netdev) && !nic->loopback_supported)
*features &= ~NETIF_F_LOOPBACK;
netdev_feature_clear_bit(NETIF_F_LOOPBACK_BIT, features);}
static int nicvf_set_features(struct net_device *netdev, netdev_features_t features) { struct nicvf *nic = netdev_priv(netdev);
- netdev_features_t changed = features ^ netdev->features;
- netdev_features_t changed;
- if (changed & NETIF_F_HW_VLAN_CTAG_RX)
- netdev_feature_xor(&changed, features, netdev->features);
- if (netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT, changed)) nicvf_config_vlan_stripping(nic, features);
- if ((changed & NETIF_F_LOOPBACK) && netif_running(netdev))
if (netdev_feature_test_bit(NETIF_F_LOOPBACK_BIT, changed) &&
netif_running(netdev))return nicvf_config_loopback(nic, features);
return 0;
@@ -2211,18 +2215,22 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_unregister_interrupts;
- netdev->hw_features = (NETIF_F_RXCSUM | NETIF_F_SG |
NETIF_F_TSO | NETIF_F_GRO | NETIF_F_TSO6 |NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |NETIF_F_HW_VLAN_CTAG_RX);
- netdev_feature_zero(&netdev->hw_features);
- netdev_feature_set_bits(NETIF_F_RXCSUM | NETIF_F_SG |
NETIF_F_TSO | NETIF_F_GRO | NETIF_F_TSO6 |NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |NETIF_F_HW_VLAN_CTAG_RX, &netdev->hw_features);
- netdev->hw_features |= NETIF_F_RXHASH;
- netdev_feature_set_bit(NETIF_F_RXHASH_BIT, &netdev->hw_features);
- netdev->features |= netdev->hw_features;
- netdev->hw_features |= NETIF_F_LOOPBACK;
- netdev_feature_or(&netdev->features, netdev->features,
netdev->hw_features);- netdev_feature_set_bit(NETIF_F_LOOPBACK_BIT, &netdev->hw_features);
- netdev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6;
- netdev_feature_zero(&netdev->vlan_features);
- netdev_feature_set_bits(NETIF_F_SG | NETIF_F_IP_CSUM |
NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6,&netdev->hw_features);
it should be "netdev->vlan_features", not "netdev->hw_features"
netdev->netdev_ops = &nicvf_netdev_ops; netdev->watchdog_timeo = NICVF_TX_TIMEOUT; diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index 50bbe79..5e95b42 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -714,7 +714,7 @@ void nicvf_config_vlan_stripping(struct nicvf *nic, netdev_features_t features) rq_cfg = nicvf_queue_reg_read(nic, NIC_QSET_RQ_GEN_CFG, 0);
/* Enable first VLAN stripping */
- if (features & NETIF_F_HW_VLAN_CTAG_RX)
- if (netdev_feature_test_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT, features)) rq_cfg |= (1ULL << 25); else rq_cfg &= ~(1ULL << 25);