From nobody Fri Apr 18 00:30:33 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 4Zdwf21Wmkz5t3Dq; Fri, 18 Apr 2025 00:30:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zdwf213p3z3scY; Fri, 18 Apr 2025 00:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744936234; 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=3EUd5Q2twjX+H+XJ+NjsDMmMtlux/PiGaBRNk78D+mA=; b=RfrYKWoVpC02oqKtRnrX0yNZ/U5quap4rCvXQKucNd5kZWf2dwaCnThmHFwRhOAHVXjNxE z635zozD2RVXLXSrfaT1WsuKKKiJZjqAlt2Y36RbVBeIiu0EiVu226wT0DxF7inItCC8RN Kd7x36dg15zPDyA5t4eabdUqeqU8NJx+JAxlZNDZaGsoC+WtZcxDdsyvFmdXKffN4pggpi 3dNIHmIEvPG0+djnzO9WLBJet8y2nOxq+iRVH4lGF30wUeEWqwJNBRXNTNmmxnZ+iMKIq0 ZFlW+f8zSr2NrhTrcHEjPdVgmhBA6d5ksogu1XTnIme+7ahMgIQhRDyQOBgx7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744936234; a=rsa-sha256; cv=none; b=W6vZDJiFgMj4dEu+x/KXXPWhGN6S25lqUdT8BJDiFLiVCFNzPQEYRI7xKyGC1NLVTx9A34 S6/N8lSckYLY71H0mRcAZGBsiAs5f5WogTlODZdYlCn0XAZlk1X0jlF1KbbMbyavU3bzlU IMsGBRCJXX+4OybqP28bmasAmra27GoeMcg0zi+N6UW/ROCEqRTRY3cLUpb1vrp0qcdvjb VS9o/Kg65p1d3MAsQGt6Dj1wXAqpYpUyhjZNiFGLALtahmF1GG+gHmID5Lv32GLJDKlD/c IkUR8MRvrf+56zg7GGwTKHuWDBdgueHeIUVSexVLtuF6eBTJ1fiuvj3gKM6MDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744936234; 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=3EUd5Q2twjX+H+XJ+NjsDMmMtlux/PiGaBRNk78D+mA=; b=kuqYn1eZgspYsrRzG5U4ab8VAESiSrVGdTwrrYNMuhsV2YOdmr8l1hxesSRegP4Cv4Kgw0 4LhaUvfoU9YcUymA5c1fpAZF7ooSDxCR7X9MUUIlM98ZzS6UKDo/gPDpYLQULtNFVZGeIB Lgnr8rKbDxyh9lTScFUHKydNkSdkk2lXbQSS+8Gj3T4AUCvWTem8NLua6Sc1DyXb9lhVhN hd56Vx7GCppBLAR0fbzRdCXG1Z6o7gZjK5gTnUdxxd94a83reJQ53eTv0eInPl9P5Y8iIH 06OGKse0IDdGGkZ9yB2g7jUjmjGulZyWWk3PoLuwI03CCBHgDQiwU6D/j1ro7w== 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 4Zdwf2041wz19FQ; Fri, 18 Apr 2025 00:30:34 +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 53I0UXV9092015; Fri, 18 Apr 2025 00:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53I0UXR0092012; Fri, 18 Apr 2025 00:30:33 GMT (envelope-from git) Date: Fri, 18 Apr 2025 00:30:33 GMT Message-Id: <202504180030.53I0UXR0092012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 7121e9414f29 - main - wg: Improve wg_peer_alloc() to simplify the calling 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7121e9414f294d116caeadd07ebd969136d3a631 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7121e9414f294d116caeadd07ebd969136d3a631 commit 7121e9414f294d116caeadd07ebd969136d3a631 Author: Aaron LI AuthorDate: 2025-04-18 00:30:11 +0000 Commit: Kyle Evans CommitDate: 2025-04-18 00:30:11 +0000 wg: Improve wg_peer_alloc() to simplify the calling Move the necessary extra logics (i.e., noise_remote_enable() and TAILQ_INSERT_TAIL()) from wg_ioctl_set() to wg_peer_alloc(), and thus make it easier to be called. Actually, the updated version is more asymmetric to wg_peer_destroy() and thus less likely to be misused. Meanwhile, rename it to wg_peer_create() to look more consistent with wg_peer_destroy(). Reviewed by: aly_aaronly.me (diff), markj Obtained from: DragonflyBSD 902964ab24ba (with some changes) --- sys/dev/wg/if_wg.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 83e5d9e5ceb3..5a3b60e45b7a 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -315,7 +315,8 @@ static void wg_timers_run_persistent_keepalive(void *); static int wg_aip_add(struct wg_softc *, struct wg_peer *, sa_family_t, const void *, uint8_t); static struct wg_peer *wg_aip_lookup(struct wg_softc *, sa_family_t, void *); static void wg_aip_remove_all(struct wg_softc *, struct wg_peer *); -static struct wg_peer *wg_peer_alloc(struct wg_softc *, const uint8_t [WG_KEY_SIZE]); +static struct wg_peer *wg_peer_create(struct wg_softc *, + const uint8_t [WG_KEY_SIZE], int *); static void wg_peer_free_deferred(struct noise_remote *); static void wg_peer_destroy(struct wg_peer *); static void wg_peer_destroy_all(struct wg_softc *); @@ -378,18 +379,26 @@ static void wg_module_deinit(void); /* TODO Peer */ static struct wg_peer * -wg_peer_alloc(struct wg_softc *sc, const uint8_t pub_key[WG_KEY_SIZE]) +wg_peer_create(struct wg_softc *sc, const uint8_t pub_key[WG_KEY_SIZE], + int *errp) { struct wg_peer *peer; sx_assert(&sc->sc_lock, SX_XLOCKED); peer = malloc(sizeof(*peer), M_WG, M_WAITOK | M_ZERO); + peer->p_remote = noise_remote_alloc(sc->sc_local, peer, pub_key); - peer->p_tx_bytes = counter_u64_alloc(M_WAITOK); - peer->p_rx_bytes = counter_u64_alloc(M_WAITOK); + if ((*errp = noise_remote_enable(peer->p_remote)) != 0) { + noise_remote_free(peer->p_remote, NULL); + free(peer, M_WG); + return (NULL); + } + peer->p_id = peer_counter++; peer->p_sc = sc; + peer->p_tx_bytes = counter_u64_alloc(M_WAITOK); + peer->p_rx_bytes = counter_u64_alloc(M_WAITOK); cookie_maker_init(&peer->p_cookie, pub_key); @@ -420,6 +429,13 @@ wg_peer_alloc(struct wg_softc *sc, const uint8_t pub_key[WG_KEY_SIZE]) LIST_INIT(&peer->p_aips); peer->p_aips_num = 0; + TAILQ_INSERT_TAIL(&sc->sc_peers, peer, p_entry); + sc->sc_peers_num++; + + if (if_getlinkstate(sc->sc_ifp) == LINK_STATE_UP) + wg_timers_enable(peer); + + DPRINTF(sc, "Peer %" PRIu64 " created\n", peer->p_id); return (peer); } @@ -2376,7 +2392,7 @@ wg_peer_add(struct wg_softc *sc, const nvlist_t *nvl) size_t size; struct noise_remote *remote; struct wg_peer *peer = NULL; - bool need_insert = false; + bool need_cleanup = false; sx_assert(&sc->sc_lock, SX_XLOCKED); @@ -2408,8 +2424,10 @@ wg_peer_add(struct wg_softc *sc, const nvlist_t *nvl) wg_aip_remove_all(sc, peer); } if (peer == NULL) { - peer = wg_peer_alloc(sc, pub_key); - need_insert = true; + peer = wg_peer_create(sc, pub_key, &err); + if (peer == NULL) + goto out; + need_cleanup = true; } if (nvlist_exists_binary(nvl, "endpoint")) { endpoint = nvlist_get_binary(nvl, "endpoint", &size); @@ -2467,19 +2485,11 @@ wg_peer_add(struct wg_softc *sc, const nvlist_t *nvl) } } } - if (need_insert) { - if ((err = noise_remote_enable(peer->p_remote)) != 0) - goto out; - TAILQ_INSERT_TAIL(&sc->sc_peers, peer, p_entry); - sc->sc_peers_num++; - if (if_getlinkstate(sc->sc_ifp) == LINK_STATE_UP) - wg_timers_enable(peer); - } if (remote != NULL) noise_remote_put(remote); return (0); out: - if (need_insert) /* If we fail, only destroy if it was new. */ + if (need_cleanup) /* If we fail, only destroy if it was new. */ wg_peer_destroy(peer); if (remote != NULL) noise_remote_put(remote);