From nobody Wed Dec 10 20:24:00 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 4dRRy92mXRz6JbYB; Wed, 10 Dec 2025 20:24:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRRy92Bwzz47CY; Wed, 10 Dec 2025 20:24:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765398241; 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: in-reply-to:in-reply-to:references:references; bh=xnzFFPmPy0m+cY6Q5uTw9LPUYg6dGByV4BU7VXBfI5Y=; b=TYOD3PK3djdqSxc4FuAklqM+qntJMacSTfwJxJgVTiudZ4oM9XRmFlJ3Js0FFCnhvXWMIb LQ9PUA5d8BexECvC6u5HyigrH7amFj+E1H3i335R7dNKJSjKFoGrxOrFSutz/a4nfv6axq hOvRireclaqFDBlToMDs5VmPPgAwr/0pcPmm+P5MsfaSx/4uuPMHxQqQPS6JNyH9jFDjZc hhgzD1GCyO9os6KirDnuqYjIIxMCJo05SgRukLQGyT+Y54CF3s4WBzeglzWCyMoFzVI0D/ NWem9HQXSWDvaNxLRsA14wex6pUiyeBl7jeQNFvWRxepSwFOtGwfCOOa2OmCCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765398241; 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: in-reply-to:in-reply-to:references:references; bh=xnzFFPmPy0m+cY6Q5uTw9LPUYg6dGByV4BU7VXBfI5Y=; b=tbY8WKUg9S8m9x2RgcKjPlGuXQZ9rsT/ApthoS6YkUa3t2JEenNs+YlHGjCsskF53r7O70 sJb/NWyBMMR1+8a+AzDe903mTrmU4yRgFJHHDz8FOaixthnMYXBi4xGeackUB969eWyyIX 6hQZSaNMV2CyqkDjsrzp8CwMvQDAdzy45b5XIuP3Tou4CBB1sabqPG0rlxRyTthA5Fic2d KlBmQ5MdIbPq7I2cDQLnhQb3acdBajzkhK/6wPTiP0kdH00dZtzpvrVQ4ecvylTaTWwqMw LzGvZrHzZAwRF9Y/dyH2EFs//beRdSA9Hot6x8n9bzWILGM/Tp7Z7d8MX42x9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765398241; a=rsa-sha256; cv=none; b=n1fB5Tb+Fe44fZ+/Ryg3RM5QiazmYM9aSPlZB/tQsJ50B4ZsQjmRg5ZYEyOdFpJGi5tHkn ze8MbQXGVqXvsFpZW04JzWQXQMgWb4/tmXJEQZDPx7z0diMmdnmo+NNJB78W5Dovt2aS33 XaDFl5FvT/2HrBAAwuYyut+H/d+4/djJjIC9hi4GIoWSmIgG7OTlqbqL7TMQpPiicgcMPp iUVRGse9ivfvPCrtsBKV3NAoktXILw5ME8QI2KsItWO/31s3K7BntOVqNazRGApZ6wKhcK 4kss38ES7sxjpFKr83fVcI+Furo/PQE1S0jNl5h9nZs7pShhZBKctfwwrcNh2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:f5e4:7fac:8cd1:45da] (unknown [IPv6:2601:5c0:4202:5670:f5e4:7fac:8cd1:45da]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dRRy90C54z1KC5; Wed, 10 Dec 2025 20:24:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <2fb326df-cbe6-4551-b2f0-03ae846ce0bd@FreeBSD.org> Date: Wed, 10 Dec 2025 15:24:00 -0500 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 89eddfb4b9f5 - main - linux: fix panic on kldunload Content-Language: en-US To: Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6939c865.26fbe.36b38dfe@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <6939c865.26fbe.36b38dfe@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/10/25 14:22, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=89eddfb4b9f5d744623ce0ee8ea966b0d33456e5 > > commit 89eddfb4b9f5d744623ce0ee8ea966b0d33456e5 > Author: Gleb Smirnoff > AuthorDate: 2025-12-10 19:20:14 +0000 > Commit: Gleb Smirnoff > CommitDate: 2025-12-10 19:20:14 +0000 > > linux: fix panic on kldunload > > The vnet_deregister_sysuninit() that is called by linker unload sequence also > calls every registered destructor before unregistering it. IMHO, this is > not correct in principle, but for now plug the regression right in the code > that introduced the panic. > > Fixes: 607f11055d2d421770963162a4d9a99cdd136152 > --- > sys/compat/linux/linux_if.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/sys/compat/linux/linux_if.c b/sys/compat/linux/linux_if.c > index 1281207c1c84..b342b07a6722 100644 > --- a/sys/compat/linux/linux_if.c > +++ b/sys/compat/linux/linux_if.c > @@ -105,6 +105,13 @@ VNET_SYSINIT(linux_ifnet_vnet_init, SI_SUB_PROTO_IF, SI_ORDER_ANY, > static void > linux_ifnet_vnet_uninit(void *arg __unused) > { > + /* > + * At a normal vnet shutdown all interfaces are gone at this point. > + * But when we kldunload linux.ko, the vnet_deregister_sysuninit() > + * would call this function for the default vnet. > + */ > + if (IS_DEFAULT_VNET(curvnet)) > + clear_unrhdr(V_linux_eth_unr); > delete_unrhdr(V_linux_eth_unr); > } > VNET_SYSUNINIT(linux_ifnet_vnet_uninit, SI_SUB_PROTO_IF, SI_ORDER_ANY, Don't you also want to make this SYSUNINIT enabled for the !VIMAGE case so you don't leak this on unload for the !VIMAGE case? -- John Baldwin