From nobody Fri Jan 27 19:28:12 2023 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 4P3SKS6fT9z3brWf; Fri, 27 Jan 2023 19:28:12 +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 4P3SKS5y6Kz45x3; Fri, 27 Jan 2023 19:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674847692; 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=n+mwOfQmDW5Clnpfoi5spFnRaSbVTRRFAet3CiYFYA0=; b=F8zlzn7bS4uRrlGneEApLvhrOsqrxERL0w0SjBN5UnVoR0qVCe+39EJ3Ck45Xqg3j5j1Hw MkKyIxI0eApAsAgklnqAQPV4XHSOl/N3yvTyX029So8K9mLNqewFiJkYxuPH74m0kJFWzf JO3HO1O7qc3QFTkRIDFAOXlWWhj4skJwWb86IrQ5MNFh/EDFAnx4og6mQv3BAgeOIXrsRo SRjnfNwTgM+DQBmSPXstl1SwC+FDnVTqRIePBH4CNALqwrAKzIMXM4em3AJlu082m7M8qM wLuUBWUANsPQXai3Jguv4IRhFjzTkCUkC8Hbmq1Zo53R88SFRZVYA8beu+A6Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674847692; 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=n+mwOfQmDW5Clnpfoi5spFnRaSbVTRRFAet3CiYFYA0=; b=rJoK3E7MoVMYu9u3K5AXItED37znM4LRPAVjzuMEQMCAiNXHwYoswHeCIft+Q8TOpOXLXE mVJgZtPQKgnfNiNBRMV5yXGL4oPvP6y3TpfMhIrQaG8UHFVeb4g/JdqIx33aSPCRqgc1qv yYtcoYrAAZilfzrkkGxg0gvyzX+FtYMANKTLWTxzJK/iipH3jagHQZqqZLufUaxctBu2O2 LcWyBWE9dIDwEODAtWfmj7QjLlNXGv/+KzPJFUmY/ie7iNHkuTPJ9BLcRrk39mdUeXBy0n dWqS+3Id8Dw9l+rbnaO96SqLyF7QLBQ59yAV04lRDxWJ/Wu2IrV8SmnT/ez2oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674847692; a=rsa-sha256; cv=none; b=UqYnRD/ptRQwLxAVQND3BLwEnYEMrL0bHzbf8NaDPKVNA+FaGe31wryjiEETbtiMwnurqI dqARqG+bag1gOjLz7Re2XyHGJEBxgqG6lh7VudgpQJrUXO+0XT9jTeXo6x1pCv65rIYK90 P3YMg9dZc/843z1GP6kCdf4KJWpEshjIRQN59d40WarvTRil9sjUKhKs1tJ6FqlzBcdV9x oL/duWklDVyCnhBnR2ORKzKoxwP9tR/JQJIp5fEf6ky1y6/ft/UgWDwBtoeTk1QtJZwEjU sYArI1RIPsWnvU7ed2TkEHXMCjfMqPbXpiOiV/4xarh/VUaVS/KhYifI5DYvFg== 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 4P3SKS53b8zLd4; Fri, 27 Jan 2023 19:28:12 +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 30RJSCx0029236; Fri, 27 Jan 2023 19:28:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RJSCGL029235; Fri, 27 Jan 2023 19:28:12 GMT (envelope-from git) Date: Fri, 27 Jan 2023 19:28:12 GMT Message-Id: <202301271928.30RJSCGL029235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 8b7b81fd64ec - stable/13 - Switch wg(4) to the new if_clone KPI 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b7b81fd64ec054e6cbe0f1a817bad44aa355669 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=8b7b81fd64ec054e6cbe0f1a817bad44aa355669 commit 8b7b81fd64ec054e6cbe0f1a817bad44aa355669 Author: Alan Somers AuthorDate: 2022-12-18 20:12:02 +0000 Commit: Alan Somers CommitDate: 2023-01-27 19:27:47 +0000 Switch wg(4) to the new if_clone KPI Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D37740 (cherry picked from commit eb3f9a7aece9473d678adddcf6aefe6c1eec0ac4) --- sys/dev/wg/if_wg.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 94395c86f370..9c4ebe5dd393 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -361,13 +361,15 @@ static struct wg_packet *wg_queue_dequeue_serial(struct wg_queue *); static struct wg_packet *wg_queue_dequeue_parallel(struct wg_queue *); static void wg_input(struct mbuf *, int, struct inpcb *, const struct sockaddr *, void *); static void wg_peer_send_staged(struct wg_peer *); -static int wg_clone_create(struct if_clone *, int, caddr_t); +static int wg_clone_create(struct if_clone *ifc, char *name, size_t len, + struct ifc_data *ifd, struct ifnet **ifpp); static void wg_qflush(struct ifnet *); static inline int determine_af_and_pullup(struct mbuf **m, sa_family_t *af); static int wg_xmit(struct ifnet *, struct mbuf *, sa_family_t, uint32_t); static int wg_transmit(struct ifnet *, struct mbuf *); static int wg_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); -static void wg_clone_destroy(struct ifnet *); +static int wg_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, + uint32_t flags); static bool wgc_privileged(struct wg_softc *); static int wgc_get(struct wg_softc *, struct wg_data_io *); static int wgc_set(struct wg_softc *, struct wg_data_io *); @@ -2717,7 +2719,8 @@ wg_down(struct wg_softc *sc) } static int -wg_clone_create(struct if_clone *ifc, int unit, caddr_t params) +wg_clone_create(struct if_clone *ifc, char *name, size_t len, + struct ifc_data *ifd, struct ifnet **ifpp) { struct wg_softc *sc; struct ifnet *ifp; @@ -2771,7 +2774,7 @@ wg_clone_create(struct if_clone *ifc, int unit, caddr_t params) ifp->if_softc = sc; ifp->if_capabilities = ifp->if_capenable = WG_CAPS; - if_initname(ifp, wgname, unit); + if_initname(ifp, wgname, ifd->unit); if_setmtu(ifp, DEFAULT_MTU); ifp->if_flags = IFF_NOARP | IFF_MULTICAST; @@ -2790,6 +2793,7 @@ wg_clone_create(struct if_clone *ifc, int unit, caddr_t params) sx_xlock(&wg_sx); LIST_INSERT_HEAD(&wg_list, sc, sc_entry); sx_xunlock(&wg_sx); + *ifpp = ifp; return (0); free_aip4: RADIX_NODE_HEAD_DESTROY(sc->sc_aip4); @@ -2811,8 +2815,8 @@ wg_clone_deferred_free(struct noise_local *l) atomic_add_int(&clone_count, -1); } -static void -wg_clone_destroy(struct ifnet *ifp) +static int +wg_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) { struct wg_softc *sc = ifp->if_softc; struct ucred *cred; @@ -2872,6 +2876,8 @@ wg_clone_destroy(struct ifnet *ifp) if_free(sc->sc_ifp); noise_local_free(sc->sc_local, wg_clone_deferred_free); + + return (0); } static void @@ -2914,8 +2920,12 @@ wg_init(void *xsc) static void vnet_wg_init(const void *unused __unused) { - V_wg_cloner = if_clone_simple(wgname, wg_clone_create, wg_clone_destroy, - 0); + struct if_clone_addreq req = { + .create_f = wg_clone_create, + .destroy_f = wg_clone_destroy, + .flags = IFC_F_AUTOUNIT, + }; + V_wg_cloner = ifc_attach_cloner(wgname, &req); } VNET_SYSINIT(vnet_wg_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_wg_init, NULL); @@ -2924,7 +2934,7 @@ static void vnet_wg_uninit(const void *unused __unused) { if (V_wg_cloner) - if_clone_detach(V_wg_cloner); + ifc_detach_cloner(V_wg_cloner); } VNET_SYSUNINIT(vnet_wg_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_wg_uninit, NULL); @@ -3018,7 +3028,7 @@ wg_module_deinit(void) VNET_FOREACH(vnet_iter) { struct if_clone *clone = VNET_VNET(vnet_iter, wg_cloner); if (clone) { - if_clone_detach(clone); + ifc_detach_cloner(clone); VNET_VNET(vnet_iter, wg_cloner) = NULL; } }