From nobody Fri May 06 11:56:04 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0E9311AB6495; Fri, 6 May 2022 11:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KvptX6w1Lz4vV2; Fri, 6 May 2022 11:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651838165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJYpbbx59IbDJ3TDpEGvRK4eBvUK64lHeXfkzAyiqAM=; b=nG7tW/oBVyFNr3QmK0kzFnRu0LzCnnymtuyxkKfcvYHdvU9/6Hv86eCO/PHJc7BwnWAvC0 zlVuj/xPTFhd7VziCbwYHAX16XSFdCArRJijFeo6DpyHefuFLDJFOAxniK/CAoM6PMxffg 3sLOrlpSN+kYWuS/c30l94c6kC5th424OCPbcQARC5NoaCWzlEokJZ//9CKHH0RVhVbKfe I//uCXoHMzTiWRc0Ufki6ICFfVvJgoOswTOpX1CrwMNrDZ+4kHb/AJZcxZDtuslff2qMCF d7vZIN6C8PBk/i7L061CZlGlsuDLTShOP/XOf1CCr5Bfk/Ne7VVQvZ18P1UOjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD1B61B428; Fri, 6 May 2022 11:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 246Bu4u2039283; Fri, 6 May 2022 11:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Bu4Iq039282; Fri, 6 May 2022 11:56:04 GMT (envelope-from git) Date: Fri, 6 May 2022 11:56:04 GMT Message-Id: <202205061156.246Bu4Iq039282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 868bf82153e8 - main - if: avoid interface destroy race List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 868bf82153e8ff22f09a8860c872149e0fb6bdef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651838165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJYpbbx59IbDJ3TDpEGvRK4eBvUK64lHeXfkzAyiqAM=; b=YJ+K5UauZ+3G9JNfoZ1BBIs+8CBd2JdfvGuXoduCj8E8+4xoeyz1dViN0jaBI/Me6QpzxJ 9pepCIzTsm70lOwvCrU111e/NgJuBb7WUtgmkHZ0dbjfd0eUheWxFno26cymA3IbS0IAbD +bnhux2q1wueJnC758F3Sk0vtITbrXq1UkAhqk7bvUm+lsUeDq24RjSgOGD90/ePDy1hHd M3DLiw6NnMfB7P2Bl6VtM4NPgpVRrMU8MvlptAON4feuM57zjlIakn/3w/+z6BAAr1qWMz ZB0wuTK0vC5FeSg5W1M4/TBhgI1Op2jnE/HdfRjzMV2HV63Cb3OsyIo/kPb/IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651838165; a=rsa-sha256; cv=none; b=Ws5WYQgpZiPHz8GKzeG0+knvMFirZoIX0mJc00LsvMvSEzmR1Bn0oioXL3QQZmQt4pw3dO 258q76qy8EI/p9BFaEhIFXvuL1/3glSM464KMkNV0ozXlFeJL5ffY9Ry3kaU5hTuEh4mwX sEdToDHYeq/Mjb4dSNNszw6x8rxuOgDWzZrmTFheuuYE+SWkJfhH5WUb9i+cGlGm3zTnyR 48RcLmqxGFXL8J+Buu4uHvY+y+TnwpGaz8GVPaK5A8nENmF+ceui8QgKpa13qgkEttJ0L4 Any58JXB18e/E5RYIqs30S+0JesddxBZi+V3al6/ql0KBGGIShVcXAc8QrQQfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=868bf82153e8ff22f09a8860c872149e0fb6bdef commit 868bf82153e8ff22f09a8860c872149e0fb6bdef Author: Kristof Provost AuthorDate: 2022-03-27 18:23:25 +0000 Commit: Kristof Provost CommitDate: 2022-05-06 11:55:08 +0000 if: avoid interface destroy race When we destroy an interface while the jail containing it is being destroyed we risk seeing a race between if_vmove() and the destruction code, which results in us trying to move a destroyed interface. Protect against this by using the ifnet_detach_sxlock to also covert if_vmove() (and not just detach). PR: 262829 MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D34704 --- sys/net/if.c | 22 ++++++++++++++++++++-- tests/sys/net/if_clone_test.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index ff7071cea364..bc0240035ea3 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -513,7 +513,9 @@ vnet_if_return(const void *unused __unused) IFNET_WUNLOCK(); for (int j = 0; j < i; j++) { + sx_xlock(&ifnet_detach_sxlock); if_vmove(pending[j], pending[j]->if_home_vnet); + sx_xunlock(&ifnet_detach_sxlock); } free(pending, M_IFNET); @@ -1312,6 +1314,8 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) bool found __diagused; bool shutdown; + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); + /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); pr = prison_find_child(td->td_ucred->cr_prison, jid); @@ -1336,10 +1340,12 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) prison_free(pr); return (EEXIST); } + sx_xlock(&ifnet_detach_sxlock); /* Make sure the VNET is stable. */ shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet); if (shutdown) { + sx_xunlock(&ifnet_detach_sxlock); CURVNET_RESTORE(); prison_free(pr); return (EBUSY); @@ -1347,7 +1353,12 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) CURVNET_RESTORE(); found = if_unlink_ifnet(ifp, true); - MPASS(found); + if (! found) { + sx_xunlock(&ifnet_detach_sxlock); + CURVNET_RESTORE(); + prison_free(pr); + return (ENODEV); + } /* Move the interface into the child jail/vnet. */ error = if_vmove(ifp, pr->pr_vnet); @@ -1356,6 +1367,8 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) if (error == 0) sprintf(ifname, "%s", ifp->if_xname); + sx_xunlock(&ifnet_detach_sxlock); + prison_free(pr); return (error); } @@ -1406,7 +1419,9 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) /* Get interface back from child jail/vnet. */ found = if_unlink_ifnet(ifp, true); MPASS(found); + sx_xlock(&ifnet_detach_sxlock); error = if_vmove(ifp, vnet_dst); + sx_xunlock(&ifnet_detach_sxlock); CURVNET_RESTORE(); /* Report the new if_xname back to the userland on success. */ @@ -2283,8 +2298,11 @@ ifunit_ref(const char *name) !(ifp->if_flags & IFF_DYING)) break; } - if (ifp != NULL) + if (ifp != NULL) { if_ref(ifp); + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); + } + NET_EPOCH_EXIT(et); return (ifp); } diff --git a/tests/sys/net/if_clone_test.sh b/tests/sys/net/if_clone_test.sh index 0b50d741814f..60483a2da334 100755 --- a/tests/sys/net/if_clone_test.sh +++ b/tests/sys/net/if_clone_test.sh @@ -69,6 +69,34 @@ epair_up_stress_cleanup() cleanup_ifaces } +atf_test_case epair_destroy_race cleanup +epair_destroy_race_head() +{ + atf_set "descr" "Race if_detach() and if_vmove()" + atf_set "require.user" "root" +} +epair_destroy_race_body() +{ + for i in `seq 1 10` + do + epair_a=$(ifconfig epair create) + echo $epair_a >> devices_to_cleanup + epair_b=${epair_a%a}b + + jail -c vnet name="epair_destroy" nopersist path=/ \ + host.hostname="epair_destroy" vnet.interface="$epair_b" \ + command=sh -c "ifconfig $epair_b 192.0.2.1/24; sleep 0.1"& + pid=$! + ifconfig "$epair_a" destroy + wait $pid + done + true +} +epair_destroy_race_cleanup() +{ + cleanup_ifaces +} + atf_test_case epair_ipv6_up_stress cleanup epair_ipv6_up_stress_head() { @@ -405,6 +433,7 @@ atf_init_test_cases() atf_add_test_case epair_ipv6_up_stress atf_add_test_case epair_stress atf_add_test_case epair_up_stress + atf_add_test_case epair_destroy_race atf_add_test_case faith_ipv6_up_stress atf_add_test_case faith_stress atf_add_test_case faith_up_stress