From nobody Wed Feb 5 18:09:21 2025 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 4Yp7Xx6HN8z5n77M; Wed, 05 Feb 2025 18:09:21 +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 4Yp7Xx3yLkz3N7b; Wed, 05 Feb 2025 18:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778961; 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=4IAflQadJrUVKQnLggqD+xemxFOnsgvTO3LqbQnJgYk=; b=XIHFIf9QLe6KdLTCwrmQWBzOyi+NXSVIvxCaoRgqEtLDCrQ7KOSLVcz1gijuRuajDSWXO+ KJ5CLBGYeQsbXLejEufjQRrh+K1fRCq9662g5q3IY7TaryikMPrpl2JZY9BPjKKoZc6MaG nVYUD94OFaY9fkqA26YljTQ4TLsRx8QSq/0DSFEYc57euMFg03kPAG8IC77dibvqlLPPp+ +39ja+/TY/NWh5HreThZn+GlJ2YXhtOnFAxWEeVGZqi5ZrWMfMU16NuLKTjFhMg+KT+KZp 9/T+K4ArKPWzESbBUJ75RiEDhja96PEUz/7RxV1OqJv8hFHLqcej2mDxsP1JCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738778961; 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=4IAflQadJrUVKQnLggqD+xemxFOnsgvTO3LqbQnJgYk=; b=I3bCd/EuxA/jDX4+wlDkk4+Jup/nw6+RnNR4G4mj/4gn2k3/7FIAWg+DDuo20VmUPRBsbS dXli7y7pJ9S5fonYUbOPJjyE50xKy5Q+35VPvxLHFFgKp+GIT2+TttRExf4YkDohlN9X2D uYTfUJQVfRzEuHcvz01LYavnGi6gGZ9u4hdtJyKZqiEBIPfWTzrItHGxeEwMcFaIyxbYkk 3k7zRERnKu6iTco6uZNI6SUKpfz641WbdXOQA6VT/E0DD3iUgUK73t8gbH82S0agvhHBFh y6q2JshhakJp7z6Eg1+UAo1z4b+Xwv61P7Lk+zGZtAbjzvmqkXBIpx9bo0F/xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738778961; a=rsa-sha256; cv=none; b=iH2qcFCepMMde/C/v3NW1kCgljrkrVQc4whVAOhsXNTj4IT5Ywy8Z0c/xTa9yPzBsI1Nt3 oaGXrboMFDA7iw55uB204qMNTV8tBLN/kXO6FJgc4aMS28I3RDgA6U/+8dm/T8LdRyFe7j WCB0EWEt8BybIbX88ecXV7ZIhkxVS3iISN0OV3BDsF11VTPzN6mIQc6KGx6VXuDOj1z/5z 4Y0I5/5eEZackKuyBHwzEcywOYIVE9Wa2Ggqh98Vsw0QCLsXzktPEhKIlFQC/TUs4oCa8F 0zuRQ6tqTIFD7UiIqKn09LVpp134AiiGj/nbQaEq1dRD2m8NzVQi3MpH0iIbog== 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 4Yp7Xx3Yblz134S; Wed, 05 Feb 2025 18:09:21 +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 515I9LGx082567; Wed, 5 Feb 2025 18:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515I9LoL082564; Wed, 5 Feb 2025 18:09:21 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:09:21 GMT Message-Id: <202502051809.515I9LoL082564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 06cf36516512 - main - netlink: provide genl_unregister_group() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06cf36516512015867ceb56bde7913b1dc51ef3c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=06cf36516512015867ceb56bde7913b1dc51ef3c commit 06cf36516512015867ceb56bde7913b1dc51ef3c Author: Gleb Smirnoff AuthorDate: 2025-02-05 18:09:06 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-05 18:09:06 +0000 netlink: provide genl_unregister_group() Cause generic netlink group IDs are dynamic, we go through all sockets and unsubscribe from the group that goes away. Otherwise they could be surprisingly find themselves subscribed to a group created later. --- sys/netlink/netlink_ctl.h | 1 + sys/netlink/netlink_domain.c | 12 ++++++++++++ sys/netlink/netlink_generic.c | 26 ++++++++++++++++++++++++++ sys/netlink/netlink_var.h | 1 + 4 files changed, 40 insertions(+) diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h index e7566552ea32..7f43e0f2c25e 100644 --- a/sys/netlink/netlink_ctl.h +++ b/sys/netlink/netlink_ctl.h @@ -97,6 +97,7 @@ void genl_unregister_family(uint16_t family); bool genl_register_cmds(uint16_t family, const struct genl_cmd *cmds, u_int count); uint32_t genl_register_group(uint16_t family, const char *group_name); +void genl_unregister_group(uint16_t family, uint32_t group); typedef void (*genl_family_event_handler_t)(void *arg, const char *family_name, uint16_t family_id, u_int action); diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index e06c0bf1919e..7fabb222665e 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -250,6 +250,18 @@ nl_send_group(struct nl_writer *nw) return (true); } +void +nl_clear_group(u_int group) +{ + struct nlpcb *nlp; + + NLCTL_WLOCK(); + CK_LIST_FOREACH(nlp, &V_nl_ctl.ctl_pcb_head, nl_next) + if (nlp_memberof_group(nlp, group)) + nlp_leave_group(nlp, group); + NLCTL_WUNLOCK(); +} + static uint32_t nl_find_port(void) { diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 0714f22382cb..00f47e60f013 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -497,3 +497,29 @@ genl_register_group(uint16_t family_id, const char *group_name) return (group_id); } + +void +genl_unregister_group(uint16_t family_id, uint32_t group_id) +{ + struct genl_family *gf; + struct genl_group *gg; + + MPASS(group_id > MIN_GROUP_NUM && + group_id < MIN_GROUP_NUM + MAX_GROUPS); + + nl_clear_group(group_id); + + group_id -= MIN_GROUP_NUM; + + GENL_LOCK(); + gf = genl_family(family_id); + gg = &groups[group_id]; + + MPASS(gg->group_family == gf); + MPASS(gf->family_num_groups > 0); + + gf->family_num_groups--; + gg->group_family = NULL; + gg->group_name = NULL; + GENL_UNLOCK(); +} diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index a59cb2efecd0..23e7395d44c2 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -121,6 +121,7 @@ extern struct nl_proto_handler *nl_handlers; /* netlink_domain.c */ bool nl_send_group(struct nl_writer *); +void nl_clear_group(u_int); void nl_osd_register(void); void nl_osd_unregister(void); void nl_set_thread_nlp(struct thread *td, struct nlpcb *nlp);