From nobody Thu Feb 06 19:11:15 2025 X-Original-To: dev-commits-src-branches@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 4Ypmsv4ZL7z5mv90; Thu, 06 Feb 2025 19:11:15 +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 4Ypmsv2fRPz40hc; Thu, 06 Feb 2025 19:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869075; 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=05Z2P/Mc/IC4b7K2t1C8LHWpfOR9F1QJ69kL/9CYWT4=; b=TPxZRvnHcSJpnz31eL+7rh1nJj/n2PgipqB8QEEtQ5gSIR6xT/P63PHKEGoGBLL6GBeFIy qrq/DjLNn1tpW0GXd6Qfplfg8p1NIWhIFvS9oJ5gIaBjeqLZdV/JT6AQWEAvFeMSXTzgQJ hfpWNk0afymQoDnYD/DclV95pu3TwfWWVETLfZ3CqFfEWZSc4hYy9wDM4YjWiU7JAC1b1W 8rdsGa4exYHHS+fEEVu00xilXTC6EJV2neRPiyVWSzwvFZpZ8bl8s+qgfPLMNL/OeDro7V MWMH0cTy7ntT38TP5hM5l55Hl3IUCWnhMzLSZu9N/kcZipl4sDT22pTUvw+0/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869075; 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=05Z2P/Mc/IC4b7K2t1C8LHWpfOR9F1QJ69kL/9CYWT4=; b=a7bmo8Rk2GBJtIxRTAs6sunSPP9LOBq/4FjZW9lZCmjh/RsxF49/CGkb2ATxZV6H6/pzh2 O16twOiNhNSAchW/9s2TkR1gaGczPaA+EKp/QNTJx6vIAdK72SsZ4sE65UjcFLNDEwO0cV kw0TBg5wIU+JvgmA3RAHo2SgzELQgv1TUaJnxrd5QndXr7ElbAQOvWVszLXYVfz8WORntD tA0H4dj000Zpxyxmc79QYGvgzJhOx7pGammd6aLKU6YJGZQBQ/xlH1capCU2lwO1ER7M3q FTU6oiNZ5Jx0bsZ7x5RXSZJqsuWfE6dHkjVxY8Bnvuu9iRchWLAot/6ah9YPCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738869075; a=rsa-sha256; cv=none; b=Yku7yR+ytghPSjC+otALFbo2ehEvH1js23j16zqon4sLIJJGlJQfBAMZ3mfRRJqeBElxG0 svo9Nhz5RdnOeOZrH+BQIrXhAa1x0iJM1jknf8MKpALB88CxsCEeIvC2ZGWnl4gOyTDZRK RQ1e/Gs/BpPdKLwY7Z2dmhw4FZ4D2/1WGYmEvpY2PjoE+LM5MAv5SlU98L+M4xOw5V82Pi S55IIAYS6nd60S+3atvyaqnnV5NuLcwEEQjikXsNb2DdwFuWc5O46u3eBLcLINKdziKndW MNcdKpiW72icJqczD3NB+zkzOq1J+T2Kd6X5EV6mf2HWmbRHBFFedr0Eg2yF0A== 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 4Ypmsv2CFmzrJJ; Thu, 06 Feb 2025 19:11:15 +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 516JBF8d007864; Thu, 6 Feb 2025 19:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516JBF9U007861; Thu, 6 Feb 2025 19:11:15 GMT (envelope-from git) Date: Thu, 6 Feb 2025 19:11:15 GMT Message-Id: <202502061911.516JBF9U007861@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: 700880a13566 - stable/14 - ifnet: Make if_detach_internal() and if_vmove() void List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 700880a13566193b853f75c87ba5c37d395f6a1e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=700880a13566193b853f75c87ba5c37d395f6a1e commit 700880a13566193b853f75c87ba5c37d395f6a1e Author: Zhenlei Huang AuthorDate: 2025-02-04 15:04:59 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 18:35:54 +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) --- sys/net/if.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index edc7d8376bbf..ad8dd9703c56 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -287,12 +287,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 @@ -1117,7 +1117,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; @@ -1248,7 +1248,7 @@ finish_vnet_shutdown: ifp->if_afdata_initialized = 0; IF_AFDATA_UNLOCK(ifp); if (i == 0) - return (0); + return; SLIST_FOREACH(dp, &domains, dom_next) { if (dp->dom_ifdetach && ifp->if_afdata[dp->dom_family]) { (*dp->dom_ifdetach)(ifp, @@ -1256,8 +1256,6 @@ finish_vnet_shutdown: ifp->if_afdata[dp->dom_family] = NULL; } } - - return (0); } #ifdef VIMAGE @@ -1265,19 +1263,14 @@ finish_vnet_shutdown: * if_vmove() performs a limited version of if_detach() in current * vnet and if_attach()es the ifnet to the vnet specified as 2nd arg. */ -static int +static void if_vmove(struct ifnet *ifp, struct vnet *new_vnet) { - 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); /* * Perform interface-specific reassignment tasks, if provided by @@ -1292,7 +1285,6 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet) CURVNET_SET_QUIET(new_vnet); if_attach_internal(ifp, true); CURVNET_RESTORE(); - return (0); } /* @@ -1303,8 +1295,7 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) { struct prison *pr; struct ifnet *difp; - int error; - bool found __diagused; + bool found; bool shutdown; MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); @@ -1351,16 +1342,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 @@ -1369,7 +1359,7 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) struct prison *pr; struct vnet *vnet_dst; struct ifnet *ifp; - int error, found __diagused; + int found __diagused; bool shutdown; /* Try to find the prison within our visibility. */ @@ -1410,16 +1400,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 */