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 71A1133D6FC; Mon, 20 Apr 2026 16:01:25 +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=1776700885; cv=none; b=MgqBoT7qJBImt1VpKgzAx96Zi98GfpuWFI6B8T9k3E5Ir2sRo0xMxOEyEk5ay4hV5Syrm3qTQSjE4bKgYiH+uT2HsmasRP2nNgPni3VDFFe0A0NNvjef4TjGr8mIFgxvbjNJjss3/JZlYdpaqUHuCti7Ri0/BIZhkqcDimZIG0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700885; c=relaxed/simple; bh=N5uFexyYUcgFKji7xea+HOXk6DQ+I/mFv8lPcoLSqTU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JUOjHeFmcpHKP95A43+zz66xzNGwyVFJGHwk8ZMcgi1JSiBdi5nNLu7Q7wJybaQpVd8DtcMymzcXBusulxFouLIe5qD7hNRT87rdFcHiles/E8idBJXWDrL4d1zaSgMIcyQiaBFZUMmB/lT1Nq8RER7KKqvEYGLY2RTeA0as664= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bS8g/l7+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="bS8g/l7+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0823BC19425; Mon, 20 Apr 2026 16:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776700885; bh=N5uFexyYUcgFKji7xea+HOXk6DQ+I/mFv8lPcoLSqTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bS8g/l7+JXy+T5rDo6G2ft2Tc8B33zRbXyU3T8/P2dZXPbwEjjDlrEFbchABwStqP giTIsFz6SjVn5LlqGLRFj7pklT7w4NQh5AnaNJgEL8l6pH58nwkekTSqVn8o3Jjj+h DD4ys+a6gdGMjEjUmxv6VEjbu1/baA059SmI/xss= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Golle , Alexander Sverdlin , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 097/198] selftests: net: bridge_vlan_mcast: wait for h1 before querier check Date: Mon, 20 Apr 2026 17:41:16 +0200 Message-ID: <20260420153939.096603584@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153935.605963767@linuxfoundation.org> References: <20260420153935.605963767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Golle [ Upstream commit efaa71faf212324ecbf6d5339e9717fe53254f58 ] The querier-interval test adds h1 (currently a slave of the VRF created by simple_if_init) to a temporary bridge br1 acting as an outside IGMP querier. The kernel VRF driver (drivers/net/vrf.c) calls cycle_netdev() on every slave add and remove, toggling the interface admin-down then up. Phylink takes the PHY down during the admin-down half of that cycle. Since h1 and swp1 are cable-connected, swp1 also loses its link may need several seconds to re-negotiate. Use setup_wait_dev $h1 0 which waits for h1 to return to UP state, so the test can rely on the link being back up at this point. Fixes: 4d8610ee8bd77 ("selftests: net: bridge: add vlan mcast_querier_interval tests") Signed-off-by: Daniel Golle Reviewed-by: Alexander Sverdlin Link: https://patch.msgid.link/c830f130860fd2efae08bfb9e5b25fd028e58ce5.1775424423.git.daniel@makrotopia.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh index 72dfbeaf56b92..e8031f68200ad 100755 --- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh +++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh @@ -414,6 +414,7 @@ vlmc_querier_intvl_test() bridge vlan add vid 10 dev br1 self pvid untagged ip link set dev $h1 master br1 ip link set dev br1 up + setup_wait_dev $h1 0 bridge vlan add vid 10 dev $h1 master bridge vlan global set vid 10 dev br1 mcast_snooping 1 mcast_querier 1 sleep 2 -- 2.53.0