From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) (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 A92A536922D for ; Wed, 3 Jun 2026 06:20:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780467663; cv=none; b=uVsrIKTkkg1aCskz/m3+RZZjxhc9rSR6RVwmg+kJtx7SAju1MvACORzgMyZMG22HlPkV8id4Td3lBO4Xj8OHabsJt2vu3mdrP9oKY5TfbrmsIuIzf51diRFej+6c4mjjufKpo0wwH0vTJ8ot0BsCR/ej83Ira5tzeWX5C02Xtw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780467663; c=relaxed/simple; bh=AmP1t+JlLaSmidYsSfhD3U4FrrzJy3+kfQxb7fut5iE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BZTr/PbUwuGVR/4BqZeG6bAGbOL7W8lJqSS0NjObyvNWJZaBqiPqgWPKjEB4CLfcFP2Q5MhqWo+XPkweVrBlNgKfguHAcan0fSkDmuFi3yQh3ulAap4+FBLXBwfxGCytpu1/Voot5A7lZW5/b4s7hQzeT3zhHghTNyrtilTR61w= 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=tMUHYkgp; arc=none smtp.client-ip=209.85.222.202 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="tMUHYkgp" Received: by mail-qk1-f202.google.com with SMTP id af79cd13be357-914b616c670so1596168385a.2 for ; Tue, 02 Jun 2026 23:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780467659; x=1781072459; 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=yP97rsr9rLpkIFKIomLZuarY5tn2NM0TN9r3V4vrnRs=; b=tMUHYkgp4CL+AC+qExsWzekUiAz2zHTYnSMuG6VyXmO5jUm1E30lKvWzWGaOLeihuL oQrBF/W6SRvcnE+LzXYCEtif/KNCTg9pS3XaD1iwVHeirN1VTD8rIi0gqtkU9eFEM9pM S2Ll7GzbL29cR3RO1SAL0LEBQ/MW2YK3/THvcgsUkqQcoPz0ZuxhUQZ8svAmyH0jctb+ ywHhY+aqnsoMRrGSArcqJrKsJEmQfVdvyPmzE1HeBPth4aGX5kAhWSqve3+m2EGhf50u vvdUn1PkDHfR1refSEQfM+G4EWBpr+I+TmqHjKQpKFRedZK7xci3cGHINcnEau8fM3kl 4ZkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780467659; x=1781072459; 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=yP97rsr9rLpkIFKIomLZuarY5tn2NM0TN9r3V4vrnRs=; b=XEeelmDeVK0YjoPD5urEFFJ/UUufVy74bAbOJ76kFuT5ZAWoe5FQ8Noza+EG02RTX3 LETkx1h7CWhCMGgGmBJDeK8riu+8qcVFN9QHhLRRoZ7ngONJggotJOA9tbEO49HJ60iB 7g5H0V/1nm2Ds/7jOFnwNOn8a1tur322v6xFSNQP37BpBSFg/80sIgkawrrEKH5wuR8G VAJfcsydrQZtOqk9f5/YYWEeA9vXjjBvFt2JCXghAbjcAhGv/iGIqJIb0LkgQHiwuOBx k+d3tLb9OQFuTTRzrRygYBqLrRuWtMqfT7q8rYOzHKTFUTvj5p3fSz1NOa0OdtmTxZYI LxqQ== X-Forwarded-Encrypted: i=1; AFNElJ8YQreI53LkImgPqEQTcSjln+QEOoLhF/j0nHs23vNQBO8UVpnhMc5K9kWJD4h3xHM3fD4Ucig=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2EueAxiYodhaqxSOZhpZcjGCwVfNEe8vGMX8aLktXXNm9rU9p Uy+sbGse6OoTwYZJX0gWskN1Z/27lUiPei+vZzDOafWWQsn5q9amPq1Um5wppA0ZaEdSKI7mS7O 9BrLzAPsfEX9B4A== X-Received: from qknte19-n2.prod.google.com ([2002:a05:620a:2413:20b0:915:24c0:2c55]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:800e:b0:915:5cbd:1d96 with SMTP id af79cd13be357-9158a81255fmr334709485a.33.1780467658472; Tue, 02 Jun 2026 23:20:58 -0700 (PDT) Date: Wed, 3 Jun 2026 06:20:41 +0000 In-Reply-To: <20260603062043.3911278-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260603062043.3911278-1-edumazet@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603062043.3911278-10-edumazet@google.com> Subject: [PATCH v2 net-next 09/11] bridge: provide lockless access to p->port_id From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Ido Schimmel , Nikolay Aleksandrov , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" sysfs show_port_id() and BRCTL_GET_PORT_INFO need this. This will be needed for upcoming RTNL avoidance in "ip link" dumps (cf br_port_fill_attrs()). Signed-off-by: Eric Dumazet Reviewed-by: Ido Schimmel --- net/bridge/br_ioctl.c | 2 +- net/bridge/br_netlink.c | 2 +- net/bridge/br_stp_if.c | 4 ++-- net/bridge/br_sysfs_if.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index 2be802991f70ab3ce48ade5da6d1488e072dbec6..a017374c6e659498d98c6af3f8d8e46a8b93570e 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -257,7 +257,7 @@ int br_dev_siocdevprivate(struct net_device *dev, struct ifreq *rq, memset(&p, 0, sizeof(struct __port_info)); memcpy(&p.designated_root, &pt->designated_root, 8); memcpy(&p.designated_bridge, &pt->designated_bridge, 8); - p.port_id = pt->port_id; + p.port_id = READ_ONCE(pt->port_id); p.designated_port = READ_ONCE(pt->designated_port); p.path_cost = READ_ONCE(pt->path_cost); p.designated_cost = READ_ONCE(pt->designated_cost); diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index fc25c6b6cc9713080873976f443da1fbd764aafe..f8266a7a9e2b910f1b4e08792b2940ae0fd2bba2 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -267,7 +267,7 @@ static int br_port_fill_attrs(struct sk_buff *skb, READ_ONCE(p->designated_port)) || nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_COST, READ_ONCE(p->designated_cost)) || - nla_put_u16(skb, IFLA_BRPORT_ID, p->port_id) || + nla_put_u16(skb, IFLA_BRPORT_ID, READ_ONCE(p->port_id)) || nla_put_u16(skb, IFLA_BRPORT_NO, p->port_no) || nla_put_u8(skb, IFLA_BRPORT_TOPOLOGY_CHANGE_ACK, p->topology_change_ack) || diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 3524bb7e87f0586774a883720be9fa8eb60f0370..8a418f6af423ccba88fae57d2254e35e1ae4a1a0 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -34,7 +34,7 @@ void br_init_port(struct net_bridge_port *p) { int err; - p->port_id = br_make_port_id(p->priority, p->port_no); + WRITE_ONCE(p->port_id, br_make_port_id(p->priority, p->port_no)); br_become_designated_port(p); br_set_state(p, BR_STATE_BLOCKING); p->topology_change_ack = 0; @@ -322,7 +322,7 @@ int br_stp_set_port_priority(struct net_bridge_port *p, unsigned long newprio) if (br_is_designated_port(p)) WRITE_ONCE(p->designated_port, new_port_id); - p->port_id = new_port_id; + WRITE_ONCE(p->port_id, new_port_id); WRITE_ONCE(p->priority, newprio); if (!memcmp(&p->br->bridge_id, &p->designated_bridge, 8) && p->port_id < p->designated_port) { diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 3f666d4fef42324a4751779153ecc48bdb44b85a..1cc474ed0fdc02234a9f9d6b936247c34cbb127d 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -141,7 +141,7 @@ static BRPORT_ATTR(designated_cost, 0444, show_designated_cost, NULL); static ssize_t show_port_id(struct net_bridge_port *p, char *buf) { - return sysfs_emit(buf, "0x%x\n", p->port_id); + return sysfs_emit(buf, "0x%x\n", READ_ONCE(p->port_id)); } static BRPORT_ATTR(port_id, 0444, show_port_id, NULL); -- 2.54.0.1013.g208068f2d8-goog