From nobody Fri Nov 24 18:11:48 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 4ScNNN4mVDz520dj; Fri, 24 Nov 2023 18:11:48 +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 4ScNNN4KMpz4bxn; Fri, 24 Nov 2023 18:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700849508; 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=k7NbS2yuIJ+pQm/2Uxi+BgLcsDbISgkmm8cfAM5Ouyk=; b=kYzNkS17bGcIqr772oxS9cztnv7jGADD91Vu2OHXjvxaaODB8McubbDSDuljZosIVxRZTG 75rf6VwvsSu5MGB3yWjZhrGLSAKemwUzi0O1Fzm+bX1GdZJTSumfanH1FrILkFqYzDshIy oe8cSRwaFR6akvN0wTReKW3eXRdlt6EInQmfuIgQcJLpCx35RTDFqPWVQ7APCqaUePL88R 2FIbbCoSdejylLP4LontNblFr7pIP/Y394YyBqZ0gISlH08uCJ7K8EFJU5YWYzvgLnurMC ZOqBAqrNS3IbCkpfWdB+vI4pn6jXSuEn/saAm1qYXzTak0hG2zL5655U+wSEsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700849508; 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=k7NbS2yuIJ+pQm/2Uxi+BgLcsDbISgkmm8cfAM5Ouyk=; b=pb2EDdWkHi4eQ+sToGjhzSLUAI6gdnEa7qh1UoJjTEeM60fLljJKvnnteoaVss0YDskiQX e9S4CXeRJWLAXtLOhTpN7es1QTbn8PIQsS4TV/M8mYVLv0e/Ldkw0cQbmEYrspNCdnGooP pw2Kmw2r/Me/j4mIVfMlrJ5YNcCuJfDjb4WHr9wACuD5GnSgAzQf83voiGOBJMEfQdvrF3 ef159MS/oBpE8znhofqCco8tbVF4YDNmnowmkDAtwNqYt2hgd4qSLYWF3xxl7UIT4BpEA2 4aSW1ZfaZPf38c2X9PWdE//olL360FcXMDaOI2PkCRfgOSqBSLI3ehUejYLT2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700849508; a=rsa-sha256; cv=none; b=LOHnDq6TQzyILBSu8+nqGJFaCHCasg2Ne3HZ7H/02G6V1uNX0Sm3Mu1W4Skw+zs4xHRIO9 umiba9uLoa6+kqPRzIuC0wuJ5K6s1ovU0Jf2gtmQdFhiEHmEtH/feS4KZsecxW6m50aAEB p9DqyFq1+Z5BOgulhQPX+FbfB3gnJcndW+uW30iSrr+pL4efnpCWNkz0Gg777M8vISk28A Mp97/5vjirJ5Rw4i8Ba/f1M8zaYe0qLPi3EnWoYTe8QDzuP49sakXNFKCb6B1VwBdGSswi /oUO0XERnFkGD40FZKp9acKz13mVsQhxtAKVCFEoEiLzAYjURzHvu8sxnw5zTQ== 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 4ScNNN3Q1Bzw2C; Fri, 24 Nov 2023 18:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AOIBmoo034561; Fri, 24 Nov 2023 18:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOIBmOe034558; Fri, 24 Nov 2023 18:11:48 GMT (envelope-from git) Date: Fri, 24 Nov 2023 18:11:48 GMT Message-Id: <202311241811.3AOIBmOe034558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 3569e21f0714 - stable/14 - khelp: suppress useless warning message on shutdown 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3569e21f07147c8dd4bee82e5e7efe69c98edeb1 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=3569e21f07147c8dd4bee82e5e7efe69c98edeb1 commit 3569e21f07147c8dd4bee82e5e7efe69c98edeb1 Author: Mike Karels AuthorDate: 2023-11-17 18:51:18 +0000 Commit: Mike Karels CommitDate: 2023-11-24 18:11:16 +0000 khelp: suppress useless warning message on shutdown If a module (e.g. the ertt hhook for TCP) can't clean up at shutdown, there is nothing to be done about it. In the ertt case, cleanup is just shutting down a UMA zone, which doesn't need to be done. Suppress EBUSY warnings on shutdown. PR: 271677 Reviewed by: tuexen, imp Differential Revision: https://reviews.freebsd.org/D42650 (cherry picked from commit 415c1c748d5492e41328fedf96b6bf3c9be94595) --- sys/kern/kern_khelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c index 3d75da141b48..f8a6f3e749da 100644 --- a/sys/kern/kern_khelp.c +++ b/sys/kern/kern_khelp.c @@ -357,7 +357,7 @@ khelp_modevent(module_t mod, int event_type, void *data) } else if (error == ENOENT) /* Do nothing and allow unload if helper not in list. */ error = 0; - else if (error == EBUSY) + else if (error == EBUSY && event_type != MOD_SHUTDOWN) printf("Khelp module \"%s\" can't unload until its " "refcount drops from %d to 0.\n", kmd->name, kmd->helper->h_refcount);