From nobody Mon Sep 07 18:37:21 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 4hdwm667ncz6rrJ1 for ; Mon, 07 Sep 2026 18:37:26 +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 4hdwm62z5Vz3xbf for ; Mon, 07 Sep 2026 18:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788806246; 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=ESvymc0Ld0P7bZsXTi07K6I0GTVRHqmGYUaCAPVPnB0=; b=ZCq8q5LUqcZyY1wUhEQLOGfgJvLx4XijL6O209Yr4F5YnlwOD6PYT+K2tmvYzCk3ckIFCq /2fOYxK6o1GQZIVC4nuil87AuZrMIdOWAzXmUEL/D/MnoQb5st3xoZh0j+EN4ScQj3pKWm xlM9J2Ezdjd0DEK77Skhc2aK5WuX2e4CqXFbU1geeG3er2G/33IDUMYDbH46QHJogwEQdp EbD3IZGdleDFbCDV2RnXvtaNDxlYHVaxkj8BTT7Rp25yiwoJOLbAHB1gixXCok0N8+/+x9 RmmU/alRny/lvU19uyPSUyPAUIMUMJjdnV7I3LQra3VvbpMxxkLox5GTWzSdRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788806246; a=rsa-sha256; cv=none; b=yzSOKPEjMO5VvKZxxi7rLLgQJ8suLKTGs10Vsb+Tb6Jmc/ivhUHNhKS0LTHwPAKt3GJ2pO /a//NOhqvWoUHYBogRUi6ERpxwCRLgLqGbJolbvaCN3xDMqOZLDxoRijL896vVWE0bMRhm m3Ht8voAJ1qzAI8AbQEStWrdasKLJTZzZ4UVH71GbgGgH0Lhw+VpulmRXUJpppqS34oQ4L Snu/eB9A5puPHWwWFQFykXKBc0yoXe+qe8AXt5uuY3lRiY3WQZJKbMN2RkK7ICrmTrRdv6 e4PsyL7YY+2kgO571iz2y4j/ke/P6AN+UQYciRS8bUEwgYOwrtttgoHba3YdTg== 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=1788806246; 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=ESvymc0Ld0P7bZsXTi07K6I0GTVRHqmGYUaCAPVPnB0=; b=Tcv2bQLjyewuJKm1TaXm3Mey2M7ncGEKLUk7j0vtZr456PTYdvnzk895+iOwdkB1X8Gcnf QuK0/rOO8TRtjGprUxXBCell3V8o2D5J4Lenl51laqm+re8rGO94EDF1/vpe/QyN7vRoIs hWu2txDauLDojxNrFgMaPJd1ZSxV+ptAymOVn20+jqrnSXcUD2LGdRYrqPuoTgZe7GNH2/ LBCk1JS/GYQ5QI6aSzkQl+ElNmrgpGbbzJOuuvqTrcyzSgmye+yQVFwY9wA7NnKVzoObeu t/GI5WUCdxJ8JecURiHSLKQCOdkrP0tMSh6ytv28KgzluOsbpfgZvODIK/tumQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdwm61B6czTJs for ; Mon, 07 Sep 2026 18:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 385e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 07 Sep 2026 18:37:21 +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: 33ba6077b0f1 - main - linuxkpi: Alias `sd` field of `struct kobject` 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: 33ba6077b0f162091bf0871686304916458420d3 Auto-Submitted: auto-generated Date: Mon, 07 Sep 2026 18:37:21 +0000 Message-Id: <6a9f0461.385e4.1eb0aeea@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=33ba6077b0f162091bf0871686304916458420d3 commit 33ba6077b0f162091bf0871686304916458420d3 Author: Jean-Sébastien Pédron AuthorDate: 2026-06-12 20:44:43 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-09-07 18:27:29 +0000 linuxkpi: Alias `sd` field of `struct kobject` On Linux, a `struct kernfs_node *` pointer, representing a directory in sysfs, is kept in the `sd` struct field. We don't have that on FreeBSD because we use sysctls instead. Let's alias the sysctl OID pointer to `sd` using an union. This pointer is checked by the DRM drivers using: if (var->kobj.sd) { ... } The amdgpu DRM driver started to use these checks in Linux 6.13. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57586 --- sys/compat/linuxkpi/common/include/linux/kobject.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index 3d053212f94e..cce604bdfb4e 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -60,7 +60,22 @@ struct kobject { struct kref kref; const struct kobj_type *ktype; struct list_head entry; - struct sysctl_oid *oidp; + union { + struct sysctl_oid *oidp; + + /* + * On Linux, a `struct kernfs_node *` pointer, representing a + * directory in sysfs, is kept in the `sd` struct field. + * + * We don't have that on FreeBSD because we use sysctls + * instead. Let's alias the sysctl OID pointer to `sd`. This + * pointer is checked by the DRM drivers using: + * if (var->kobj.sd) { + * ... + * } + */ + void *sd; + }; struct kset *kset; };