From patchwork Mon Nov 16 00:50:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28911 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 41264C3304 for ; Mon, 16 Nov 2026 00:50:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5462B6A83B; Mon, 16 Nov 2026 01:50:49 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="tTi3ySct"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 650BF691CB for ; Mon, 16 Nov 2026 01:50:46 +0100 (CET) Received: from killaraus.ideasonboard.com (81-175-209-152.bb.dnainternet.fi [81.175.209.152]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DB71163C; Mon, 16 Nov 2026 01:48:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1794790100; bh=irhZeLaypvUByLJPurF3IwWjjXZgSH+WPme8aw4V8d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tTi3ySctnnWu/6phiB9Wlhw3sBiZYv1Db4rSgA6ppjxX9Fo2rBZ2ab7hUwKfk2/wp FDlIOJQJ1kqgSfslo7ruIeX+LvCN1XjLdcTITGJk+VunupPzPwJZ9AVDmaAvn/Tnc4 3iztqppHFecNAexRMC9lvKkCfIkxE5CtfBTwk+sE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , Prasanth R Subject: [PATCH v3 1/2] v4l2: v4l2_compat: Handle __ioctl_time64 Date: Mon, 16 Nov 2026 02:50:42 +0200 Message-ID: <20261116005043.1651041-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116005043.1651041-1-laurent.pinchart@ideasonboard.com> References: <20261116005043.1651041-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Paul Elder On 32-bit systems with 64-bit time_t (except x32), ioctl is redirected to __ioctl_time64. The v4l2-compat layer only intercepts the former, we need to intercept and handle the latter as well. In order to correctly support those systems, translation between 32-bit and 64-bit ioctl structures also need to be implemented. This will be done in a subsequent patch. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham Tested-by: Prasanth R Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/v4l2/v4l2_compat.cpp | 21 +++++++++++++++++++++ src/v4l2/v4l2_compat_manager.cpp | 10 ++++++++++ src/v4l2/v4l2_compat_manager.h | 2 ++ 3 files changed, 33 insertions(+) diff --git a/src/v4l2/v4l2_compat.cpp b/src/v4l2/v4l2_compat.cpp index ff833f571bde..cc4ea33d949d 100644 --- a/src/v4l2/v4l2_compat.cpp +++ b/src/v4l2/v4l2_compat.cpp @@ -165,4 +165,25 @@ LIBCAMERA_PUBLIC int ioctl(int fd, unsigned long request, ...) return V4L2CompatManager::instance()->ioctl(fd, request, arg); } +/* + * __USE_TIME64_REDIRECTS redirects ioctl to __ioctl_time64. Disable the + * -Wmissing-declarations warnings, as the functions won't be declared if + * __USE_TIME64_REDIRECTS is not in use. + */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmissing-declarations" + +#if HAVE_POSIX_IOCTL +LIBCAMERA_PUBLIC int __ioctl_time64(int fd, int request, ...) +#else +LIBCAMERA_PUBLIC int __ioctl_time64(int fd, unsigned long request, ...) +#endif +{ + void *arg; + extract_va_arg(void *, arg, request); + + return V4L2CompatManager::instance()->ioctl_time64(fd, request, arg); +} + +#pragma GCC diagnostic pop } diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index b07f865fb2da..65cce7e13c01 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -46,6 +46,7 @@ V4L2CompatManager::V4L2CompatManager() get_symbol(fops_.dup, "dup"); get_symbol(fops_.close, "close"); get_symbol(fops_.ioctl, "ioctl"); + get_symbol(fops_.ioctl_time64, "__ioctl_time64"); get_symbol(fops_.mmap, "mmap64"); get_symbol(fops_.munmap, "munmap"); } @@ -243,3 +244,12 @@ int V4L2CompatManager::ioctl(int fd, unsigned long request, void *arg) return file->proxy()->ioctl(file.get(), request, arg); } + +int V4L2CompatManager::ioctl_time64(int fd, unsigned long request, void *arg) +{ + std::shared_ptr file = cameraFile(fd); + if (!file) + return fops_.ioctl_time64(fd, request, arg); + + return file->proxy()->ioctl(file.get(), request, arg); +} diff --git a/src/v4l2/v4l2_compat_manager.h b/src/v4l2/v4l2_compat_manager.h index 13673d604a63..1093505a090d 100644 --- a/src/v4l2/v4l2_compat_manager.h +++ b/src/v4l2/v4l2_compat_manager.h @@ -34,6 +34,7 @@ public: dup_func_t dup; close_func_t close; ioctl_func_t ioctl; + ioctl_func_t ioctl_time64; mmap_func_t mmap; munmap_func_t munmap; }; @@ -50,6 +51,7 @@ public: int fd, off64_t offset); int munmap(void *addr, size_t length); int ioctl(int fd, unsigned long request, void *arg); + int ioctl_time64(int fd, unsigned long request, void *arg); private: V4L2CompatManager(); From patchwork Mon Nov 16 00:50:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 28912 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C2E80C3304 for ; Mon, 16 Nov 2026 00:50:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 690B16A833; Mon, 16 Nov 2026 01:50:52 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JBuDs31f"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A84086A836 for ; Mon, 16 Nov 2026 01:50:47 +0100 (CET) Received: from killaraus.ideasonboard.com (81-175-209-152.bb.dnainternet.fi [81.175.209.152]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 135DD4BB; Mon, 16 Nov 2026 01:48:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1794790101; bh=Pp/MizQ2YcFEHM4MIYFlJU2KGx1uW45fF0UON4TXKLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBuDs31f0gL/Mi8lz8taCKBVQRIEXGrjS6HxMwXCjesjh+pEFbZBBLx9eItozu8Cp O/AqYbMCFZHjMU6Bn2k1EcTuDmqVgsrhpxhxwTg5q3sAEXwV8GG+gfNaqB27c9MNoA 4Ww4PJmTJBiADUDxS/Rbp1VAcvysEv/9W/Dr9Gt4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , Prasanth R Subject: [PATCH v3 2/2] v4l2: v4l2_compat: Compile compat layer core with native time_t Date: Mon, 16 Nov 2026 02:50:43 +0200 Message-ID: <20261116005043.1651041-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116005043.1651041-1-laurent.pinchart@ideasonboard.com> References: <20261116005043.1651041-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" On 32-bit systems, the whole libcamera V4L2 compatibility layer is compiled with 32-bit time_t as a consequence of disabling transparent large file support that in turn requires undefining _TIME_BITS. The compatibility layer ends up using the 32-bit time_t layout of V4L2 ioctl structures. This breaks applications compiled with 64-bit time_t support. Fixing this for all use cases requires translating between structures that use 32-bit and 64-bit time_t. A simpler partial solution is however possible for the most common cases. Transparent large file support and time_t impact different parts of the V4L2 compatibility layer. The former is only needed in the entry points, handled in v4l2_compat.cpp, while the latter only impacts the V4L2 ioctl handlers in v4l2_camera_proxy.cpp. We can compile the entry points with transparent large file support disabled (and therefore with 32-bit time_t), and the rest of the compatibility later with the system defaults. Applications using the same time_t size as the system default will work correctly. Two cases will still be unsupported: - Applications using 64-bit time_t on a 32-bit time_t system - Applications using 32-bit time_t on a 64-bit time_t system The former should be very rare, as systems are transitioning to 64-bit time_t. The latter is likely less rare, but is still not a very common use case. Implement the simpler fix for the time being. If hybrid time_t use cases need to be supported, translation between ioctl structures will be implemented. Closes: https://gitlab.freedesktop.org/camera/libcamera/-/issues/290 Signed-off-by: Laurent Pinchart --- src/v4l2/meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index 2c0404147183..8674040f121f 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -10,10 +10,13 @@ v4l2_compat_sources = files([ 'v4l2_camera.cpp', 'v4l2_camera_file.cpp', 'v4l2_camera_proxy.cpp', - 'v4l2_compat.cpp', 'v4l2_compat_manager.cpp', ]) +v4l2_compat_cpp_sources = files([ + 'v4l2_compat.cpp', +]) + v4l2_compat_cpp_args = [ # Meson enables large file support unconditionally, which redirect file # operations to 64-bit versions. This results in some symbols being @@ -27,9 +30,16 @@ v4l2_compat_cpp_args = [ '-fvisibility=hidden', ] + +v4l2_compat_core = static_library('v4l2-compat-core', + v4l2_compat_sources, + install : false, + dependencies : [libcamera_private, libdl]) + v4l2_compat = shared_library('v4l2-compat', - v4l2_compat_sources, + v4l2_compat_cpp_sources, name_prefix : '', + link_with : v4l2_compat_core, install : true, install_dir : libcamera_libexecdir, dependencies : [libcamera_private, libdl],