From nobody Mon Sep 14 19:48:17 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 4hkG0d5Sllz6rcnh for ; Mon, 14 Sep 2026 19:48:17 +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 4hkG0d2tMgz4X60 for ; Mon, 14 Sep 2026 19:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789415297; 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=ND0HbzrZJvranoXEm66v3CnqRXKYamsbb1NjeLvG9L4=; b=iaCg9rsRAKWeHO5qloI6c/D1ot40VdwQ7ltvVTdb2SvcGYRziZRO40vk69nlqOrAZig5Tw xyOUwu//Q3I60LpA4HY5FBB1iXbIuHkWuSpYFFDDVYns5Fle+ODQD+0Wh6KWYLz0EfhDJd Z7nTftX/R/xmDFVzI5T2lRzQ97JIkhXgdJTOv/eiQhacHQx47GRNiTiY79lLJORzjJc5P0 B4CzmOO5JR24+e3po0PlulWD+YS0oko+djTwfpEcBRH8qhrUaqDoxmVSMNtgt9cwxpoNAE y0XdlRLWqNJ67C6f1/iCd2BqAw3jWeKofyrrbEvFpNooaDvBRAUirtMrqd9pNw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789415297; b=JgvYG5crf/3UW87R1xLc8cYJTNHOHpoAGSjfWeZZC7/xGZZs8Uk9PJ0q2c0clNdwVCghxf rGb2hPVRe4iZ7tVC436Xdz/O1OZhwprgVF+lXMsaEoQSFCBCM80mT8EQP590hBx5gImbeq 2ChBzyj4iRZG+AWYS4uFiCDK1L+hjCEKwNOSgY137SbSgfMlhY83Qc1eDb52tP2Pt1XBSm bhzp7PdcayAbxq+c3kxCE+5Px+KByq5GJMaeP/acPyiGwildc8NLeBO6OqMCIxWAYD3Bpj VLwt9NDagSzkb3nUwgrl/lrwuQmLkBiwTSWcoQ1pnEFlUSuJPCsCbdC3pSRcSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789415297; 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=ND0HbzrZJvranoXEm66v3CnqRXKYamsbb1NjeLvG9L4=; b=Bs1/+ornSDzJ3OMkj/DgjJrNgmCA+YZqTpWW4ouHl2ZlidN5Rf9917CBE9SeQzRx1SP8Rc 1QwpQaV2xMm1Xl/d611cLlpwUOcMDSlGoFLtb1Q7jJ50QjYBDOulnZg9SeBWxIj2d4oCMh HJqhA/b/i6V6BHt4oE28MgcpYLwzdrnwX5wu/kmpvrgEbcZxxeh6nK9fOarMsCNm4i1ypD Y9O2dzfj8rwcTlNipGBi1iTynVXUVqR++wxVWpXyjpFcSXCA1JJKROQVwL+nIaOcty+Q9g qJIcvuYda95zlmsu3y8cdP1gOZKQR2EB42xdxBgk1Yn/vbMpU10AX8K+a92Vtg== 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 4hkG0d1yFfzRnB for ; Mon, 14 Sep 2026 19:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 19:48:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b0094b5b7320 - main - Revert "linuxkpi: Add device under parent, not under 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0094b5b7320fc40ca581f9ac7c52514ddb5c2cb Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 19:48:17 +0000 Message-Id: <6aa84f81.25c99.602be2b7@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b0094b5b7320fc40ca581f9ac7c52514ddb5c2cb commit b0094b5b7320fc40ca581f9ac7c52514ddb5c2cb Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 18:51:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-14 19:06:01 +0000 Revert "linuxkpi: Add device under parent, not under class" This reverts commit fc0a5ae094308609927e9c355928d08923278325. This changed the sysctl node path and broke IB user space tools (ibv_*). PR: 298485 Reported by: Ariel Ehrenberg (aehrenberg nvidia.com) --- sys/compat/linuxkpi/common/include/linux/device.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index a26d07a1e7a3..0d06f4df59c6 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -458,10 +458,12 @@ device_add(struct device *dev) if (dev->devt == 0) dev->devt = makedev(0, device_get_unit(dev->bsddev)); } - if (dev->parent != NULL) - kobject_add(&dev->kobj, &dev->parent->kobj, dev_name(dev)); - else - kobject_add(&dev->kobj, &dev->class->kobj, dev_name(dev)); + + /* + * Do not change: + * the specific location is used by IB user space tools (PR298485). + */ + kobject_add(&dev->kobj, &dev->class->kobj, dev_name(dev)); if (dev->groups) return (sysfs_create_groups(&dev->kobj, dev->groups));