From nobody Mon Jan 23 11:36:45 2023 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 4P0p3K3tRwz3bLTq; Mon, 23 Jan 2023 11:36:45 +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 4P0p3K3Q8Xz4Km3; Mon, 23 Jan 2023 11:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674473805; 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=iRBsSTAMku+0rZ60AoiIlw/6kQksOOBk1ruxQiJ3FRs=; b=Jzr2/n72DhHJTxXAmhjYoAsPaBO6cm+sG9aQd13m+F02LQfBmfb565wfD5b4VAZxglPjMX n8o29MmHh7adl8kAnbGJ7Zr7Eu/xnGThIftork3fPksciUqfMrsP+2zPa4/UmP6TsBYuEh w4rV5MAiXZ2+1fU6yFBGrpDqFXbp33iK9+DgSiV3f5/a6YLOfkAoZ4VATC4D+ZYyGneiAg doUiVa9yruRymzwWX1VhGjzJe6Ru4UvWKBYVfRbUJZlCoy0RaP6qoaxa3HaTr6nGPUaO52 e803Y+/9lah/h9c5DnKiS0N6PoByiexCm1LS5OrZPAzu7fTiG7ftAl3rlaimLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674473805; 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=iRBsSTAMku+0rZ60AoiIlw/6kQksOOBk1ruxQiJ3FRs=; b=u5GmCHi1qm1FKWKkJICvGrENy0nDOM7p35hizl5l3IPAgrNh9HKJwez5ka+IlF9bub4qAU m0HT43FmxI7Cny/SwWOmtQ6hCBN37KkX+rYo2cXqjVcrbw0UvKp58GsA3bgniIdmyxgZmg x/XrakLRaWZxAEh+0b1TfhSqXt8C2UeYhudkcyEgImkO6p5WUbX6BN0P+c1O3/by94F1S1 h+MdkiUL+EUtCbBtZTRZBzKXm/bgz8UHKNEaBzDPJEsTOirXlIbANn2CjKBaVGUjnVnevs OW2koeNScIIVGtnAa/SjFbakSRY3H69yfFNbzpf6XONZsfi+Vl6Djle6YKt+hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674473805; a=rsa-sha256; cv=none; b=FNeq+KQ0nu6hNzxpxSEAWN9EjGhhF8B8EFxBBybvW5jvgDPT43kV8aJDIFcP0Xnq8nvrEG 6MU/FtDfEydQYmCL/t5QWUolmDUdO/cwxTPNo6pFBTNcxWAmhXaVlxgwlnzeJOoQHMQF+p m84MKa8nXBosw6IFKLjf7e82jr4c/hEO9g3uHT8G3eo4SA3rtsGaHNgSVLdmdvMvSXBcGt 0CAZsHmry4RKK7h/mwbXpNI0mhfmWrdqnit0QBM2ZQOijqdv/4qldveB0zX6ruJm4rrl4/ QQVq2pbJc6qwFguyi9NHUJK/yw44zzxK0NX4+A+JWzNuZt/9nq7dHlsdJ/1sJA== 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 4P0p3K2SpszS9H; Mon, 23 Jan 2023 11:36:45 +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 30NBaj5X098513; Mon, 23 Jan 2023 11:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NBaj6d098512; Mon, 23 Jan 2023 11:36:45 GMT (envelope-from git) Date: Mon, 23 Jan 2023 11:36:45 GMT Message-Id: <202301231136.30NBaj6d098512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 13a18f25560d - stable/13 - domains: allow pre-defined domains to be unloaded 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13a18f25560d98a48ab65f86b2b4653cb3c0a484 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=13a18f25560d98a48ab65f86b2b4653cb3c0a484 commit 13a18f25560d98a48ab65f86b2b4653cb3c0a484 Author: Alexander V. Chernikov AuthorDate: 2022-08-12 13:36:53 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 11:35:54 +0000 domains: allow pre-defined domains to be unloaded Add domain_remove() SYSUNINT callback that removes the domain from the domain list. This change is required to support Netlink. This version is different from HEAD: it uses fixed family check, instead of the DOMF_UNLOADABLE flag. The dom_flag field appeared in HEAD and was not merged back, as there are no spare fields in 'struct domain'. Original commit message: Add domain_remove() SYSUNINT callback that removes the domain from the domain list if it has DOMF_UNLOADABLE flag set. This change is required to support netlink ( D36002 ). Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D36173 (cherry picked from commit 9b967bd65de6647aed68a141dc34f9b223a2593c) --- sys/kern/uipc_domain.c | 23 +++++++++++++++++++++++ sys/sys/domain.h | 3 +++ 2 files changed, 26 insertions(+) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 08ad42224848..a0293b9a2745 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -268,6 +268,29 @@ domain_add(void *data) mtx_unlock(&dom_mtx); } +void +domain_remove(void *data) +{ + struct domain *dp = (struct domain *)data; + + if (dp->dom_family != PF_NETLINK) + return; + + mtx_lock(&dom_mtx); + if (domains == dp) { + domains = dp->dom_next; + } else { + struct domain *curr; + for (curr = domains; curr != NULL; curr = curr->dom_next) { + if (curr->dom_next == dp) { + curr->dom_next = dp->dom_next; + break; + } + } + } + mtx_unlock(&dom_mtx); +} + /* ARGSUSED*/ static void domaininit(void *dummy) diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 3d17879f1ccd..8e4ff20b3cf9 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -74,6 +74,7 @@ struct domain { extern int domain_init_status; extern struct domain *domains; void domain_add(void *); +void domain_remove(void *); void domain_init(void *); #ifdef VIMAGE void vnet_domain_init(void *); @@ -83,6 +84,8 @@ void vnet_domain_uninit(void *); #define DOMAIN_SET(name) \ SYSINIT(domain_add_ ## name, SI_SUB_PROTO_DOMAIN, \ SI_ORDER_FIRST, domain_add, & name ## domain); \ + SYSUNINIT(domain_remove_ ## name, SI_SUB_PROTO_DOMAIN, \ + SI_ORDER_FIRST, domain_remove, & name ## domain); \ SYSINIT(domain_init_ ## name, SI_SUB_PROTO_DOMAIN, \ SI_ORDER_SECOND, domain_init, & name ## domain); #ifdef VIMAGE