From nobody Fri Jan 31 16:03:27 2025 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 4Yl10031n4z5mQsr; Fri, 31 Jan 2025 16:03:28 +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 4Yl0zz6jJmz3hnj; Fri, 31 Jan 2025 16:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738339408; 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=OEJP5O3DHdwLjAbbEmYCngW6P2cYlrnN7bRs8OBS3Vk=; b=JSOwTliT5rLN+PqN0QiBK+XTh9royR1Hswr7Nh3jKD3zqJjZYojprxEW0t9fJ1InLMA6Iy tIOFlHK4tngqCHjnkyJolKGCqmy4Jgg9xBfO6FwyU5swtbjnrpuhexMpgyHZ5nArmRXRuP 6udF8otfq7HNHrTTzOOjueMDXy7iDHRtXz0Ek946BKgYEczPt6QllLzqOUvBZ3OWEu3+Fj 6sHo8YX65VRhQAC3XZRRc7iPiINbxorpxkFO9cHJLkkTmEbwzjLLfuWm7UcAsZRwYx2B1m 7/9eskx429G7iLIB6/+yRkuPNpRwiUj9HNv2vdpNJHnpqW+1c92fxp0pDeWWOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738339408; 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=OEJP5O3DHdwLjAbbEmYCngW6P2cYlrnN7bRs8OBS3Vk=; b=UwWroFaU5fHG6hlQdSKJtCz60bN7ZmK0lvDl2I9fY3DT2hCuLEX7c+TLrZFOTJ28PaoCHd OFuZe83/tKb6jD37ReAEGtPka2PGE4dbkL0NaJWgFn/JoAbBo6EDcuF10Tr+k9H0pDTUov ojZRpppyoaqiNSH0r9anBpF3sXp3VX/VFBw278HQjbuGx+mV6Aj5IA0Hl5TgQQSSf8MoyY 0wqxxNoVfaZ55rrdpSPXsHf2KCGlLScHv/TJ9GPOwbKjlrmR2z+NeDYB9bCvmkWwmSbsG6 NPhvPFJc9iL1yPh5KupzVk4ur20kc7yl520Yz8If5b/oJYxfbwSDyslp1ryksw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738339408; a=rsa-sha256; cv=none; b=sO2SWrVHkDjYV5BZFqgKTaxQN4NiSUdBNtG1pGsMaGoqCV70nT5JsRsP45pNOdzFc0Oc3u 643NsDrxZ2pzLPY7rxS9QW4uIy2xcwGzdBmt8nUgmRLmwbDAZqHLuHug1dYKzqSd3eFbNm 19qAZfXBMMU0e7q0J+wlkDFOg4uJIsrTqcbxJ8QcOkilM7Q97cltyCYeibrYSNs9NBe5l3 2tsOJSFrf1l6vrwJ3/a5me4C4JN5wQE0b8wjdH6C2DaKeqDhoex0THhquoyCZDOQxSHV1F 5OaNk3RkNs+8GUYdP77d5ccwbkQ4bSulIHJRs7MYS4S79SGQbwNPHPHF88/v+A== 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 4Yl0zz6JYzz8xL; Fri, 31 Jan 2025 16:03:27 +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 50VG3RHw039061; Fri, 31 Jan 2025 16:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VG3RTR039058; Fri, 31 Jan 2025 16:03:27 GMT (envelope-from git) Date: Fri, 31 Jan 2025 16:03:27 GMT Message-Id: <202501311603.50VG3RTR039058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: e5764cf07588 - main - linuxkpi: Don't destroy the mutex in `xa_destroy()` 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5764cf0758855e2d5a9ebab6d6addc6eaccd56e Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=e5764cf0758855e2d5a9ebab6d6addc6eaccd56e commit e5764cf0758855e2d5a9ebab6d6addc6eaccd56e Author: Jean-Sébastien Pédron AuthorDate: 2025-01-21 22:54:51 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-01-31 16:00:50 +0000 linuxkpi: Don't destroy the mutex in `xa_destroy()` [Why] The mutex initialized in `xa_init_flags()` is not destroyed here on purpose. The reason is that on Linux, the xarray remains usable after a call to `xa_destroy()`. For instance the i915 DRM driver relies on that during the initialixation of its GuC. Basically, `xa_destroy()` "resets" the structure to zero but doesn't really destroy it. Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48762 --- sys/compat/linuxkpi/common/src/linux_xarray.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_xarray.c b/sys/compat/linuxkpi/common/src/linux_xarray.c index 54c536042392..3f07f6d7c59f 100644 --- a/sys/compat/linuxkpi/common/src/linux_xarray.c +++ b/sys/compat/linuxkpi/common/src/linux_xarray.c @@ -362,9 +362,19 @@ xa_destroy(struct xarray *xa) struct radix_tree_iter iter; void **ppslot; + xa_lock(xa); radix_tree_for_each_slot(ppslot, &xa->xa_head, &iter, 0) radix_tree_iter_delete(&xa->xa_head, &iter, ppslot); - mtx_destroy(&xa->xa_lock); + xa_unlock(xa); + + /* + * The mutex initialized in `xa_init_flags()` is not destroyed here on + * purpose. The reason is that on Linux, the xarray remains usable + * after a call to `xa_destroy()`. For instance the i915 DRM driver + * relies on that during the initialixation of its GuC. Basically, + * `xa_destroy()` "resets" the structure to zero but doesn't really + * destroy it. + */ } /*