From nobody Wed Aug 19 00:03:57 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 4hPmy60kmBz6p6nj for ; Wed, 19 Aug 2026 00:03:58 +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 4hPmy603CMz3twl for ; Wed, 19 Aug 2026 00:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787097838; 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=nFH8bVASAeStdFisIAEEE3f1b8tIv5pXN54s01L8s+U=; b=DC8biDbnRF6rnFarG5FLgrW1wpdT+sLHsouIO68BJnfnSTcsULx7IPLcgmPIwpEs1TQWd/ MUo6AmFHDCOs5OqYr0aHimz6I3Bf9sP1IMRQ9Z4hWtkDOMK74ncDBqgayhSeSWKEhMF4XG L9l8BHhbK+YImxXPKu2bh7SiNnbCYxvcB7BzRbwtgKZ6HwS/P+6Ut14ugs4EWaw6DoXZWc c/Fa+k+cYb1SXAigyo8y772GWmxnVSxSHF5JHWz0Pm1IbulTmpXZ8ZyO1PBbgAb2TjW2fP 7id5F6NkmT8QaI+xCdOnhd4BLhoDukm3Ap+oXsJIKDfPcp+aiARWKTjPlKkBiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787097838; a=rsa-sha256; cv=none; b=uNrLpn/5+HqX0QUN/DsFg7X7OxR5ph8KrSCJUvRP84JzMLu2Tg6Otz9krNhMhVZUFaLQKH 0cJsIIlXkRlWslTw2QkuPbwS7hnWYrUrIwXgSUvBuLZC/3fEkWvoWZLnaWcdrh6bsidkER QYBkP2yTAM7NsLsWSZkQjTiAUixoBRq6VuLICG0Kt3eoR1/nB63GJJaAz9uaSHucORkD/J 9aLGPpY1b1U3D4nCImk3zxV/XFHdBfbhNzwQCTZwo+MP1/lq4PdV+8bLsBXC+NLEr3G7A9 mnNpMISgf57KJuaHanZ+Ay5JFRgAQce1c8R20z7UkMTj6GOT8bFKmQe5EU2Acg== 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=1787097838; 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=nFH8bVASAeStdFisIAEEE3f1b8tIv5pXN54s01L8s+U=; b=Fu26XKNziynuBR0nnzXEUUWGquVo1rI3eEorfKoVNf028GSKVmh4XGoRnuoJ79B1wPgY1t SMlf6KBPFSQnb7U2MJshEeEuRfI9wkg5uH40gJrERJN+eb66wDHZ7i97k18Z64AqZtC0gX kpusjLZYVJOOrqTQ+hOLUbLQiBcAPosySdWLlOq3InwNIoisrVgHql0y38AIukdUYGixeU bVEco+za+ICcN6EXvQWib5S/yPEmTnw1NLdwUmoR1LbX2P72+qHKh86eta7jxhtx2L7zkl OIwkauui+UF+KSjlAvPwbiNRl9zkskPxMWXNz0W751gITqB6SfWgr6F9YaIFgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPmy566TQz15rW for ; Wed, 19 Aug 2026 00:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Aug 2026 00:03:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: c90c46ea239f - main - linux: add dma-buf and sync_file ioctl handlers 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: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c90c46ea239f2514f1af82c1fa9dc0b4f20361e7 Auto-Submitted: auto-generated Date: Wed, 19 Aug 2026 00:03:57 +0000 Message-Id: <6a84f2ed.400e8.579e9740@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=c90c46ea239f2514f1af82c1fa9dc0b4f20361e7 commit c90c46ea239f2514f1af82c1fa9dc0b4f20361e7 Author: Nick Price AuthorDate: 2026-08-09 23:43:12 +0000 Commit: Nick Price CommitDate: 2026-08-19 00:02:26 +0000 linux: add dma-buf and sync_file ioctl handlers drm-kmod already implements the dma-buf and sync_file ioctls, but linux_ioctl.c had no handler group for the 'b' and '>' magic bytes, so the requests never reached it and returned EINVAL from linux_ioctl_fallback(). Route the commands drm-kmod services to sys_ioctl(), translating the direction bits with SETDIR(); everything else still falls through to the fallback and keeps getting named in dmesg. Approved-by: adrian Accepted-by: dumbbell Signed-off-by: Nick Price (cherry picked from commit d6a7e89504af337413af39fd121026f512c0a35d) --- sys/compat/linux/linux_ioctl.c | 38 ++++++++++++++++++++++++++++++++++++++ sys/compat/linux/linux_ioctl.h | 20 ++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index b68e950a2dcf..dd261aeca56d 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -108,6 +108,8 @@ DEFINE_LINUX_IOCTL_SET(sound, SOUND); DEFINE_LINUX_IOCTL_SET(termio, TERMIO); DEFINE_LINUX_IOCTL_SET(private, PRIVATE); DEFINE_LINUX_IOCTL_SET(drm, DRM); +DEFINE_LINUX_IOCTL_SET(dmabuf, DMABUF); +DEFINE_LINUX_IOCTL_SET(syncfile, SYNCFILE); DEFINE_LINUX_IOCTL_SET(sg, SG); DEFINE_LINUX_IOCTL_SET(v4l, VIDEO); DEFINE_LINUX_IOCTL_SET(v4l2, VIDEO2); @@ -2579,6 +2581,42 @@ linux_ioctl_drm(struct thread *td, struct linux_ioctl_args *args) return (sys_ioctl(td, (struct ioctl_args *)args)); } +/* + * dma-buf ioctl handler (drm-kmod) + */ +static int +linux_ioctl_dmabuf(struct thread *td, struct linux_ioctl_args *args) +{ + + switch (args->cmd & 0xffff) { + case LINUX_DMA_BUF_IOCTL_SYNC: + case LINUX_DMA_BUF_IOCTL_EXPORT_SYNC_FILE: + case LINUX_DMA_BUF_IOCTL_IMPORT_SYNC_FILE: + args->cmd = SETDIR(args->cmd); + return (sys_ioctl(td, (struct ioctl_args *)args)); + } + + return (ENOIOCTL); +} + +/* + * sync_file ioctl handler (drm-kmod) + */ +static int +linux_ioctl_syncfile(struct thread *td, struct linux_ioctl_args *args) +{ + + switch (args->cmd & 0xffff) { + case LINUX_SYNC_IOC_MERGE: + case LINUX_SYNC_IOC_FILE_INFO: + case LINUX_SYNC_IOC_SET_DEADLINE: + args->cmd = SETDIR(args->cmd); + return (sys_ioctl(td, (struct ioctl_args *)args)); + } + + return (ENOIOCTL); +} + #ifdef COMPAT_LINUX32 static int linux_ioctl_sg_io(struct thread *td, struct linux_ioctl_args *args) diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 769f56b7de51..5585f7e866fe 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -622,6 +622,26 @@ #define LINUX_IOCTL_DRM_MIN 0x6400 #define LINUX_IOCTL_DRM_MAX 0x64ff +/* + * dma-buf + */ +#define LINUX_DMA_BUF_IOCTL_SYNC 0x6200 +#define LINUX_DMA_BUF_IOCTL_EXPORT_SYNC_FILE 0x6202 +#define LINUX_DMA_BUF_IOCTL_IMPORT_SYNC_FILE 0x6203 + +#define LINUX_IOCTL_DMABUF_MIN 0x6200 +#define LINUX_IOCTL_DMABUF_MAX 0x62ff + +/* + * sync_file + */ +#define LINUX_SYNC_IOC_MERGE 0x3e03 +#define LINUX_SYNC_IOC_FILE_INFO 0x3e04 +#define LINUX_SYNC_IOC_SET_DEADLINE 0x3e05 + +#define LINUX_IOCTL_SYNCFILE_MIN 0x3e00 +#define LINUX_IOCTL_SYNCFILE_MAX 0x3eff + /* * video */