From nobody Mon Sep 07 18:37:21 2026 X-Original-To: dev-commits-src-main@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 4hdwm13n2qz6rr6P for ; Mon, 07 Sep 2026 18:37:21 +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 4hdwm1381Hz3xWC for ; Mon, 07 Sep 2026 18:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788806241; 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=I+w+hvNDkRR2rVOLU3AOfs+8WysYOGieil5mjErX39n043NxDe0QXUUNaVrojzg5zn4MSs 2u9mkXieDGrqDYVZ/GY72ufwUUK1kczPXau2G/wiBggoMsJYJxRmJx4u0QxmSW9lfX0ZR9 4QcXO7TC+pSSou1xl69POHULVftY6d45xP2s3mofMeNHXsstmB8c/hGpNWWrayNrG/K2+k 7F+Py0dIRBKEj7JcLgpGNqVJygh46B/0/Vms+Uj0FbToZTbZSGhwPLY3Y15vukJs6pg9oP hBCtWbLgRyYGWD4TMLdi/8LLzK4UYmlorkKtdbVpnU2zqNvBe5KgNtVRDe3urA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788806241; a=rsa-sha256; cv=none; b=OGF7kZmkeiqjNmJe/ivfdVWVf/rWS2v0WtL9C0vmAVBfsRD/2MYmLn4vD4aNb+KWHg2gLd E5s+aOsZ8u9RhGvhSHAJ+b6BhAlT/eXjK5G0OJx3+5wZFWzSQ3d0XOMUF7w6kUrljqY0G6 x90YtC7bIW6vNowufq9OcxjevTVFubQ925SGh6rL/suOjPOX4+g8aoqUYIU7go9ZVQxkZk BSJY0NKhkLukIZMF54ZaCRurFWyzpqbiSGFxFSflvBWGskEsNO0+R9uODax/hoQXU4jnzs /7iCrsKw/cRcsd1y9Lp5/Hw7eBqV48VzWwcwCR1BBDwkQt6Je8yPL1Pm5xLTAA== 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=1788806241; 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=QMwfDIee7M0iPmBrIqvVngV/4AvikbpIshUG4ISQd/X80j7JbpA5sQa9xLQqEpdJAWNbta GyB3FpjTjeBx+REs3DPSHcYXOV7TmKNZVThkB0xzLOc0U+UEFdNffGKcVsWq+67k10BdGE Z4SuaN0kuBGI1uileLFUsPNXA6GD/TFSIP/7afjBrPwaDhEzeUREvywNqI/jSnot8Naa8b E+jC43sxygL6M6P5hx7t+K9B8sjeVOQMfuRUSgdT5NqCN4Jz/nwX2WxeWK+dS9Zlw+u3gh 6vp7VgjlC4+eoN2gWnV16ZJqbS//xxiDccMffmvnAyBsMt2+ZodXRVwKt4YGZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdwm11KY4zTvG for ; Mon, 07 Sep 2026 18:37:21 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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; };