net: bridge: use atomic ops to read/change p->flags (II)

Use READ_ONCE(p->flags) in br_port_flag_is_set() to keep its ABI.

Use test_bit(), clear_bit(), set_bit() in:

   net/bridge/br_input.c
   net/bridge/br_mrp.c
   net/bridge/br_mrp_netlink.c

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20260611203453.3067462-5-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 463c3c7083dcdd4f9064b12375792b2961a9b674..7ed19aa8ae59a5d2b10babf91985486ba8889854 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -761,6 +761,6 @@ bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag)
        if (!p)
                return false;
 
-       return p->flags & flag;
+       return READ_ONCE(p->flags) & flag;
 }
 EXPORT_SYMBOL_GPL(br_port_flag_is_set);

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 470615675bdc03ca181b72159a1bcfc7b9d7a6a7..ddb8f002a40e8257db2029a1f7b549c87db52ffd 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -111,7 +111,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
                                &state, &vlan))
                goto out;
 
-       if (p->flags & BR_PORT_LOCKED) {
+       if (test_bit(BR_PORT_LOCKED_BIT, &p->flags)) {
                struct net_bridge_fdb_entry *fdb_src =
                        br_fdb_find_rcu(br, eth_hdr(skb)->h_source, vid);
 
@@ -119,7 +119,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
                        /* FDB miss. Create locked FDB entry if MAB is enabled
                         * and drop the packet.
                         */
-                       if (p->flags & BR_PORT_MAB)
+                       if (test_bit(BR_PORT_MAB_BIT, &p->flags))
                                br_fdb_update(br, p, eth_hdr(skb)->h_source,
                                              vid, BIT(BR_FDB_LOCKED));
                        goto drop;
@@ -140,7 +140,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
        nbp_switchdev_frame_mark(p, skb);
 
        /* insert into forwarding database after filtering to avoid spoofing */
-       if (p->flags & BR_LEARNING)
+       if (test_bit(BR_LEARNING_BIT, &p->flags))
                br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, 0);
 
        promisc = !!(br->dev->flags & IFF_PROMISC);
@@ -164,7 +164,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
        }
 
        BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-       BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
