From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A25B118A92F for ; Sat, 9 May 2026 00:49:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778287752; cv=none; b=SW+VXyvfVGFhgeGVCK7vW7vquatXKLKdfy+QBQmx5+EEQ923UiRSkOrmRyVx+Q1W44nkO4bweQbdBjBk1MkHOmgkYuMP/Ip87f+oaRPDqp7x8GrJlqClJehrX6RifwP/ILBJjV427em3H1VUc7tCFixsogKOyO223D55f/HWR7E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778287752; c=relaxed/simple; bh=RLZzn7IMqbGK4zXUAbIQ5bp1mxfd/xLLIzIRVAdKQ1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IcQ+xnCvDl8OjZGQuYmy48zN1nd7+KwVzjRO4LFu27vUYPzuWUYxX3e4gzP4DBChGOGcp5iCyX3dN7HFBW+2B+qsbNbP1RggA1DB1lCEtXTQTbMtpFrXu4UYYNcihuLd1ZyGvTKD/Pj0uX91mKJvjsX86kgKhyRyJolvQhJMtlI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QvYV1ywX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QvYV1ywX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57085C2BCB4; Sat, 9 May 2026 00:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778287752; bh=RLZzn7IMqbGK4zXUAbIQ5bp1mxfd/xLLIzIRVAdKQ1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QvYV1ywXCcodNZhWt36GIPTVBVcUJjafHLhLmHDP0xeUjOuW43NPqYV8Y0cG/oHIi TuInEHWTVGQc/HlrcL+xgmcj3Vu2XyrEF0aA8T/T9NXYXR1adqpoMjBZFUkqxQ6jM4 9glSUdLX0vEC8naWpmyllwNvW4xSdga49v27QKCewh6t0g9gdvHNL9kqTa3HUSNXRV rRJ2pOXTyn2YkHP+nbC4Ii4VRZSgullb+sifjuUzzIQhbbAYW4YP7sE9himjDCSYI7 P2BioSyEWLYjID9DtZNwvtq6fYJzxHxsogQWWWnrDLemSkB9GjuZaHnvbjFIYSJ3xR IsE8qdj5cUUsA== From: Sasha Levin To: stable@vger.kernel.org Cc: Longxuan Yu , stable@kernel.org, Yifan Wu , Juefei Pu , Xin Liu , Yuan Tan , Ren Wei , Paolo Abeni , Sasha Levin Subject: [PATCH 7.0.y 2/2] 8021q: delete cleared egress QoS mappings Date: Fri, 8 May 2026 20:49:07 -0400 Message-ID: <20260509004907.2449764-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260509004907.2449764-1-sashal@kernel.org> References: <2026050408-speak-purging-28a1@gregkh> <20260509004907.2449764-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Longxuan Yu [ Upstream commit 7dddc74af369478ba7f9bc136d0fc1dc4570cb66 ] vlan_dev_set_egress_priority() currently keeps cleared egress priority mappings in the hash as tombstones. Repeated set/clear cycles with distinct skb priorities therefore accumulate mapping nodes until device teardown and leak memory. Delete mappings when vlan_prio is cleared instead of keeping tombstones. Now that the egress mapping lists are RCU protected, the node can be unlinked safely and freed after a grace period. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@kernel.org Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Co-developed-by: Yuan Tan Signed-off-by: Yuan Tan Signed-off-by: Longxuan Yu Signed-off-by: Ren Wei Link: https://patch.msgid.link/ecfa6f6ce2467a42647ff4c5221238ae85b79a59.1776647968.git.yuantan098@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/8021q/vlan_dev.c | 20 ++++++++++++++------ net/8021q/vlan_netlink.c | 4 ---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index a5340932b657a..7aa3af8b10ead 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -172,26 +172,34 @@ int vlan_dev_set_egress_priority(const struct net_device *dev, u32 skb_prio, u16 vlan_prio) { struct vlan_dev_priv *vlan = vlan_dev_priv(dev); + struct vlan_priority_tci_mapping __rcu **mpp; struct vlan_priority_tci_mapping *mp; struct vlan_priority_tci_mapping *np; u32 bucket = skb_prio & 0xF; u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK; /* See if a priority mapping exists.. */ - mp = rtnl_dereference(vlan->egress_priority_map[bucket]); + mpp = &vlan->egress_priority_map[bucket]; + mp = rtnl_dereference(*mpp); while (mp) { if (mp->priority == skb_prio) { - if (mp->vlan_qos && !vlan_qos) + if (!vlan_qos) { + rcu_assign_pointer(*mpp, rtnl_dereference(mp->next)); vlan->nr_egress_mappings--; - else if (!mp->vlan_qos && vlan_qos) - vlan->nr_egress_mappings++; - WRITE_ONCE(mp->vlan_qos, vlan_qos); + kfree_rcu(mp, rcu); + } else { + WRITE_ONCE(mp->vlan_qos, vlan_qos); + } return 0; } - mp = rtnl_dereference(mp->next); + mpp = &mp->next; + mp = rtnl_dereference(*mpp); } /* Create a new mapping then. */ + if (!vlan_qos) + return 0; + np = kmalloc_obj(struct vlan_priority_tci_mapping); if (!np) return -ENOBUFS; diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index a5b16833e2cee..368d53ca7d870 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -263,10 +263,6 @@ static int vlan_fill_info(struct sk_buff *skb, const struct net_device *dev) for (pm = rcu_dereference_rtnl(vlan->egress_priority_map[i]); pm; pm = rcu_dereference_rtnl(pm->next)) { u16 vlan_qos = READ_ONCE(pm->vlan_qos); - - if (!vlan_qos) - continue; - m.from = pm->priority; m.to = (vlan_qos >> 13) & 0x7; if (nla_put(skb, IFLA_VLAN_QOS_MAPPING, -- 2.53.0