From nobody Wed Apr 29 21:42:43 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 4g5W4T1bxVz6c0dF for ; Wed, 29 Apr 2026 21:42:49 +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 4g5W4S5zpLz3gdV for ; Wed, 29 Apr 2026 21:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498968; 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=77awMMyEaOD/zPGwStG0rfeJbPdRQwchzs//zhl3yAs=; b=g8gvorunQw9jnqp/sUjYxWgNpOMtY2BDr3E2jLUvQlL55jt5T1vT7fkAFqQkHBfLhTi9v9 Pa0TNtcECfpbkR2jXSBq/0Ls4Q3BNbHAfW0exlfBZahzXbrdsgKFAYpzb+YZ7743wC+XVP LCgINjPXh/sfO/RNOp3o5mtzn3CffUL07aAV9PXDI5A1+g4QE6kPS/eHC87RBtABXb6GJm 7FwNARy7YBH1CRSgxe3p66QZV3EDkSNIebvps6e4C8n2AMXUid3ANd7skzGL5Oh+E5k70c qaolKw2XrMg0lmz396jbBRMO0VVe5+Lzc8WJTtcMy01PeNAAkwGTCJ6kBkkHkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498968; a=rsa-sha256; cv=none; b=mA9Hf8V3xALjnahM/090Bs9zqcAnSyoR31j+lLKEI8Rb4+Jc47Ei7hRAix0S7h3lrb8b/q u4iqZoMmTo9ITttFQg6uJ/Bw3/se2y1smvbNOT7NBDAnD7HyWirFvj729iivIf1gZcWf8D uW0sRGwTDy839vlZtP9yBYV0dEueicwU3BqlQsQYUJPosp83N37bGZHNtV6ys47T2IfsbI XliIHhoJw2TQzOfTK78AgO2dM6dVewSZihkfLOGt3Vlr+XinW9Q/SqAwbZdk80TXkjXMsa 7NKR+Kkp0/MzUEtXaneP2UavMa0lYzWYwwn/9LLttyzfIQrw9uGWvbPYCmxy3Q== 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=1777498968; 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=77awMMyEaOD/zPGwStG0rfeJbPdRQwchzs//zhl3yAs=; b=UwgQreqJXP63/06vSzC32OPYsB+GiQwWwqfglImHCDYEjSQfzP9BkthCj17eZKWJ1RiEsC u7hjUsjDcZN6esG/qlO0345SJsY5Zr3WwudpD2QTjlRNThT3TFgkrEM4oFFtbjA/WHMWxS tHazasucBi5KcJC4hYqsCnhkAP7nIFUazhC6jH9RMtMCdy5WmNigGQXtlQp9R/PpwHRjC5 DacNDuVmd8m8+fSsMYq9SjAqLFXLdJ1QGIhQuIVsHpvmTtQpqjheGKKEwyUjkTvnKIuiRn 0gtDzDDkEQfDJggJENyXBmQE8bkOQ9hy++TAlTAkAC5iO/ARhXAQ/aV8ZmTidw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4S5FdjzyGR for ; Wed, 29 Apr 2026 21:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19029 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:42:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: a95ef6503cc2 - stable/15 - linuxkpi: Define diagnostic macros like `might_resched()` or `cant_sleep()` 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a95ef6503cc2adb2ad69f9a2d09bdd8e40ae64b9 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:42:43 +0000 Message-Id: <69f27b53.19029.10bb4ea3@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=a95ef6503cc2adb2ad69f9a2d09bdd8e40ae64b9 commit a95ef6503cc2adb2ad69f9a2d09bdd8e40ae64b9 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-11 09:37:05 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 20:59:19 +0000 linuxkpi: Define diagnostic macros like `might_resched()` or `cant_sleep()` They are no-ops on FreeBSD. While here, move the already defined `might_sleep*()` macros from to where they belong. The DRM generic code started to use `might_fault()` in Linux 6.12. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit ad528a6b174e7090cb06062867e9a146b017205d) --- sys/compat/linuxkpi/common/include/linux/kernel.h | 33 +++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/wait.h | 7 ----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 2430b25c6915..e3ac4a05612c 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -351,4 +351,37 @@ mac_pton(const char *macin, uint8_t *macout) #define DECLARE_FLEX_ARRAY(_t, _n) \ struct { struct { } __dummy_ ## _n; _t _n[0]; } +/* + * The following functions/macros are debug/diagnostics tools. They default to + * no-ops, except `might_sleep()` which uses `WITNESS_WARN()` on FreeBSD. + */ +static inline void +__might_resched(const char *file, int line, unsigned int offsets) +{ +} + +static inline void +__might_sleep(const char *file, int line) +{ +} + +static inline void +might_fault(void) +{ +} + +#define might_sleep() \ + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "might_sleep()") + +#define might_sleep_if(cond) do { \ + if (cond) { might_sleep(); } \ +} while (0) + +#define might_resched() do { } while (0) +#define cant_sleep() do { } while (0) +#define cant_migrate() do { } while (0) +#define sched_annotate_sleep() do { } while (0) +#define non_block_start() do { } while (0) +#define non_block_end() do { } while (0) + #endif /* _LINUXKPI_LINUX_KERNEL_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/wait.h b/sys/compat/linuxkpi/common/include/linux/wait.h index 03ddce2c06f5..698a1056b713 100644 --- a/sys/compat/linuxkpi/common/include/linux/wait.h +++ b/sys/compat/linuxkpi/common/include/linux/wait.h @@ -43,13 +43,6 @@ #define SKIP_SLEEP() (SCHEDULER_STOPPED() || kdb_active) -#define might_sleep() \ - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "might_sleep()") - -#define might_sleep_if(cond) do { \ - if (cond) { might_sleep(); } \ -} while (0) - struct wait_queue; struct wait_queue_head;