From nobody Thu Feb 6 19:18:22 2025 X-Original-To: dev-commits-src-all@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 4Ypn264Hwcz5mw1f; Thu, 06 Feb 2025 19:18:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ypn261dsbz43CK; Thu, 06 Feb 2025 19:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869502; 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=o9oQ+7CnYLzkCODThxpJLp0+NB7RYv81eS+MUDjhKyU=; b=eEcFezG+hV9q9fpiz6OD4wGtsHVnrgCwlVmMdYvsnbcjwyAbKTX69djHp5AJV6znPTmKI2 YC2M8ztzW4kODJitXvyTU19cNYDs2VIONhVxVsSkz94gOCLZJEa3Yphc62NfewjRAQp/hF qv2Ya0Mv9vsM7w44gDleXCtqyz6XnfcyHCYmVX3UM9QLV/GjPleankiIK70hckZ4sqI0Ye srJtxOR39rnBMbDlBAriIpllqFRhK8WGWu4prd0hJ7A5/oRDgeE5orU494D1/W0wEdAyVc 0rTgwX3fbzUHgxI/iAyGTaBCFvYv+Gf2G2YRAn9COSOKpQTHjHgZg2YT6AwQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869502; 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=o9oQ+7CnYLzkCODThxpJLp0+NB7RYv81eS+MUDjhKyU=; b=T1wG6EVJDjKjA626IG7Q26PDb20p7+S0cX2xxW7ldr3EICaOkv9ve21GZQw23Pr1az8SkH ytiPTwaZmQ8gvJdDf6P4YVZ0JReBt+6sv9hfT88+6SjY2Rhvmi7Azw86DWbgB2T5aDu6yX qpj1Sg5X39T9JsPvCPN3xZawi67Kc4fB3+tQflFGfgflAM+4P0WHOU/9OGC/dwhEov00GS hlMAvuxN8kq1g+ec6zweUxgqZyjKHNTyJEnN2eDsAQHmq5ymUM84IAP4MKFFjbcmZ0LWLm WOwvrwG/SeuWbsIJbtYYsMmyHvgGRxp9OrqsC/aNsFxMW/vfmifE+Vxh0ybRWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738869502; a=rsa-sha256; cv=none; b=ZJT/yubyjCAUTgRt5dFCKKlrD/hPufjZb7zS3X53Lg4fyEuwfaj6XFY/CzigWBiApbsee4 I0PjjKnBECizhOUhsClYkdkR8xf/7UP6IPVfLha3+fmVcn5u9bZXCWqE3ypZXj+369+R2H 67FtAm2HECw1ggxejRAZDQLclpYNyVG0gvc3OR0P/jKBcvxcxiux1tAUlnm8RJmkGUsvDy OHCPX/h89Vz43QjikmwPrdbrqTYS2YvO2NnMPu2gEPrl2BP6bh77CYSzm/kHnsyMqlcRtx z5cwVET+UtYiyl5qsDn+7Ok7CmwAI25/1Vb1vJNtOLIm6MWXSjil2qyAJ+w+xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ypn261C0LzrPL; Thu, 06 Feb 2025 19:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516JIM9w015583; Thu, 6 Feb 2025 19:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516JIMH5015580; Thu, 6 Feb 2025 19:18:22 GMT (envelope-from git) Date: Thu, 6 Feb 2025 19:18:22 GMT Message-Id: <202502061918.516JIMH5015580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e0b2b8fa16a1 - stable/13 - ifnet: Make if_detach_internal() and if_vmove() void List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0b2b8fa16a13abb1ea8326c6ff311d0d94108db Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e0b2b8fa16a13abb1ea8326c6ff311d0d94108db commit e0b2b8fa16a13abb1ea8326c6ff311d0d94108db Author: Zhenlei Huang AuthorDate: 2025-02-04 15:04:59 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 18:59:58 +0000 ifnet: Make if_detach_internal() and if_vmove() void if_detach_internal() never fail since change [1]. As a consequence, also does its caller if_vmove(). While here, remove a stall comment. No functional change intended. This reverts commit c7bab2a7ca9a6dae79f970c6730a19b65a1ed86e. [1] a779388f8bb3 if: Protect V_ifnet in vnet_if_return() Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48820 (cherry picked from commit bb0348a17974d83671becbd32ea0e4bd2ea61906) (cherry picked from commit 700880a13566193b853f75c87ba5c37d395f6a1e) --- sys/net/if.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 107ff67d547a..e30e1c7e5dca 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -278,12 +278,12 @@ static int if_getgroup(struct ifgroupreq *, struct ifnet *); static int if_getgroupmembers(struct ifgroupreq *); static void if_delgroups(struct ifnet *); static void if_attach_internal(struct ifnet *, bool); -static int if_detach_internal(struct ifnet *, bool); +static void if_detach_internal(struct ifnet *, bool); static void if_siocaddmulti(void *, int); static void if_link_ifnet(struct ifnet *); static bool if_unlink_ifnet(struct ifnet *, bool); #ifdef VIMAGE -static int if_vmove(struct ifnet *, struct vnet *); +static void if_vmove(struct ifnet *, struct vnet *); #endif #ifdef INET6 @@ -1137,7 +1137,7 @@ if_detach(struct ifnet *ifp) * on a vnet instance shutdown without this flag being set, e.g., when * the cloned interfaces are destoyed as first thing of teardown. */ -static int +static void if_detach_internal(struct ifnet *ifp, bool vmove) { struct ifaddr *ifa; @@ -1272,8 +1272,6 @@ finish_vnet_shutdown: ifp->if_afdata[dp->dom_family] = NULL; } } - - return (0); } #ifdef VIMAGE @@ -1284,20 +1282,16 @@ finish_vnet_shutdown: * unused if_index in target vnet and calls if_grow() if necessary, * and finally find an unused if_xname for the target vnet. */ -static int +static void if_vmove(struct ifnet *ifp, struct vnet *new_vnet) { void *old; - int rc; /* * Detach from current vnet, but preserve LLADDR info, do not * mark as dead etc. so that the ifnet can be reattached later. - * If we cannot find it, we lost the race to someone else. */ - rc = if_detach_internal(ifp, true); - if (rc != 0) - return (rc); + if_detach_internal(ifp, true); /* * Unlink the ifnet from ifindex_table[] in current vnet, and shrink @@ -1336,7 +1330,6 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet) if_attach_internal(ifp, true); CURVNET_RESTORE(); - return (0); } /* @@ -1347,7 +1340,6 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) { struct prison *pr; struct ifnet *difp; - int error; bool found; bool shutdown; @@ -1393,16 +1385,15 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) } /* Move the interface into the child jail/vnet. */ - error = if_vmove(ifp, pr->pr_vnet); + if_vmove(ifp, pr->pr_vnet); - /* Report the new if_xname back to the userland on success. */ - if (error == 0) - sprintf(ifname, "%s", ifp->if_xname); + /* Report the new if_xname back to the userland. */ + sprintf(ifname, "%s", ifp->if_xname); sx_xunlock(&ifnet_detach_sxlock); prison_free(pr); - return (error); + return (0); } static int @@ -1411,7 +1402,7 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) struct prison *pr; struct vnet *vnet_dst; struct ifnet *ifp; - int error, found; + int found; bool shutdown; /* Try to find the prison within our visibility. */ @@ -1452,16 +1443,15 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) found = if_unlink_ifnet(ifp, true); MPASS(found); sx_xlock(&ifnet_detach_sxlock); - error = if_vmove(ifp, vnet_dst); + if_vmove(ifp, vnet_dst); sx_xunlock(&ifnet_detach_sxlock); CURVNET_RESTORE(); - /* Report the new if_xname back to the userland on success. */ - if (error == 0) - sprintf(ifname, "%s", ifp->if_xname); + /* Report the new if_xname back to the userland. */ + sprintf(ifname, "%s", ifp->if_xname); prison_free(pr); - return (error); + return (0); } #endif /* VIMAGE */