| 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: <20210929155334.12454-51-shenjian15@huawei.com>
Date: Wed, 29 Sep 2021 23:51:37 +0800
From: Jian Shen <shenjian15@...wei.com>
To: <davem@...emloft.net>, <kuba@...nel.org>, <andrew@...n.ch>,
<hkallweit1@...il.com>
CC: <netdev@...r.kernel.org>, <linuxarm@...neuler.org>
Subject: [RFCv2 net-next 050/167] net: hsr: use netdev feature helpers
Use netdev_feature_xxx helpers to replace the logical operation
for netdev features.
Signed-off-by: Jian Shen <shenjian15@...wei.com>
---
net/hsr/hsr_device.c | 21 ++++++++++++---------
net/hsr/hsr_forward.c | 11 +++++++----
net/hsr/hsr_framereg.c | 3 ++-
net/hsr/hsr_slave.c | 3 ++-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 7e6dd372711f..b7ba16bdb8e0 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -183,7 +183,7 @@ static void hsr_features_recompute(struct hsr_priv *hsr,
netdev_features_t mask;
struct hsr_port *port;
- mask = *features;
+ netdev_feature_copy(&mask, *features);
/* Mask out all features that, if supported by one device, should be
* enabled for all devices (see NETIF_F_ONE_FOR_ALL).
@@ -192,7 +192,7 @@ static void hsr_features_recompute(struct hsr_priv *hsr,
* that were in features originally, and also is in NETIF_F_ONE_FOR_ALL,
* may become enabled.
*/
- *features &= ~NETIF_F_ONE_FOR_ALL;
+ netdev_feature_clear_bits(NETIF_F_ONE_FOR_ALL, features);
hsr_for_each_port(hsr, port)
netdev_increment_features(features, *features,
port->dev->features, mask);
@@ -445,22 +445,25 @@ void hsr_dev_setup(struct net_device *dev)
dev->needs_free_netdev = true;
- dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
- NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
- NETIF_F_HW_VLAN_CTAG_TX;
+ netdev_feature_zero(&dev->hw_features);
+ netdev_feature_set_bits(NETIF_F_SG | NETIF_F_FRAGLIST |
+ NETIF_F_HIGHDMA |
+ NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
+ NETIF_F_HW_VLAN_CTAG_TX, &dev->hw_features);
- dev->features = dev->hw_features;
+ netdev_feature_copy(&dev->features, dev->hw_features);
/* Prevent recursive tx locking */
- dev->features |= NETIF_F_LLTX;
+ netdev_feature_set_bit(NETIF_F_LLTX_BIT, &dev->features);
+
/* VLAN on top of HSR needs testing and probably some work on
* hsr_header_create() etc.
*/
- dev->features |= NETIF_F_VLAN_CHALLENGED;
+ netdev_feature_set_bit(NETIF_F_VLAN_CHALLENGED_BIT, &dev->features);
/* Not sure about this. Taken from bridge code. netdev_features.h says
* it means "Does not change network namespaces".
*/
- dev->features |= NETIF_F_NETNS_LOCAL;
+ netdev_feature_set_bit(NETIF_F_NETNS_LOCAL_BIT, &dev->features);
}
/* Return true if dev is a HSR master; return false otherwise.
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index ceb8afb2a62f..6b3aa5f93be0 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -249,7 +249,8 @@ struct sk_buff *hsr_create_tagged_frame(struct hsr_frame_info *frame,
/* set the lane id properly */
hsr_set_path_id(hsr_ethhdr, port);
return skb_clone(frame->skb_hsr, GFP_ATOMIC);
- } else if (port->dev->features & NETIF_F_HW_HSR_TAG_INS) {
+ } else if (netdev_feature_test_bit(NETIF_F_HW_HSR_TAG_INS_BIT,
+ port->dev->features)) {
return skb_clone(frame->skb_std, GFP_ATOMIC);
}
@@ -293,7 +294,8 @@ struct sk_buff *prp_create_tagged_frame(struct hsr_frame_info *frame,
return NULL;
}
return skb_clone(frame->skb_prp, GFP_ATOMIC);
- } else if (port->dev->features & NETIF_F_HW_HSR_TAG_INS) {
+ } else if (netdev_feature_test_bit(NETIF_F_HW_HSR_TAG_INS_BIT,
+ port->dev->features)) {
return skb_clone(frame->skb_std, GFP_ATOMIC);
}
@@ -349,7 +351,7 @@ bool prp_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port)
bool hsr_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port)
{
- if (port->dev->features & NETIF_F_HW_HSR_FWD)
+ if (netdev_feature_test_bit(NETIF_F_HW_HSR_FWD_BIT, port->dev->features))
return prp_drop_frame(frame, port);
return false;
@@ -390,7 +392,8 @@ static void hsr_forward_do(struct hsr_frame_info *frame)
/* If hardware duplicate generation is enabled, only send out
* one port.
*/
- if ((port->dev->features & NETIF_F_HW_HSR_DUP) && sent)
+ if (netdev_feature_test_bit(NETIF_F_HW_HSR_DUP_BIT,
+ port->dev->features) && sent)
continue;
/* Don't send frame over port where it has been sent before.
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index e31949479305..d0b1d9fe4f4f 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -397,7 +397,8 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,
* ensures entries of restarted nodes gets pruned so that they can
* re-register and resume communications.
*/
- if (!(port->dev->features & NETIF_F_HW_HSR_TAG_RM) &&
+ if (!netdev_feature_test_bit(NETIF_F_HW_HSR_TAG_RM_BIT,
+ port->dev->features) &&
seq_nr_before(sequence_nr, node->seq_out[port->type]))
return;
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index b70e6bbf6021..a21a3035f6d2 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -54,7 +54,8 @@ static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb)
*/
protocol = eth_hdr(skb)->h_proto;
- if (!(port->dev->features & NETIF_F_HW_HSR_TAG_RM) &&
+ if (!netdev_feature_test_bit(NETIF_F_HW_HSR_TAG_RM_BIT,
+ port->dev->features) &&
hsr->proto_ops->invalid_dan_ingress_frame &&
hsr->proto_ops->invalid_dan_ingress_frame(protocol))
goto finish_pass;
--
2.33.0
Powered by blists - more mailing lists