From nobody Wed Sep 09 20:34:40 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 4hgCGS3sljz6rMDd for ; Wed, 09 Sep 2026 20:34:40 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgCGS29Sxz3Lxb for ; Wed, 09 Sep 2026 20:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788986080; 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=VW8fTf4uizdEaxKBhqvApsfJz1CDN4mtflEOsxStoys=; b=HRQN9+J78GrOm1IOe6SVmFK0mS3Nk90/RRjwLLJSMas997SVfQmXznf/3LqzPMJStGSRmx gGiWAbo3qx87NcuM9/ibo2Xeemunzt991pnLw+GCr+eDq47FBsurSCvFnRHl0Co8Utmuw/ 8AyRwvPutDmZjSeMTBgKKYacZGt/LmqPXt8HpFo5WCFm9XmCkhuxxgXMqmpaDZz2rLaLA3 IFH6cxif+VZetJC7EvWzdBwYOlMHclPe9KjIVeHgObNy7NQPtRvn9BstbSqpkhgIpUd5T3 tdHz+z1GraV/oTczEwhOV6g+6hQPyG0Ox8eYFBjABBdYYsCLhlZHHNKMOWEw+g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788986080; b=s+0LCPAXZkT4LYVIrRfZNQ77AYOIJL9K48sJNonZJf3Vj0egaXNOjob7cYRdalROlD1tMK hjJVoTB5Y7760H5hr31jKikML2T00jKnPsaNTguwxLuGQvsS1kdlbXRWy4YtiTVwyfDCGv 0FjoWQ/zndbXq26MP6cZnK4yb5ByJlIE0g/XPWGvj7dwhothfvNHZ88sWCd4oYe4ebmBT8 +Fln03CDAvAr8dML+tPU3oZ4RXrfwll4FcajugCP8eHegIkT9xkL5qZlpYyDkxWDJX11fR SEZwF0r7U5QIfK0Mt7/jGsmaVP9a2TX1z2nAZPaa7rwy4+V3iETb0XrftCAvtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788986080; 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=VW8fTf4uizdEaxKBhqvApsfJz1CDN4mtflEOsxStoys=; b=l6IRHKzqut2zBiGcjJD7lVvAyQH5QYnoz1ZLOEqdGsw2OotsMf9PfwdXMQdURbi8fWQxhA vpi5b2stSzlYR7l+/ZbMAXkpvB1rXfMxP+lqsZwTZKhdILPdF/E7HIiaRQI49/0867SLdG QzLs6BvKA3E88W7mJ/soAINvv38LlJnNRGf1mcxnwGhq0Bo2g7Ctdin8IBA13hJOSl1UBY T3bKZoLYgkW6QPWVCaJ28nN7AHfkQpFcP5j4eFIHr8r92/XO12MKLB16B8+9BJ9JayxdyP bcj6vEyMLxa//kvPvQFPSNyMYkOR6dBmt+rWXTR0a3Mf6/PpGyFzw9sR6wj6BA== 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 4hgCGS17Z8z1BjZ for ; Wed, 09 Sep 2026 20:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 20:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: f2a2e02ae54b - main - linuxkpi: Define `DEFINE_CLASS()` and `CLASS()` 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a2e02ae54b836d1e23648756a050406f65111e Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 20:34:40 +0000 Message-Id: <6aa1c2e0.21d20.2b4e1c0a@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=f2a2e02ae54b836d1e23648756a050406f65111e commit f2a2e02ae54b836d1e23648756a050406f65111e Author: Jean-Sébastien Pédron AuthorDate: 2026-06-12 17:56:35 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-09-09 20:01:30 +0000 linuxkpi: Define `DEFINE_CLASS()` and `CLASS()` `DEFINE_CLASS()` is in fact named `LINUXKPI_DEFINE_CLASS()` because it conflicts with `DEFINE_CLASS()` defined in . This macro defines a type and a pair of constructor/destructor functions. They are to be used by `CLASS()`: this one declares a variable, initialise it with the constructor and set the `__cleanup()` attribute to call the destructor once the variable goes out of scope. The DRM drivers generic code started to use `CLASS()` in Linux 6.13. It requires the `fd` class to be defined in . Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57583 --- sys/compat/linuxkpi/common/include/linux/cleanup.h | 26 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/file.h | 2 ++ 2 files changed, 28 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/cleanup.h b/sys/compat/linuxkpi/common/include/linux/cleanup.h index fb21a81f121b..815cdc37a956 100644 --- a/sys/compat/linuxkpi/common/include/linux/cleanup.h +++ b/sys/compat/linuxkpi/common/include/linux/cleanup.h @@ -20,6 +20,32 @@ CLEANUP_NAME(_n, _t) _x __cleanup(CLEANUP_NAME(_n, _destroy)) = \ CLEANUP_NAME(_n, _create) +/* + * On Linux, the following macro is called `DEFINE_CLASS()`. However it + * conflicts with FreeBSD's macro defined in . + * + * Note: "_T" are special as they are exposed into common code for + * statements. Extra care should be taken when changing the code. + */ +#define LINUXKPI_DEFINE_CLASS(_name, _type, _exit, _init, _init_args...)\ + typedef _type class_##_name##_t; \ + \ + static inline _type class_##_name##_constructor(_init_args) \ + { \ + _type v = _init; \ + return (v); \ + } \ + \ + static inline void class_##_name##_destructor(_type *p) \ + { \ + _type _T = *p; \ + _exit; \ + } + +#define CLASS(_name, _var) \ + class_##_name##_t _var __cleanup(class_##_name##_destructor) = \ + class_##_name##_constructor + /* * Note: "_T" are special as they are exposed into common code for * statements. Extra care should be taken when changing the code. diff --git a/sys/compat/linuxkpi/common/include/linux/file.h b/sys/compat/linuxkpi/common/include/linux/file.h index 13eecfa6a2b0..6ed480f4356a 100644 --- a/sys/compat/linuxkpi/common/include/linux/file.h +++ b/sys/compat/linuxkpi/common/include/linux/file.h @@ -184,6 +184,8 @@ static inline struct fd fdget(unsigned int fd) return (struct fd){f}; } +LINUXKPI_DEFINE_CLASS(fd, struct fd, fdput(_T), fdget(fd), int fd) + #define fd_file(fd) ((fd).linux_file) static inline bool