Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C037C433EF for ; Thu, 26 May 2022 17:36:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 99CA710E630; Thu, 26 May 2022 17:36:30 +0000 (UTC) Received: from mail-40136.proton.ch (mail-40136.proton.ch [185.70.40.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id B374B10E630 for ; Thu, 26 May 2022 17:36:28 +0000 (UTC) Date: Thu, 26 May 2022 17:36:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emersion.fr; s=protonmail2; t=1653586586; x=1653845786; bh=txweeAJ1rZv2DCIYdqWpWTX7sSgQeIFtPSLSqchfhMY=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=ndIL73ZXwtzit3szV+xhIvvH9UPm7I3xCDeimw0BghDFNXTZlML029E7hWFIpPVPt 8GdSeQNsoHRpNSbfA3qRcrnODSXcxeUOGAF0RwC+dnzVn1ms4nDE2C2kDWAyTqsqS+ KVOeQJmlzJxAEXjhlq/reTW5HTIu3ComeZE84qIu7bj23anHTmH4+VFcsbWzIwUvzV DNtfVp2w+rLIaqIDdIsl3kAHyxcX+n9KxoukNDt0bU4rQD5aTdLEOnhWYDwSRs3upx BPqPTDofgxs522n2ve6eCXyKNeDYX9rMWLYSFEbPiWhO6CUqj/EkTH8KVVIekfcEb8 KbexkmofsiXnA== To: dri-devel@lists.freedesktop.org From: Simon Ser Subject: [RFC PATCH] dma-buf: Add a capabilities directory Message-ID: <20220526173602.344386-1-contact@emersion.fr> Feedback-ID: 1358184:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Simon Ser Cc: Daniel Vetter , =?utf-8?Q?Christian_K=C3=B6nig?= , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To discover support for new DMA-BUF IOCTLs, user-space has no choice but to try to perform the IOCTL on an existing DMA-BUF. However, user-space may want to figure out whether or not the IOCTL is available before it has a DMA-BUF at hand, e.g. at initialization time in a Wayland compositor. Add a /sys/kernel/dmabuf/caps directory which allows the DMA-BUF subsystem to advertise supported features. Add a sync_file_import_export entry which indicates that importing and exporting sync_files from/to DMA-BUFs is supported. Signed-off-by: Simon Ser Cc: Jason Ekstrand Cc: Daniel Vetter Cc: Bas Nieuwenhuizen Cc: Christian K=C3=B6nig --- This depends on: https://patchwork.freedesktop.org/series/103715/ .../ABI/testing/sysfs-kernel-dmabuf-buffers | 14 ++++++ drivers/dma-buf/Makefile | 2 +- drivers/dma-buf/dma-buf-sysfs-stats.c | 13 +----- drivers/dma-buf/dma-buf-sysfs-stats.h | 6 ++- drivers/dma-buf/dma-buf.c | 43 +++++++++++++++++-- include/uapi/linux/dma-buf.h | 6 +++ 6 files changed, 66 insertions(+), 18 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers b/Docume= ntation/ABI/testing/sysfs-kernel-dmabuf-buffers index 5d3bc997dc64..682d313689d8 100644 --- a/Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers +++ b/Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers @@ -22,3 +22,17 @@ KernelVersion:=09v5.13 Contact:=09Hridya Valsaraju Description:=09This file is read-only and specifies the size of the DMA-BU= F in =09=09bytes. + +What:=09=09/sys/kernel/dmabuf/caps +Date:=09=09May 2022 +KernelVersion:=09v5.19 +Contact:=09Simon Ser +Description:=09This directory advertises DMA-BUF capabilities supported by= the +=09=09kernel. + +What:=09=09/sys/kernel/dmabuf/caps/sync_file_import_export +Date:=09=09May 2022 +KernelVersion:=09v5.19 +Contact:=09Simon Ser +Description:=09This file is read-only and advertises support for importing= and +=09=09exporting sync_files from/to DMA-BUFs. diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index 4c9eb53ba3f8..afc874272710 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y :=3D dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ -=09 dma-resv.o +=09 dma-resv.o dma-buf-sysfs-caps.o obj-$(CONFIG_DMABUF_HEAPS)=09+=3D dma-heap.o obj-$(CONFIG_DMABUF_HEAPS)=09+=3D heaps/ obj-$(CONFIG_SYNC_FILE)=09=09+=3D sync_file.o diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-bu= f-sysfs-stats.c index 2bba0babcb62..09e43c8891d6 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.c +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c @@ -141,21 +141,13 @@ static const struct kset_uevent_ops dmabuf_sysfs_no_u= event_ops =3D { =09.filter =3D dmabuf_sysfs_uevent_filter, }; =20 -static struct kset *dma_buf_stats_kset; static struct kset *dma_buf_per_buffer_stats_kset; -int dma_buf_init_sysfs_statistics(void) +int dma_buf_init_sysfs_statistics(struct kset *kset) { -=09dma_buf_stats_kset =3D kset_create_and_add("dmabuf", -=09=09=09=09=09=09 &dmabuf_sysfs_no_uevent_ops, -=09=09=09=09=09=09 kernel_kobj); -=09if (!dma_buf_stats_kset) -=09=09return -ENOMEM; - =09dma_buf_per_buffer_stats_kset =3D kset_create_and_add("buffers", =09=09=09=09=09=09=09 &dmabuf_sysfs_no_uevent_ops, -=09=09=09=09=09=09=09 &dma_buf_stats_kset->kobj); +=09=09=09=09=09=09=09 &kset->kobj); =09if (!dma_buf_per_buffer_stats_kset) { -=09=09kset_unregister(dma_buf_stats_kset); =09=09return -ENOMEM; =09} =20 @@ -165,7 +157,6 @@ int dma_buf_init_sysfs_statistics(void) void dma_buf_uninit_sysfs_statistics(void) { =09kset_unregister(dma_buf_per_buffer_stats_kset); -=09kset_unregister(dma_buf_stats_kset); } =20 int dma_buf_stats_setup(struct dma_buf *dmabuf) diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.h b/drivers/dma-buf/dma-bu= f-sysfs-stats.h index a49c6e2650cc..798c54fb8ee3 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.h +++ b/drivers/dma-buf/dma-buf-sysfs-stats.h @@ -8,9 +8,11 @@ #ifndef _DMA_BUF_SYSFS_STATS_H #define _DMA_BUF_SYSFS_STATS_H =20 +struct kset; + #ifdef CONFIG_DMABUF_SYSFS_STATS =20 -int dma_buf_init_sysfs_statistics(void); +int dma_buf_init_sysfs_statistics(struct kset *kset); void dma_buf_uninit_sysfs_statistics(void); =20 int dma_buf_stats_setup(struct dma_buf *dmabuf); @@ -18,7 +20,7 @@ int dma_buf_stats_setup(struct dma_buf *dmabuf); void dma_buf_stats_teardown(struct dma_buf *dmabuf); #else =20 -static inline int dma_buf_init_sysfs_statistics(void) +static inline int dma_buf_init_sysfs_statistics(struct kset *kset) { =09return 0; } diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 5e1b0534b3ce..b5c5a5050508 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -30,6 +30,7 @@ #include #include =20 +#include "dma-buf-sysfs-caps.h" #include "dma-buf-sysfs-stats.h" =20 static inline int is_dma_buf_file(struct file *); @@ -1546,22 +1547,54 @@ static inline void dma_buf_uninit_debugfs(void) } #endif =20 +/* Capabilities and statistics files do not need to send uevents. */ +static int dmabuf_sysfs_uevent_filter(struct kobject *kobj) +{ +=09return 0; +} + +static const struct kset_uevent_ops dmabuf_sysfs_no_uevent_ops =3D { +=09.filter =3D dmabuf_sysfs_uevent_filter, +}; + +static struct kset *dma_buf_kset; + static int __init dma_buf_init(void) { =09int ret; =20 -=09ret =3D dma_buf_init_sysfs_statistics(); +=09dma_buf_kset =3D kset_create_and_add("dmabuf", +=09=09=09=09=09 &dmabuf_sysfs_no_uevent_ops, +=09=09=09=09=09 kernel_kobj); +=09if (!dma_buf_kset) +=09=09return -ENOMEM; + +=09ret =3D dma_buf_init_sysfs_capabilities(dma_buf_kset); =09if (ret) -=09=09return ret; +=09=09goto err_kset; + +=09ret =3D dma_buf_init_sysfs_statistics(dma_buf_kset); +=09if (ret) +=09=09goto err_sysfs_caps; =20 =09dma_buf_mnt =3D kern_mount(&dma_buf_fs_type); -=09if (IS_ERR(dma_buf_mnt)) -=09=09return PTR_ERR(dma_buf_mnt); +=09if (IS_ERR(dma_buf_mnt)) { +=09=09ret =3D PTR_ERR(dma_buf_mnt); +=09=09goto err_sysfs_stats; +=09} =20 =09mutex_init(&db_list.lock); =09INIT_LIST_HEAD(&db_list.head); =09dma_buf_init_debugfs(); =09return 0; + +err_sysfs_stats: +=09dma_buf_uninit_sysfs_statistics(); +err_sysfs_caps: +=09dma_buf_uninit_sysfs_capabilities(); +err_kset: +=09kset_unregister(dma_buf_kset); +=09return ret; } subsys_initcall(dma_buf_init); =20 @@ -1570,5 +1603,7 @@ static void __exit dma_buf_deinit(void) =09dma_buf_uninit_debugfs(); =09kern_unmount(dma_buf_mnt); =09dma_buf_uninit_sysfs_statistics(); +=09dma_buf_uninit_sysfs_capabilities(); +=09kset_unregister(dma_buf_kset); } __exitcall(dma_buf_deinit); diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index 70e213a0d7d9..ab3afd5da75a 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -114,6 +114,9 @@ struct dma_buf_sync { * ordering via these fences, it is the respnosibility of userspace to use * locks or other mechanisms to ensure that no other context adds fences o= r * submits work between steps 1 and 3 above. + * + * Userspace can check the availability of this API via + * /sys/kernel/dmabuf/caps/sync_file_import_export. */ struct dma_buf_export_sync_file { =09/** @@ -146,6 +149,9 @@ struct dma_buf_export_sync_file { * synchronized APIs such as Vulkan to inter-op with dma-buf consumers * which expect implicit synchronization such as OpenGL or most media * drivers/video. + * + * Userspace can check the availability of this API via + * /sys/kernel/dmabuf/caps/sync_file_import_export. */ struct dma_buf_import_sync_file { =09/** --=20 2.36.1