+       BR_INPUT_SKB_CB(skb)->src_port_isolated = test_bit(BR_ISOLATED_BIT, &p->flags);
 
        if (IS_ENABLED(CONFIG_INET) &&
            (skb->protocol == htons(ETH_P_ARP) ||
@@ -248,7 +248,7 @@ static void __br_handle_local_finish(struct sk_buff *skb)
        u16 vid = 0;
 
        /* check if vlan is allowed, to avoid spoofing */
-       if ((p->flags & BR_LEARNING) &&
+       if (test_bit(BR_LEARNING_BIT, &p->flags) &&
            nbp_state_should_learn(p) &&
            !br_opt_get(p->br, BROPT_NO_LL_LEARN) &&
            br_should_learn(p, skb, &vid))
@@ -359,7 +359,7 @@ static rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
        br_tc_skb_miss_set(skb, false);
 
        p = br_port_get_rcu(skb->dev);
-       if (p->flags & BR_VLAN_TUNNEL)
+       if (test_bit(BR_VLAN_TUNNEL_BIT, &p->flags))
                br_handle_ingress_vlan_tunnel(skb, p, nbp_vlan_group_rcu(p));
 
        if (unlikely(is_link_local_ether_addr(dest))) {

diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index f1aa67f7a0510d9ff8ee7d171eecc048a5554d2f..3f7126a7d72003c3e0a6366506bb0b55da49f0a4 100644 (file)
--- a/net/bridge/br_mrp.c
+++ b/net/bridge/br_mrp.c
@@ -454,7 +454,7 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
                state = netif_running(br->dev) ?
                                BR_STATE_FORWARDING : BR_STATE_DISABLED;
                p->state = state;
-               p->flags &= ~BR_MRP_AWARE;
+               clear_bit(BR_MRP_AWARE_BIT, &p->flags);
                spin_unlock_bh(&br->lock);
                br_mrp_port_switchdev_set_state(p, state);
                rcu_assign_pointer(mrp->p_port, NULL);
@@ -466,7 +466,7 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
                state = netif_running(br->dev) ?
                                BR_STATE_FORWARDING : BR_STATE_DISABLED;
                p->state = state;
-               p->flags &= ~BR_MRP_AWARE;
+               clear_bit(BR_MRP_AWARE_BIT, &p->flags);
                spin_unlock_bh(&br->lock);
                br_mrp_port_switchdev_set_state(p, state);
                rcu_assign_pointer(mrp->s_port, NULL);
@@ -478,7 +478,7 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
                state = netif_running(br->dev) ?
                                BR_STATE_FORWARDING : BR_STATE_DISABLED;
                p->state = state;
-               p->flags &= ~BR_MRP_AWARE;
+               clear_bit(BR_MRP_AWARE_BIT, &p->flags);
                spin_unlock_bh(&br->lock);
                br_mrp_port_switchdev_set_state(p, state);
                rcu_assign_pointer(mrp->i_port, NULL);
@@ -526,14 +526,14 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance)
        p = br_mrp_get_port(br, instance->p_ifindex);
        spin_lock_bh(&br->lock);
        p->state = BR_STATE_FORWARDING;
-       p->flags |= BR_MRP_AWARE;
+       set_bit(BR_MRP_AWARE_BIT, &p->flags);
        spin_unlock_bh(&br->lock);
        rcu_assign_pointer(mrp->p_port, p);
 
        p = br_mrp_get_port(br, instance->s_ifindex);
        spin_lock_bh(&br->lock);
        p->state = BR_STATE_FORWARDING;
-       p->flags |= BR_MRP_AWARE;
+       set_bit(BR_MRP_AWARE_BIT, &p->flags);
        spin_unlock_bh(&br->lock);
        rcu_assign_pointer(mrp->s_port, p);
 
@@ -593,7 +593,7 @@ int br_mrp_set_port_state(struct net_bridge_port *p,
 {
        u32 port_state;
 
-       if (!p || !(p->flags & BR_MRP_AWARE))
+       if (!p || !test_bit(BR_MRP_AWARE_BIT, &p->flags))
                return -EINVAL;
 
        spin_lock_bh(&p->br->lock);
@@ -619,7 +619,7 @@ int br_mrp_set_port_role(struct net_bridge_port *p,
 {
        struct br_mrp *mrp;
 
-       if (!p || !(p->flags & BR_MRP_AWARE))
+       if (!p || !test_bit(BR_MRP_AWARE_BIT, &p->flags))
                return -EINVAL;
 
        mrp = br_mrp_find_port(p->br, p);
@@ -784,7 +784,7 @@ int br_mrp_set_in_role(struct net_bridge *br, struct br_mrp_in_role *role)
                state = netif_running(br->dev) ?
                                BR_STATE_FORWARDING : BR_STATE_DISABLED;
                p->state = state;
-               p->flags &= ~BR_MRP_AWARE;
+               clear_bit(BR_MRP_AWARE_BIT, &p->flags);
                spin_unlock_bh(&br->lock);
                br_mrp_port_switchdev_set_state(p, state);
                rcu_assign_pointer(mrp->i_port, NULL);
@@ -809,7 +809,7 @@ int br_mrp_set_in_role(struct net_bridge *br, struct br_mrp_in_role *role)
        p = br_mrp_get_port(br, role->i_ifindex);
        spin_lock_bh(&br->lock);
        p->state = BR_STATE_FORWARDING;
-       p->flags |= BR_MRP_AWARE;
+       set_bit(BR_MRP_AWARE_BIT, &p->flags);
        spin_unlock_bh(&br->lock);
        rcu_assign_pointer(mrp->i_port, p);
 
@@ -1246,7 +1246,7 @@ no_forward:
 static int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb)
 {
        /* If there is no MRP instance do normal forwarding */
-       if (likely(!(p->flags & BR_MRP_AWARE)))
+       if (likely(!test_bit(BR_MRP_AWARE_BIT, &p->flags)))
                goto out;
 
        return br_mrp_rcv(p, skb, p->dev);

diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
index 86f0e75d6e345f8f388ae163860a685279174222..39f07e13fba54ad38198a5f29a4daae2db27d989 100644 (file)
--- a/net/bridge/br_mrp_netlink.c
+++ b/net/bridge/br_mrp_netlink.c
@@ -538,9 +538,9 @@ int br_mrp_ring_port_open(struct net_device *dev, u8 loc)
        }
 
        if (loc)
-               p->flags |= BR_MRP_LOST_CONT;
+               set_bit(BR_MRP_LOST_CONT_BIT, &p->flags);
        else
-               p->flags &= ~BR_MRP_LOST_CONT;
+               clear_bit(BR_MRP_LOST_CONT_BIT, &p->flags);
 
        br_ifinfo_notify(RTM_NEWLINK, NULL, p);
 
@@ -560,9 +560,9 @@ int br_mrp_in_port_open(struct net_device *dev, u8 loc)
        }
 
        if (loc)
-               p->flags |= BR_MRP_LOST_IN_CONT;
+               set_bit(BR_MRP_LOST_IN_CONT_BIT, &p->flags);
        else
-               p->flags &= ~BR_MRP_LOST_IN_CONT;
+               clear_bit(BR_MRP_LOST_IN_CONT_BIT, &p->flags);
 
        br_ifinfo_notify(RTM_NEWLINK, NULL, p);