From nobody Wed Nov 04 06:36:27 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 4jKG1S4G1Nz6xqBm for ; Wed, 04 Nov 2026 06:36: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKG1R6yTGz3Ns3 for ; Wed, 04 Nov 2026 06:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793774188; 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=bwnn3olT8lkkAjbXTqOP2QzV0xLlQPNaZ4AIdg1TtZk=; b=hdoKbfeyFz8ab6e7H+G1DyXzp8e7OEVWHk66gmBLYrM3w06vmNU8+9i8bM6cvDL5yHd0hd ItKXK8HXxSlrlf5Pg9LX1wZb0rAVeL2oS8+eqtQhxRnyioXRzl4IUM1suGA8yI1RinlkGd P3KFH+ZQkPGs9015dl2cakL+wtatGryhGlr1QqgApvJtlfygx8miJvQMXwdMEtUWh2HRBx KujpTLbFcuiVoiWGtixKW03CBRokjAb1K8xUMQxFMfN0CITkWjpb0h0jZol094kyK+0fMM vEMLc6yhFNSAjSKuGfCiaHUrcmh6p3+tlKJmSaM88tkDLvRST8iqEmOAxkApvg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793774188; b=JcWa+Mc5Q4UgWcVOSnOgLWnjabVJLtvwNM5yvV6mATkgWIhada83oGuWnwRfQzspFqio+Q 2crwUo1zdL/6w16zVTXvLKM9jKolNYGRmjodTxRVHjtFBV+bcMS/J/6rn4ZLWSYVMSrk7h IVzAXLeW3pPs0PxZpuEd2KjkEwajKusOV2dsj6cOZS6Qty3Cj2+mk9Btq7uoab2VKKdVZG ZqV4cQEaTnIG+axWlQ6mrb+EaU/4dUKFou/BOoHySYvTHdrB6cV/bPh86exCJh4G/fDxKE LxWJmBKc5ZtftJ8aRCLt6QbunHMtXicL6xdpdIS4iPqT+4h7KLwlyu0h2jS2SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793774188; 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=bwnn3olT8lkkAjbXTqOP2QzV0xLlQPNaZ4AIdg1TtZk=; b=OHNEFF7CqfzqqMImZE7jZDfhvxhX4I65fmfIy3UNSdKCl+bB3DpO4nYVJZLm7POczt7UBK nw6CAmxdqdykeL9n078c+j/MjFXsduKve2GsO60+MdzPzqWRl7L7e7yVCLIbT3Py6wZf8G 9rG+U4eioLdaLUgOWAlvSN+k1YnfCFpzoxZ3HqqTaX45WFrAY/kPejLQJtioKSJjf3gPkK BYrFt3aqRHnSsf5iMgzZgOi2ER1I3DATDaBGlKepqGW88OqKR/x1E7/mwuuJe3O41f3zaS OL/LuL8TveAKFRb8h/JpfyCvkC2iHN2SawWSwhO5bg9OL6jLRUODuP6dnu6DBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKG1R6DV0zsMQ for ; Wed, 04 Nov 2026 06:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 06:36:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f739d9f46c24 - main - linuxkpi: Do not wait for a disabled tasklet in tasklet_unlock_wait() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f739d9f46c24da39651ae981a549a55eb2a3d006 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 06:36:27 +0000 Message-Id: <6aead26b.38b9a.41c5ad67@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f739d9f46c24da39651ae981a549a55eb2a3d006 commit f739d9f46c24da39651ae981a549a55eb2a3d006 Author: Emmanuel Vadot AuthorDate: 2026-10-28 15:02:00 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-04 06:35:19 +0000 linuxkpi: Do not wait for a disabled tasklet in tasklet_unlock_wait() tasklet_unlock_wait() waited for the tasklet state to become idle. Linux only waits for TASKLET_STATE_RUN, i.e. for a tasklet that is currently executing. A tasklet which is scheduled but disabled does not run until it is enabled again, so in LinuxKPI it stays in the BUSY (queued) state and the waiter never returns. This is what happens when unloading i915: execlists_reset_prepare() disables the engine tasklet with __tasklet_disable_sync_once() while the tasklet is queued and kldunload loops forever in pause(). Do not wait if the tasklet is only queued and disabled. Reviewed by: bz Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/compat/linuxkpi/common/src/linux_tasklet.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_tasklet.c b/sys/compat/linuxkpi/common/src/linux_tasklet.c index e443ab3958b4..d2cf6df35f0f 100644 --- a/sys/compat/linuxkpi/common/src/linux_tasklet.c +++ b/sys/compat/linuxkpi/common/src/linux_tasklet.c @@ -271,7 +271,24 @@ tasklet_unlock_wait(struct tasklet_struct *ts) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "tasklet_kill() can sleep"); - /* wait until tasklet is no longer busy */ - while (TASKLET_ST_GET(ts) != TASKLET_ST_IDLE) + /* + * Wait until the tasklet is no longer running, like Linux which only + * waits for TASKLET_STATE_RUN. A tasklet which is only scheduled and + * is disabled will not be run until it is enabled again, so waiting for + * it to become idle would block forever (for example i915 disables the + * engine tasklets while a reset is pending and waits for them). + */ + while (1) { + switch (TASKLET_ST_GET(ts)) { + case TASKLET_ST_IDLE: + return; + case TASKLET_ST_BUSY: + if (atomic_read(&ts->count) != 0) + return; + break; + default: + break; + } pause("W", 1); + } }