Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Mar 2021 15:17:59 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1b73cd3d0a7c - stable/12 - bridge tests: Test for #216510
Message-ID:  <202103021517.122FHxqJ039854@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1b73cd3d0a7c9fa9b19e28a3bd8e79f405309348

commit 1b73cd3d0a7c9fa9b19e28a3bd8e79f405309348
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2020-04-26 16:27:03 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2021-03-02 13:03:07 +0000

    bridge tests: Test for #216510
    
    We used to have an issue with recursive locking with
    net.link.bridge.inherit_mac. This causes us to send an ARP request while
    we hold the BRIDGE_LOCK, which used to cause us to acquire the
    BRIDGE_LOCK again. We can't re-acquire it, so this caused a panic.
    
    Now that we no longer need to acquire the BRIDGE_LOCK for
    bridge_transmit() this should no longer panic. Test this.
    
    PR:     216510
    Reviewed by:    emaste, philip
    MFC after:      2 months
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D24251
    
    (cherry picked from commit 5377560783d95b92fce3bea3caac37d2860b1d48)
---
 tests/sys/net/if_bridge_test.sh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh
index 111281799e9d..a20eae49998f 100755
--- a/tests/sys/net/if_bridge_test.sh
+++ b/tests/sys/net/if_bridge_test.sh
@@ -309,12 +309,40 @@ mac_conflict_cleanup()
 	vnet_cleanup
 }
 
+atf_test_case "inherit_mac" "cleanup"
+inherit_mac_head()
+{
+	atf_set descr 'Bridge inherit_mac test, #216510'
+	atf_set require.user root
+}
+
+inherit_mac_body()
+{
+	vnet_init
+
+	bridge=$(vnet_mkbridge)
+	epair=$(vnet_mkepair)
+	vnet_mkjail one ${bridge} ${epair}a
+
+	jexec one sysctl net.link.bridge.inherit_mac=1
+
+	# Attempt to provoke the panic described in #216510
+	jexec one ifconfig ${bridge} 192.0.0.1/24 up
+	jexec one ifconfig ${bridge} addm ${epair}a
+}
+
+inherit_mac_cleanup()
+{
+	vnet_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "bridge_transmit_ipv4_unicast"
 	atf_add_test_case "stp"
 	atf_add_test_case "static"
 	atf_add_test_case "span"
+	atf_add_test_case "inherit_mac"
 	atf_add_test_case "delete_with_members"
 	atf_add_test_case "mac_conflict"
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103021517.122FHxqJ039854>