From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f74.google.com (mail-vs1-f74.google.com [209.85.217.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5860731E83B for ; Wed, 10 Jun 2026 16:18:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781108338; cv=none; b=X1etACXcSU5dVDJms6xMFh3VgCSNYm3QoIvo9tX7tQsjmtsKm5CaH5eYQxzFsbKeFZlZjZ4Er/DnApGk0h00RJTqlGZtvH8KHDUmarxlN/rO4mjY9O5dbwKin9QdYvjLB10uklXxXNFheNhzyMCvAmVvxS1gnBWSLpdx5E27hWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781108338; c=relaxed/simple; bh=5unzvsjaLkJBvve2i1MR8u0vMRF7DSozJeD3TjPPsQ8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N7Vs+vsYQ+zoDBWbLMLwBGA/cjRAC8kMPdoARTtBo9H7BGVVnH/kcN3wJAV4fYuGHV96Ny4Jk4ZEgxZS3T8psKbkekJ4kohXYOUqj7HY+h10qHZe0vq4+gDBOkhdqiV89kf5zdu2t7bQxqV7MxMS2UAX4Bu5xHu7pAlV/S3D2ac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=kMcwY+Lk; arc=none smtp.client-ip=209.85.217.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="kMcwY+Lk" Received: by mail-vs1-f74.google.com with SMTP id ada2fe7eead31-6cfc66167c4so2726974137.1 for ; Wed, 10 Jun 2026 09:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781108336; x=1781713136; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GNXTwVgwtIbdR8ZIKyd0QPu9CukHQZjIOMQEOuc3hj4=; b=kMcwY+LkZPL+Dtw9rF2az9oZION/ML+CPb8dlAm+JeAqKoWPTxofGw/rg4jtX8Oc8s TTqEaZtXYKuTfrpIB2fwe8j+O9eQK2HI6J293+xnYaDnu6PglRYHUArhC9a+2mt/+se5 XxdIqwfwyDgDiBohHOAc8/xLdSCULv46aF8TyWehuDAG0WOauCThz+4FKAZdPikp1FZq vKeNjQdu+LTT0lQpMI1q5qG0bWpBQn6esDopXCm4xVR/VjVCyzQGxmFbM7sO/YggpsYB fgGKPvM9InRBOg8w+s1cfcWxlBQcv10kQE/C81eAdzbwBdzDqP7wFNOd+6uu/lppv3Fu 3Cng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781108336; x=1781713136; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GNXTwVgwtIbdR8ZIKyd0QPu9CukHQZjIOMQEOuc3hj4=; b=Ttkro3QnFw0AMNdMkfASGP8LzwZRijQhOP/eJOkEKWBXv5iqjCMsNpUq/R/AgKdtC9 GJ/WEiIX2ctxtsUZBfd3/P8lMoEergjgdCWixUElF2N7B0UtZ7r7HeqoxtJ3vk/xB0U2 GHxbejHrzwx/1pCKgeIbCxf90Oe6+/PerqlfmWDut3Vdc6z2maBCma5hyxACX4D4plVq Nqg2PlUz9LnTeL6z+uMqHcE/jwvm10YC7qzBkOC85+m9EtcySVeplv/G0YHuFfsJI9ec bL62CMlvHT8UdgYgigUq4l7ljNidzd6xXOsO4fgPXuvhGaQALZPQVCFj/H8lvaoLWpsk 2l5g== X-Forwarded-Encrypted: i=1; AFNElJ9icQDXDu47sDbooYWxYm7FSGtbG0lDhm2Snv+6zcSiTWriuH/h5dxxCFAueOk2oSt2/RHRvDc=@vger.kernel.org X-Gm-Message-State: AOJu0YzAz9PJ/b8MaBne8ib0D8dHmPdil/FFidwI3fkY052kAqbWfzk4 2WTIwNTCpM1Kweg0DMWpQ/1D7bawOCHVHH+bb78IP9utz9smlEVJ3AIELR6agcfeLOBjVFeQNe5 NUh1/2kRycardAg== X-Received: from qkbt24.prod.google.com ([2002:a05:620a:1298:b0:915:73c6:1adf]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6102:3f10:b0:631:7781:fe8f with SMTP id ada2fe7eead31-6fef9f46086mr14633289137.16.1781108336032; Wed, 10 Jun 2026 09:18:56 -0700 (PDT) Date: Wed, 10 Jun 2026 16:18:36 +0000 In-Reply-To: <20260610161836.1275531-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260610161836.1275531-1-edumazet@google.com> X-Mailer: git-send-email 2.54.0.1099.g489fc7bff1-goog Message-ID: <20260610161836.1275531-6-edumazet@google.com> Subject: [PATCH v2 net-next 5/5] net: bridge: use atomic ops to read/change p->flags (III) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Nikolay Aleksandrov , Ido Schimmel , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" Use test_bit(), clear_bit(), set_bit() in: net/bridge/br_multicast.c net/bridge/br_netlink.c net/bridge/br_stp.c net/bridge/br_stp_bpdu.c net/bridge/br_switchdev.c net/bridge/br_vlan_options.c Signed-off-by: Eric Dumazet --- net/bridge/br_multicast.c | 5 +++-- net/bridge/br_netlink.c | 2 +- net/bridge/br_stp.c | 4 ++-- net/bridge/br_stp_bpdu.c | 2 +- net/bridge/br_switchdev.c | 8 ++++---- net/bridge/br_vlan_options.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index c2c93c7404151dcf02e59eb8b868ec3e39dfd5bd..6b3ac473fd228b65d1479963e032a63a9f9210ee 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -281,7 +281,7 @@ static bool br_port_group_equal(struct net_bridge_port_group *p, if (p->key.port != port) return false; - if (!(port->flags & BR_MULTICAST_TO_UNICAST)) + if (!test_bit(BR_MULTICAST_TO_UNICAST_BIT, &port->flags)) return true; return ether_addr_equal(src, p->eth_addr); @@ -3672,7 +3672,8 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx, if (!mp) goto out; - if (pmctx && (pmctx->port->flags & BR_MULTICAST_FAST_LEAVE)) { + if (pmctx && + test_bit(BR_MULTICAST_FAST_LEAVE_BIT, &pmctx->port->flags)) { struct net_bridge_port_group __rcu **pp; for (pp = &mp->ports; diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 12850f60bfcb418918508612070a6b0266ffbe6b..928e564e6a3ead46afeff39d772f5b9299cb4b30 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -540,7 +540,7 @@ static int br_fill_ifinfo(struct sk_buff *skb, else err = br_fill_ifvlaninfo(skb, vg); - if (port && (port->flags & BR_VLAN_TUNNEL)) + if (port && test_bit(BR_VLAN_TUNNEL_BIT, &port->flags)) err = br_fill_vlan_tunnel_info(skb, vg); rcu_read_unlock(); if (err) diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index b33eb085d9b6cb4cd4f3aff2aa4793d027bbc0f8..46919d73d42f98ad92ad0c4ddd2396a0cdd90c02 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -39,7 +39,7 @@ void br_set_state(struct net_bridge_port *p, unsigned int state) /* Don't change the state of the ports if they are driven by a different * protocol. */ - if (p->flags & BR_MRP_AWARE) + if (test_bit(BR_MRP_AWARE_BIT, &p->flags)) return; p->state = state; @@ -179,7 +179,7 @@ static void br_root_selection(struct net_bridge *br) if (!br_should_become_root_port(p, root_port)) continue; - if (p->flags & BR_ROOT_BLOCK) + if (test_bit(BR_ROOT_BLOCK_BIT, &p->flags)) br_root_port_block(br, p); else root_port = p->port_no; diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 7895489ac6fe7ca47cf001c0fea267d5dcbd4371..74ec42ba1e7d086cbfde608c93f5fa24d6b4ed7b 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -178,7 +178,7 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, if (!ether_addr_equal(eth_hdr(skb)->h_dest, br->group_addr)) goto out; - if (p->flags & BR_BPDU_GUARD) { + if (test_bit(BR_BPDU_GUARD_BIT, &p->flags)) { br_notice(br, "BPDU received on blocked port %u(%s)\n", (unsigned int) p->port_no, p->dev->name); br_stp_disable_port(p); diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c index ee3ad9dfbab99597ab06d5e6e008519d4e17fd6a..990c6b38fd397ad364297b130b0f3736ac7b13a7 100644 --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c @@ -20,7 +20,7 @@ static bool nbp_switchdev_can_offload_tx_fwd(const struct net_bridge_port *p, if (br_multicast_igmp_type(skb)) return false; - return (p->flags & BR_TX_FWD_OFFLOAD) && + return test_bit(BR_TX_FWD_OFFLOAD_BIT, &p->flags) && (p->hwdom != BR_INPUT_SKB_CB(skb)->src_hwdom); } @@ -287,7 +287,7 @@ static int nbp_switchdev_add(struct net_bridge_port *p, return err; if (tx_fwd_offload) { - p->flags |= BR_TX_FWD_OFFLOAD; + set_bit(BR_TX_FWD_OFFLOAD_BIT, &p->flags); static_branch_inc(&br_switchdev_tx_fwd_offload); } @@ -307,8 +307,8 @@ static void nbp_switchdev_del(struct net_bridge_port *p) if (p->hwdom) nbp_switchdev_hwdom_put(p); - if (p->flags & BR_TX_FWD_OFFLOAD) { - p->flags &= ~BR_TX_FWD_OFFLOAD; + if (test_bit(BR_TX_FWD_OFFLOAD_BIT, &p->flags)) { + clear_bit(BR_TX_FWD_OFFLOAD_BIT, &p->flags); static_branch_dec(&br_switchdev_tx_fwd_offload); } } diff --git a/net/bridge/br_vlan_options.c b/net/bridge/br_vlan_options.c index 92af1e558fda886301f167463ddf43f14afd2702..fcc200c3e3da260465f9eb8ab1c8c87e2d3f7588 100644 --- a/net/bridge/br_vlan_options.c +++ b/net/bridge/br_vlan_options.c @@ -172,7 +172,7 @@ static int br_vlan_modify_tunnel(const struct net_bridge_port *p, NL_SET_ERR_MSG_MOD(extack, "Can't modify tunnel mapping of non-port vlans"); return -EINVAL; } - if (!(p->flags & BR_VLAN_TUNNEL)) { + if (!test_bit(BR_VLAN_TUNNEL_BIT, &p->flags)) { NL_SET_ERR_MSG_MOD(extack, "Port doesn't have tunnel flag set"); return -EINVAL; } -- 2.54.0.1099.g489fc7bff1-goog