From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) (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 D4256405ACC for ; Thu, 26 Mar 2026 15:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774540068; cv=none; b=sZr1Fq/KXPPd2TC86MmM4zoucctK8E4E7XlJlzePxlRMXW8Ht2LJ7nRLJV5ehgAfUZQR8R4TZvVr7MjQ0HWiYMMjDRVoJOTFGaxvtljIJWB/u7jjX+Si4JS3i5Qal2KBpUM9+1wn78mlS6cO9SGst+y0qrC9rL5LJrKw2s948ow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774540068; c=relaxed/simple; bh=U6p3gmpfZYNmIXqvlbwD8jQV3/qsbkyG/cQlRyqNnHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gbRQygeOU+11XAHXqaLZ6slajbj0DR6K0+u+Ziuv+/TjUqfPilBNbnq+EZrwi7IDxXl3KP16qgfBS3b0C24j6sawyMccuV2eiwtDOQ5A+FTNeAvq3zWIVhIWxMIHhZFSu1gPOHo/HEZax+9jB3/RFAKd3zhZPJINTuNses2TA/s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=kGBZIWSO; arc=none smtp.client-ip=91.218.175.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="kGBZIWSO" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774540065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hPY4fsQXGzvXxvTJIcp/TRaosw/Q+GiVOf+xawe5e6k=; b=kGBZIWSOuWQqwBnhi3Kabwd0JVjrAca8wnTmORr34G8ha3ZV2UesYDjuVdhCUxHkT2rnO/ lWESoiTRyg7zzoTZM1ZnuCdGJljVmIgn84oYd60dYiAKLe3RAo/W7021qMVzgBMyTZ8wWw HcplX3UaQBJhl/LXPL3jViMzEsoOk8o= From: luka.gejak@linux.dev To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Cc: horms@kernel.org, fmaurer@redhat.com, liuhangbin@gmail.com, linux-kernel@vger.kernel.org, luka.gejak@linux.dev Subject: [PATCH net-next v2 2/4] net: hsr: fix VLAN add unwind on slave errors Date: Thu, 26 Mar 2026 16:47:13 +0100 Message-ID: <20260326154715.38405-3-luka.gejak@linux.dev> In-Reply-To: <20260326154715.38405-1-luka.gejak@linux.dev> References: <20260326154715.38405-1-luka.gejak@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Luka Gejak When vlan_vid_add() fails for a secondary slave, the error path calls vlan_vid_del() on the failing port instead of the peer slave that had already succeeded. This results in asymmetric VLAN state across the HSR pair. Fix this by switching to a centralized unwind path that removes the VID from any slave device that was already programmed. Signed-off-by: Luka Gejak --- net/hsr/hsr_device.c | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 5c3eca2235ce..75c491279df8 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -532,8 +532,8 @@ static void hsr_change_rx_flags(struct net_device *dev, int change) static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) { - bool is_slave_a_added = false; - bool is_slave_b_added = false; + struct net_device *slave_a_dev = NULL; + struct net_device *slave_b_dev = NULL; struct hsr_port *port; struct hsr_priv *hsr; int ret = 0; @@ -546,29 +546,28 @@ static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev, continue; ret = vlan_vid_add(port->dev, proto, vid); - switch (port->type) { - case HSR_PT_SLAVE_A: - if (ret) { - /* clean up Slave-B */ + if (ret) { + switch (port->type) { + case HSR_PT_SLAVE_A: netdev_err(dev, "add vid failed for Slave-A\n"); - if (is_slave_b_added) - vlan_vid_del(port->dev, proto, vid); - return ret; + break; + case HSR_PT_SLAVE_B: + netdev_err(dev, "add vid failed for Slave-B\n"); + break; + default: + break; } - is_slave_a_added = true; + goto unwind; + } + + switch (port->type) { + case HSR_PT_SLAVE_A: + slave_a_dev = port->dev; break; case HSR_PT_SLAVE_B: - if (ret) { - /* clean up Slave-A */ - netdev_err(dev, "add vid failed for Slave-B\n"); - if (is_slave_a_added) - vlan_vid_del(port->dev, proto, vid); - return ret; - } - - is_slave_b_added = true; + slave_b_dev = port->dev; break; default: break; @@ -576,6 +575,15 @@ static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev, } return 0; + +unwind: + if (slave_a_dev) + vlan_vid_del(slave_a_dev, proto, vid); + + if (slave_b_dev) + vlan_vid_del(slave_b_dev, proto, vid); + + return ret; } static int hsr_ndo_vlan_rx_kill_vid(struct net_device *dev, -- 2.53.0