nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 09:12:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: allocate comptags and store metadata in REGISTER_BUFFER ioctl

Browse Source 
To enable userspace query about comptags allocation status of a buffer,
comptags are to be allocated only during buffer registration done by
nvrm_gpu. Earlier, they were allocated during map.

nvrm_gpu will be sending metadata blob to be associated with the buffer.
This will have to be stored in the dmabuf privdata for all the buffers
registered by nvrm_gpu.

This patch moves the privdata allocation to buffer registration ioctl.

Remove g->mm.priv_lock as it is not needed now. This lock was added
to protect dmabuf private data setup. That private data is now
handled through dmabuf->ops and setup of dmabuf->ops is done
under dmabuf->lock.

To support legacy userspace, this patch still allocates comptags on
demand on map calls for unregistered buffers.

Bug 200586313

Change-Id: I88b2ca04c733dd02a84bcbf05060bddc00147790
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2480761
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sagar Kamble
2020-12-10 18:35:32 +05:30
committed by mobile promotions
parent 8a4b72a4aa
commit ed16377983
16 changed files with 456 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/uapi/linux/nvgpu-ctrl.h
View File

@@ -186,7 +186,11 @@ struct nvgpu_gpu_zbc_query_table_args {
#define NVGPU_GPU_FLAGS_SUPPORT_SMPC_GLOBAL_MODE (1ULL << 48)
/* Retrieving contents of graphics context is supported */
#define NVGPU_GPU_FLAGS_SUPPORT_GET_GR_CONTEXT (1ULL << 49)
/* Additional buffer metadata association supported */
/*
* Note: Additional buffer metadata association support. This feature is only
* for supporting legacy userspace APIs and for compatibility with desktop
* RM behavior. Usage of this feature should be avoided.
*/
#define NVGPU_GPU_FLAGS_SUPPORT_BUFFER_METADATA (1ULL << 50)
/* Flag to indicate whether configuring L2_MAXEVICTLAST_WAYS is supported */
#define NVGPU_GPU_FLAGS_L2_MAX_WAYS_EVICT_LAST_ENABLED (1ULL << 51)
@@ -940,6 +944,25 @@ struct nvgpu_gpu_set_deterministic_opts_args {
__u64 channels; /* in */
};
/*
* register buffer information ioctl.
*
* Note: Additional metadata is associated with the buffer only for supporting
* legacy userspace APIs and for compatibility with desktop RM. Usage of this
* API should be avoided.
*
* This ioctl allocates comptags for the buffer if requested/required
* by libnvrm_gpu and associates metadata blob sent by libnvrm_gpu
* with the buffer in the buffer privdata.
*
* return 0 on success, < 0 in case of failure.
* retval -EINVAL if the enabled flag NVGPU_SUPPORT_BUFFER_METADATA
* isn't set or invalid params.
* retval -ENOMEM in case of sufficient memory is not available for
* privdata or comptags.
* retval -EFAULT if the metadata blob copy fails.
*/
/*
* NVGPU_GPU_COMPTAGS_ALLOC_NONE: Specified to not allocate comptags
* for the buffer.
@@ -967,20 +990,46 @@ struct nvgpu_gpu_set_deterministic_opts_args {
*/
#define NVGPU_GPU_REGISTER_BUFFER_FLAGS_COMPTAGS_ALLOCATED (1U << 0)
/*
* Specify buffer registration as mutable. This allows modifying the buffer
* attributes by calling this IOCTL again with NVGPU_GPU_REGISTER_BUFFER_FLAGS_MODIFY.
*
* Mutable registration is intended for private buffers where the physical
* memory allocation may be recycled. Buffers intended for interoperability
* should be specified without this flag.
*/
#define NVGPU_GPU_REGISTER_BUFFER_FLAGS_MUTABLE (1U << 1)
/*
* Re-register the buffer. When this flag is set, the buffer comptags state,
* metadata binary blob, and other attributes are re-defined.
*
* This flag may be set only when the buffer was previously registered as
* mutable. This flag is ignored when the buffer is registered for the
* first time.
*
* If the buffer previously had comptags and the re-registration also specifies
* comptags, the associated comptags are not cleared.
*
*/
#define NVGPU_GPU_REGISTER_BUFFER_FLAGS_MODIFY (1U << 2)
/* Maximum size of the user supplied buffer metadata */
#define NVGPU_GPU_REGISTER_BUFFER_METADATA_MAX_SIZE 256U
/*
* REGISTER_BUFFER ioctl is supported when the enabled flag
* NVGPU_GPU_FLAGS_SUPPORT_BUFFER_METADATA is set. It will
* return -EINVAL if that enabled flag isn't enabled.
* register buffer ioctl arguments struct.
*
* Note: Additional metadata is associated with the buffer only for supporting
* legacy userspace APIs and for compatibility with desktop RM. Usage of this
* API should be avoided.
*/
struct nvgpu_gpu_register_buffer_args {
/* [in] dmabuf fd */
__s32 dmabuf_fd;
/*
* [in] Compression tags allocation control.
* [in] Compression tags allocation control.
*
* Set to one of the NVGPU_GPU_COMPTAGS_ALLOC_* values. See the
* description of the values for semantics of this field.
@@ -990,7 +1039,7 @@ struct nvgpu_gpu_register_buffer_args {
__u16 reserved1;
/*
* [in] Pointer to buffer metadata.
* [in] Pointer to buffer metadata.
*
* This is a binary blob populated by nvrm_gpu that will be associated
* with the dmabuf.
@@ -1000,9 +1049,8 @@ struct nvgpu_gpu_register_buffer_args {
/* [in] buffer metadata size */
__u32 metadata_size;
/*
* [out] flags.
* [in/out] flags.
*
* See description of NVGPU_GPU_REGISTER_BUFFER_FLAGS_* for semantics
* of this field.