From nobody Thu May 07 05:02:53 2026 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 4gB0W156Wxz6dTFm for ; Thu, 07 May 2026 05:02:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W12pXjz3w43 for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130173; 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=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=uZ/ZZauScS2hMURKoNTooEmiSOfKupqCklc7WPVna73ufNNUptMGEZ2ejJgrBSIUGk5x1Y XUx8NbNOHZTx1wBIsnnsRzZtrGYWDOhmcOn9Fm+afVm8xSnhkP50hDkQnNM9wvm6lpuQ2d qMpTx2LVRfV1Sh/0OjWtnI5KzbNX0Loh1L/8UMYua1ZjVYxbT9OKZPP1o4Bd90e9KcNIiQ W8/bWdCs3tpI5KszlJAqRGybKvQKyBFRqQLwFEb4kopREaO9neWVhsTro2+u3z6DGO6tMH CDMjNKVHL2lnjvAbkKo2t3qCFbeWK3fuUAYo9XWjjWZHzFQTylQ/+mIOJ/NXUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130173; a=rsa-sha256; cv=none; b=b+wx44sxW6pe1GO7Ekh37uOCMZKru047kn+ulkSgy41ZTju7+9DhKR1XL3pP0JITeZndfK VWt5lo61ICiXBPW8rvc3nCeaowhrKQPYNe37JNAqvIF14ING4hq0A0S4ettsQguEioRuLh h3j/xsmwrVr8JK8n9dIatBQq9S75qTh6/zWmBH4q2MW97Jp8ZE9ld2+HBcr2FI5VGLOS+Z HDnYeoS2Rw10l5EvJ0cdokfeDi0Kc8otW1dM85YfV/LMtr6Q5XIii6ztg+ZvKKXTvPE6AY AaQMAzmXHd+p92lVlm5NO6IKPwfDVwe4UZFtRxHvJ0NJF6ywXa3DgC1l8KQJTQ== 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=1778130173; 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=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=WR8pmL9bIMhrCV1Sfc7sU/wQBUVNCr1WcdZsZKk/blncf2qAeRXFmt69bN5TvBSjhZREOs gcWcvwEJoWIu/RVHI9iVthwEviyPGpDUENLr+tJ5ry83FLGgQ+tkLZuovHiOpxA7dM0Cpc cTlXkyUbbx2mT1gh91WB/ZyBNJSrkjO6E0zdZZPp2sO6Jb9RNfaiKCdbGuESGDWo+ZM16W 70B39FL/JOpW3pfZEiqZQ/Xu4e0o3Idk5JUuQCBBtLEmi5h+AyzAzLmKF5tJQLMPCP/pkO dbvyanku2DlHfCC5+4j0HHGPbEjLBdWt2kcmJCDmi7XR1/NtSirTlF5RYn2uhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W12KTkz19gn for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 3fe5069ce2bf - main - virtio_p9fs: Fix kernel panic on module unload 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:53 +0000 Message-Id: <69fc1cfd.370e5.2296ef7f@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3fe5069ce2bf5b2702f3be6531ce6a05c584e64d commit 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Author: Alex Richardson AuthorDate: 2026-05-07 04:21:23 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:03 +0000 virtio_p9fs: Fix kernel panic on module unload The virtio_p9fs module event handler can be invoked multiple times. Previously, this caused p9_init_zones() and p9_register_trans() to be executed multiple times, leaking UMA zones and corrupting the transport list. During module unload, p9_destroy_zones() was also called multiple times on the same zone pointers, triggering a duplicate free kernel panic in uma_zdestroy(). This patch introduces a static reference counter in vt9p_modevent() to ensure the zones and transports are only initialized and destroyed exactly once, aligning with the approach used by other virtio drivers like vtnet. Reviewed by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56497 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 2b276a60aa9a..f76b135c042d 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -464,16 +464,22 @@ static int vt9p_modevent(module_t mod, int type, void *unused) { int error; + static int loaded = 0; error = 0; switch (type) { case MOD_LOAD: - p9_init_zones(); - p9_register_trans(&vt9p_trans); + if (loaded++ == 0) { + p9_init_zones(); + p9_register_trans(&vt9p_trans); + } break; case MOD_UNLOAD: - p9_destroy_zones(); + if (--loaded == 0) { + p9_unregister_trans(&vt9p_trans); + p9_destroy_zones(); + } break; case MOD_SHUTDOWN: break;