| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220324154932.17557-9-shenjian15@huawei.com>
Date: Thu, 24 Mar 2022 23:49:20 +0800
From: Jian Shen <shenjian15@...wei.com>
To: <davem@...emloft.net>, <kuba@...nel.org>, <andrew@...n.ch>,
<ecree.xilinx@...il.com>, <hkallweit1@...il.com>,
<alexandr.lobakin@...el.com>, <saeed@...nel.org>, <leon@...nel.org>
CC: <netdev@...r.kernel.org>, <linuxarm@...neuler.org>,
<lipeng321@...wei.com>
Subject: [RFCv5 PATCH net-next 08/20] net: use netdev_features_set_bit helpers
Replace the '|' and '|=' operations of single feature bit by
netdev_features_set_bit helpers.
Signed-off-by: Jian Shen <shenjian15@...wei.com>
---
.../net/ethernet/hisilicon/hns3/hns3_enet.c | 18 +++++++-----
drivers/net/ethernet/sfc/ef10.c | 4 +--
drivers/net/ethernet/sfc/ef100_nic.c | 3 +-
drivers/net/ethernet/sfc/ef10_sriov.c | 3 +-
drivers/net/ethernet/sfc/efx.c | 4 +--
drivers/net/ethernet/sfc/falcon/efx.c | 6 ++--
net/core/dev.c | 29 ++++++++++---------
net/ethtool/ioctl.c | 26 +++++++++--------
8 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index dcdef392ab0c..3261a8c8d10e 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -3264,7 +3264,7 @@ static void hns3_set_default_feature(struct net_device *netdev)
netdev->priv_flags |= IFF_UNICAST_FLT;
- netdev->gso_partial_features |= NETIF_F_GSO_GRE_CSUM;
+ netdev_gso_partial_features_set_bit(netdev, NETIF_F_GSO_GRE_CSUM_BIT);
netdev_features_zero(&features);
netdev_features_set_array(hns3_default_features_array,
@@ -3274,25 +3274,27 @@ static void hns3_set_default_feature(struct net_device *netdev)
netdev->active_features |= features;
if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
- netdev->active_features |= NETIF_F_GRO_HW;
+ netdev_active_features_set_bit(netdev, NETIF_F_GRO_HW_BIT);
if (!(h->flags & HNAE3_SUPPORT_VF))
- netdev->active_features |= NETIF_F_NTUPLE;
+ netdev_active_features_set_bit(netdev,
+ NETIF_F_NTUPLE_BIT);
}
if (test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps))
- netdev->active_features |= NETIF_F_GSO_UDP_L4;
+ netdev_active_features_set_bit(netdev, NETIF_F_GSO_UDP_L4_BIT);
if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps))
- netdev->active_features |= NETIF_F_HW_CSUM;
+ netdev_active_features_set_bit(netdev, NETIF_F_HW_CSUM_BIT);
else
netdev->active_features |= netdev_ip_csum_features;
if (test_bit(HNAE3_DEV_SUPPORT_UDP_TUNNEL_CSUM_B, ae_dev->caps))
- netdev->active_features |= NETIF_F_GSO_UDP_TUNNEL_CSUM;
+ netdev_active_features_set_bit(netdev,
+ NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT);
if (test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, ae_dev->caps))
- netdev->active_features |= NETIF_F_HW_TC;
+ netdev_active_features_set_bit(netdev, NETIF_F_HW_TC_BIT);
netdev->hw_features |= netdev->active_features;
if (!test_bit(HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B, ae_dev->caps))
@@ -3306,7 +3308,7 @@ static void hns3_set_default_feature(struct net_device *netdev)
netdev->vlan_features |= features;
netdev->hw_enc_features |= netdev->vlan_features;
- netdev->hw_enc_features |= NETIF_F_TSO_MANGLEID;
+ netdev_hw_enc_features_set_bit(netdev, NETIF_F_TSO_MANGLEID_BIT);
}
static int hns3_alloc_buffer(struct hns3_enet_ring *ring,
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index c4cab9d5436d..baad36133e11 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -627,7 +627,7 @@ static int efx_ef10_probe(struct efx_nic *efx)
if (nic_data->datapath_caps &
(1 << MC_CMD_GET_CAPABILITIES_OUT_RX_INCLUDE_FCS_LBN))
- efx->net_dev->hw_features |= NETIF_F_RXFCS;
+ netdev_hw_features_or(efx->net_dev, NETIF_F_RXFCS_BIT);
rc = efx_mcdi_port_get_number(efx);
if (rc < 0)
@@ -1370,7 +1370,7 @@ static int efx_ef10_init_nic(struct efx_nic *efx)
&encap_tso_features);
hw_enc_features |= encap_tso_features;
- hw_enc_features |= NETIF_F_TSO;
+ netdev_features_set_bit(NETIF_F_TSO_BIT, &hw_enc_features);
efx->net_dev->active_features |= encap_tso_features;
}
efx->net_dev->hw_enc_features = hw_enc_features;
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index 42d1d426fb4f..ecb4f189b4ef 100644
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -207,7 +207,8 @@ static int efx_ef100_init_datapath_caps(struct efx_nic *efx)
/* EF100 HW can only offload outer checksums if they are UDP,
* so for GRE_CSUM we have to use GSO_PARTIAL.
*/
- net_dev->gso_partial_features |= NETIF_F_GSO_GRE_CSUM;
+ netdev_gso_partial_features_set_bit(net_dev,
+ NETIF_F_GSO_GRE_CSUM_BIT);
}
efx->num_mac_stats = MCDI_WORD(outbuf,
GET_CAPABILITIES_V4_OUT_MAC_STATS_NUM_STATS);
diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index 7f5aa4a8c451..215a84981cbc 100644
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -243,7 +243,8 @@ static int efx_ef10_vadaptor_alloc_set_features(struct efx_nic *efx)
if (port_flags &
(1 << MC_CMD_VPORT_ALLOC_IN_FLAG_VLAN_RESTRICT_LBN))
- efx->fixed_features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+ netdev_features_set_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
+ &efx->fixed_features);
else
efx->fixed_features &= ~NETIF_F_HW_VLAN_CTAG_FILTER;
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 139f63f93227..4e96984a7fff 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1024,7 +1024,7 @@ static int efx_pci_probe_post_io(struct efx_nic *efx)
ARRAY_SIZE(efx_active_features_array));
if ((*efx->type->offload_features & NETIF_F_IPV6_CSUM) ||
(*efx->type->offload_features & NETIF_F_HW_CSUM))
- net_dev->active_features |= NETIF_F_TSO6;
+ netdev_active_features_set_bit(net_dev, NETIF_F_TSO6_BIT);
/* Check whether device supports TSO */
if (!efx->type->tso_versions || !efx->type->tso_versions(efx))
net_dev->active_features &= ~NETIF_F_ALL_TSO;
@@ -1077,7 +1077,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
return -ENOMEM;
efx = netdev_priv(net_dev);
efx->type = (const struct efx_nic_type *) entry->driver_data;
- efx->fixed_features |= NETIF_F_HIGHDMA;
+ netdev_features_set_bit(NETIF_F_HIGHDMA_BIT, &efx->fixed_features);
pci_set_drvdata(pci_dev, efx);
SET_NETDEV_DEV(net_dev, &pci_dev->dev);
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 0b04e7e6a002..8f16c2b98fd4 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2893,7 +2893,7 @@ static int ef4_pci_probe(struct pci_dev *pci_dev,
return -ENOMEM;
efx = netdev_priv(net_dev);
efx->type = (const struct ef4_nic_type *) entry->driver_data;
- efx->fixed_features |= NETIF_F_HIGHDMA;
+ netdev_features_set_bit(NETIF_F_HIGHDMA_BIT, &efx->fixed_features);
pci_set_drvdata(pci_dev, efx);
SET_NETDEV_DEV(net_dev, &pci_dev->dev);
@@ -2916,8 +2916,8 @@ static int ef4_pci_probe(struct pci_dev *pci_dev,
goto fail3;
net_dev->active_features |= *efx->type->offload_features;
- net_dev->active_features |= NETIF_F_SG;
- net_dev->active_features |= NETIF_F_RXCSUM;
+ netdev_active_features_set_bit(net_dev, NETIF_F_SG_BIT);
+ netdev_active_features_set_bit(net_dev, NETIF_F_RXCSUM_BIT);
/* Mask for features that also apply to VLAN devices */
netdev_vlan_features_set_array(net_dev, efx_vlan_features_array,
ARRAY_SIZE(efx_vlan_features_array));
diff --git a/net/core/dev.c b/net/core/dev.c
index 5d7f8575438a..706960c607e4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3326,7 +3326,8 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
struct net_device *dev = skb->dev;
partial_features = dev->active_features & dev->gso_partial_features;
- partial_features |= NETIF_F_GSO_ROBUST;
+ netdev_features_set_bit(NETIF_F_GSO_ROBUST_BIT,
+ &partial_features);
if (!skb_gso_ok(skb, features | partial_features))
features &= ~NETIF_F_GSO_PARTIAL;
}
@@ -9909,14 +9910,16 @@ int register_netdevice(struct net_device *dev)
dev->active_features |= NETIF_F_SOFT_FEATURES;
if (dev->udp_tunnel_nic_info) {
- dev->active_features |= NETIF_F_RX_UDP_TUNNEL_PORT;
- dev->hw_features |= NETIF_F_RX_UDP_TUNNEL_PORT;
+ netdev_active_features_set_bit(dev,
+ NETIF_F_RX_UDP_TUNNEL_PORT_BIT);
+ netdev_hw_features_set_bit(dev,
+ NETIF_F_RX_UDP_TUNNEL_PORT_BIT);
}
dev->wanted_features = dev->active_features & dev->hw_features;
if (!(dev->flags & IFF_LOOPBACK))
- dev->hw_features |= NETIF_F_NOCACHE_COPY;
+ netdev_hw_features_set_bit(dev, NETIF_F_NOCACHE_COPY_BIT);
/* If IPv4 TCP segmentation offload is supported we should also
* allow the device to enable segmenting the frame with the option
@@ -9924,26 +9927,26 @@ int register_netdevice(struct net_device *dev)
* feature itself but allows the user to enable it later.
*/
if (dev->hw_features & NETIF_F_TSO)
- dev->hw_features |= NETIF_F_TSO_MANGLEID;
+ netdev_hw_features_set_bit(dev, NETIF_F_TSO_MANGLEID_BIT);
if (dev->vlan_features & NETIF_F_TSO)
- dev->vlan_features |= NETIF_F_TSO_MANGLEID;
+ netdev_vlan_features_set_bit(dev, NETIF_F_TSO_MANGLEID_BIT);
if (dev->mpls_features & NETIF_F_TSO)
- dev->mpls_features |= NETIF_F_TSO_MANGLEID;
+ netdev_mpls_features_set_bit(dev, NETIF_F_TSO_MANGLEID_BIT);
if (dev->hw_enc_features & NETIF_F_TSO)
- dev->hw_enc_features |= NETIF_F_TSO_MANGLEID;
+ netdev_hw_enc_features_set_bit(dev, NETIF_F_TSO_MANGLEID_BIT);
/* Make NETIF_F_HIGHDMA inheritable to VLAN devices.
*/
- dev->vlan_features |= NETIF_F_HIGHDMA;
+ netdev_vlan_features_set_bit(dev, NETIF_F_HIGHDMA_BIT);
/* Make NETIF_F_SG inheritable to tunnel devices.
*/
- dev->hw_enc_features |= NETIF_F_SG;
- dev->hw_enc_features |= NETIF_F_GSO_PARTIAL;
+ netdev_hw_enc_features_set_bit(dev, NETIF_F_SG_BIT);
+ netdev_hw_enc_features_set_bit(dev, NETIF_F_GSO_PARTIAL_BIT);
/* Make NETIF_F_SG inheritable to MPLS.
*/
- dev->mpls_features |= NETIF_F_SG;
+ netdev_mpls_features_set_bit(dev, NETIF_F_SG_BIT);
ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
ret = notifier_to_errno(ret);
@@ -11030,7 +11033,7 @@ netdev_features_t netdev_increment_features(netdev_features_t all,
if (mask & NETIF_F_HW_CSUM)
mask |= NETIF_F_CSUM_MASK;
- mask |= NETIF_F_VLAN_CHALLENGED;
+ netdev_features_set_bit(NETIF_F_VLAN_CHALLENGED_BIT, &mask);
tmp = NETIF_F_ONE_FOR_ALL | NETIF_F_CSUM_MASK;
tmp &= one;
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 2a6f5b9cf988..77538c5175ec 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -238,28 +238,28 @@ static netdev_features_t ethtool_get_feature_mask(u32 eth_cmd)
case ETHTOOL_GTXCSUM:
case ETHTOOL_STXCSUM:
tmp = NETIF_F_CSUM_MASK;
- tmp |= NETIF_F_FCOE_CRC;
- tmp |= NETIF_F_SCTP_CRC;
+ netdev_features_set_bit(NETIF_F_FCOE_CRC_BIT, &tmp);
+ netdev_features_set_bit(NETIF_F_SCTP_CRC_BIT, &tmp);
return tmp;
case ETHTOOL_GRXCSUM:
case ETHTOOL_SRXCSUM:
- tmp |= NETIF_F_RXCSUM;
+ netdev_features_set_bit(NETIF_F_RXCSUM_BIT, &tmp);
return tmp;
case ETHTOOL_GSG:
case ETHTOOL_SSG:
- tmp |= NETIF_F_SG;
- tmp |= NETIF_F_FRAGLIST;
+ netdev_features_set_bit(NETIF_F_SG_BIT, &tmp);
+ netdev_features_set_bit(NETIF_F_FRAGLIST_BIT, &tmp);
return tmp;
case ETHTOOL_GTSO:
case ETHTOOL_STSO:
return NETIF_F_ALL_TSO;
case ETHTOOL_GGSO:
case ETHTOOL_SGSO:
- tmp |= NETIF_F_GSO;
+ netdev_features_set_bit(NETIF_F_GSO_BIT, &tmp);
return tmp;
case ETHTOOL_GGRO:
case ETHTOOL_SGRO:
- tmp |= NETIF_F_GRO;
+ netdev_features_set_bit(NETIF_F_GRO_BIT, &tmp);
return tmp;
default:
BUG();
@@ -346,15 +346,17 @@ static int __ethtool_set_flags(struct net_device *dev, u32 data)
netdev_features_zero(&features);
if (data & ETH_FLAG_LRO)
- features |= NETIF_F_LRO;
+ netdev_features_set_bit(NETIF_F_LRO_BIT, &features);
if (data & ETH_FLAG_RXVLAN)
- features |= NETIF_F_HW_VLAN_CTAG_RX;
+ netdev_features_set_bit(NETIF_F_HW_VLAN_CTAG_RX_BIT,
+ &features);
if (data & ETH_FLAG_TXVLAN)
- features |= NETIF_F_HW_VLAN_CTAG_TX;
+ netdev_features_set_bit(NETIF_F_HW_VLAN_CTAG_TX_BIT,
+ &features);
if (data & ETH_FLAG_NTUPLE)
- features |= NETIF_F_NTUPLE;
+ netdev_features_set_bit(NETIF_F_NTUPLE_BIT, &features);
if (data & ETH_FLAG_RXHASH)
- features |= NETIF_F_RXHASH;
+ netdev_features_set_bit(NETIF_F_RXHASH_BIT, &features);
netdev_features_zero(ð_all_features);
netdev_features_set_array(ethtool_all_features_array,
--
2.33.0
Powered by blists - more mailing lists