History

drm/v3d: Create a CPU job extension for the copy performance query job

A CPU job is a type of job that performs operations that requires CPU intervention. A copy performance query job is a job that copy the complete or partial result of a query to a buffer. In order to copy the result of a performance query to a buffer, we need to get the values from the performance monitors. So, create a user extension for the CPU job that enables the creation of a copy performance query job. This user extension will allow the creation of a CPU job that copy the results of a performance query to a BO with the possibility to indicate the availability with a availability bit.

Maíra Canal committed 2 years ago

Commit 209e8d21 parent bae7cb54 files · +198 −0Browse files

Unified · Split

4 files
  1. drivers/gpu/drm/v3d/v3d_drv.h +1 −0
  2. drivers/gpu/drm/v3d/v3d_sched.c +65 −0
  3. drivers/gpu/drm/v3d/v3d_submit.c +82 −0
  4. include/uapi/drm/v3d_drm.h +50 −0
drivers/gpu/drm/v3d/v3d_drv.h+1−0
@@ -322,6 +322,7 @@ enum v3d_cpu_job_type { · 321 unmodified lines
322322 V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY,
323323 V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY,
324324 V3D_CPU_JOB_TYPE_RESET_PERFORMANCE_QUERY,
325+ V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY,
325326 };
326327
327328 struct v3d_timestamp_query {
drivers/gpu/drm/v3d/v3d_sched.c+65−0
@@ -452,12 +452,77 @@ v3d_reset_performance_queries(struct v3d_cpu_job *job) · 451 unmodified lines
452452 }
453453 }
454454
455+static void
456+v3d_write_performance_query_result(struct v3d_cpu_job *job, void *data, u32 query)
457+{
458+ struct v3d_performance_query_info *performance_query = &job->performance_query;
459+ struct v3d_copy_query_results_info *copy = &job->copy;
460+ struct v3d_file_priv *v3d_priv = job->base.file->driver_priv;
461+ struct v3d_dev *v3d = job->base.v3d;
462+ struct v3d_perfmon *perfmon;
463+ u64 counter_values[V3D_PERFCNT_NUM];
464+
465+ for (int i = 0; i < performance_query->nperfmons; i++) {
466+ perfmon = v3d_perfmon_find(v3d_priv,
467+ performance_query->queries[query].kperfmon_ids[i]);
468+ if (!perfmon) {
469+ DRM_DEBUG("Failed to find perfmon.");
470+ continue;
471+ }
472+
473+ v3d_perfmon_stop(v3d, perfmon, true);
474+
475+ memcpy(&counter_values[i * DRM_V3D_MAX_PERF_COUNTERS], perfmon->values,
476+ perfmon->ncounters * sizeof(u64));
477+
478+ v3d_perfmon_put(perfmon);
479+ }
480+
481+ for (int i = 0; i < performance_query->ncounters; i++)
482+ write_to_buffer(data, i, copy->do_64bit, counter_values[i]);
483+}
484+
485+static void
486+v3d_copy_performance_query(struct v3d_cpu_job *job)
487+{
488+ struct v3d_performance_query_info *performance_query = &job->performance_query;
489+ struct v3d_copy_query_results_info *copy = &job->copy;
490+ struct v3d_bo *bo = to_v3d_bo(job->base.bo[0]);
491+ struct dma_fence *fence;
492+ bool available, write_result;
493+ u8 *data;
494+
495+ v3d_get_bo_vaddr(bo);
496+
497+ data = ((u8 *)bo->vaddr) + copy->offset;
498+
499+ for (int i = 0; i < performance_query->count; i++) {
500+ fence = drm_syncobj_fence_get(performance_query->queries[i].syncobj);
501+ available = fence ? dma_fence_is_signaled(fence) : false;
502+
503+ write_result = available || copy->do_partial;
504+ if (write_result)
505+ v3d_write_performance_query_result(job, data, i);
506+
507+ if (copy->availability_bit)
508+ write_to_buffer(data, performance_query->ncounters,
509+ copy->do_64bit, available ? 1u : 0u);
510+
511+ data += copy->stride;
512+
513+ dma_fence_put(fence);
514+ }
515+
516+ v3d_put_bo_vaddr(bo);
517+}
518+
455519 static const v3d_cpu_job_fn cpu_job_function[] = {
456520 [V3D_CPU_JOB_TYPE_INDIRECT_CSD] = v3d_rewrite_csd_job_wg_counts_from_indirect,
457521 [V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY] = v3d_timestamp_query,
458522 [V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY] = v3d_reset_timestamp_queries,
459523 [V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY] = v3d_copy_query_results,
460524 [V3D_CPU_JOB_TYPE_RESET_PERFORMANCE_QUERY] = v3d_reset_performance_queries,
525+ [V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY] = v3d_copy_performance_query,
461526 };
462527
463528 static struct dma_fence *
drivers/gpu/drm/v3d/v3d_submit.c+82−0
@@ -672,6 +672,84 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv, · 671 unmodified lines
672672 return 0;
673673 }
674674
675+static int
676+v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
677+ struct drm_v3d_extension __user *ext,
678+ struct v3d_cpu_job *job)
679+{
680+ u32 __user *syncs;
681+ u64 __user *kperfmon_ids;
682+ struct drm_v3d_copy_performance_query copy;
683+
684+ if (!job) {
685+ DRM_DEBUG("CPU job extension was attached to a GPU job.\n");
686+ return -EINVAL;
687+ }
688+
689+ if (job->job_type) {
690+ DRM_DEBUG("Two CPU job extensions were added to the same CPU job.\n");
691+ return -EINVAL;
692+ }
693+
694+ if (copy_from_user(&copy, ext, sizeof(copy)))
695+ return -EFAULT;
696+
697+ if (copy.pad)
698+ return -EINVAL;
699+
700+ job->job_type = V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY;
701+
702+ job->performance_query.queries = kvmalloc_array(copy.count,
703+ sizeof(struct v3d_performance_query),
704+ GFP_KERNEL);
705+ if (!job->performance_query.queries)
706+ return -ENOMEM;
707+
708+ syncs = u64_to_user_ptr(copy.syncs);
709+ kperfmon_ids = u64_to_user_ptr(copy.kperfmon_ids);
710+
711+ for (int i = 0; i < copy.count; i++) {
712+ u32 sync;
713+ u64 ids;
714+ u32 __user *ids_pointer;
715+ u32 id;
716+
717+ if (copy_from_user(&sync, syncs++, sizeof(sync))) {
718+ kvfree(job->performance_query.queries);
719+ return -EFAULT;
720+ }
721+
722+ job->performance_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
723+
724+ if (copy_from_user(&ids, kperfmon_ids++, sizeof(ids))) {
725+ kvfree(job->performance_query.queries);
726+ return -EFAULT;
727+ }
728+
729+ ids_pointer = u64_to_user_ptr(ids);
730+
731+ for (int j = 0; j < copy.nperfmons; j++) {
732+ if (copy_from_user(&id, ids_pointer++, sizeof(id))) {
733+ kvfree(job->performance_query.queries);
734+ return -EFAULT;
735+ }
736+
737+ job->performance_query.queries[i].kperfmon_ids[j] = id;
738+ }
739+ }
740+ job->performance_query.count = copy.count;
741+ job->performance_query.nperfmons = copy.nperfmons;
742+ job->performance_query.ncounters = copy.ncounters;
743+
744+ job->copy.do_64bit = copy.do_64bit;
745+ job->copy.do_partial = copy.do_partial;
746+ job->copy.availability_bit = copy.availability_bit;
747+ job->copy.offset = copy.offset;
748+ job->copy.stride = copy.stride;
749+
750+ return 0;
751+}
752+
675753 /* Whenever userspace sets ioctl extensions, v3d_get_extensions parses data
676754 * according to the extension id (name).
677755 */
@@ -712,6 +790,9 @@ v3d_get_extensions(struct drm_file *file_priv, · 34 unmodified lines
712790 case DRM_V3D_EXT_ID_CPU_RESET_PERFORMANCE_QUERY:
713791 ret = v3d_get_cpu_reset_performance_params(file_priv, user_ext, job);
714792 break;
793+ case DRM_V3D_EXT_ID_CPU_COPY_PERFORMANCE_QUERY:
794+ ret = v3d_get_cpu_copy_performance_query_params(file_priv, user_ext, job);
795+ break;
715796 default:
716797 DRM_DEBUG_DRIVER("Unknown extension id: %d\n", ext.id);
717798 return -EINVAL;
@@ -1092,6 +1173,7 @@ static const unsigned int cpu_job_bo_handle_count[] = { · 374 unmodified lines
10921173 [V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY] = 1,
10931174 [V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY] = 2,
10941175 [V3D_CPU_JOB_TYPE_RESET_PERFORMANCE_QUERY] = 0,
1176+ [V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY] = 1,
10951177 };
10961178
10971179 /**
include/uapi/drm/v3d_drm.h+50−0
@@ -77,6 +77,7 @@ struct drm_v3d_extension { · 76 unmodified lines
7777 #define DRM_V3D_EXT_ID_CPU_RESET_TIMESTAMP_QUERY 0x04
7878 #define DRM_V3D_EXT_ID_CPU_COPY_TIMESTAMP_QUERY 0x05
7979 #define DRM_V3D_EXT_ID_CPU_RESET_PERFORMANCE_QUERY 0x06
80+#define DRM_V3D_EXT_ID_CPU_COPY_PERFORMANCE_QUERY 0x07
8081 __u32 flags; /* mbz */
8182 };
8283
@@ -519,6 +520,52 @@ struct drm_v3d_reset_performance_query { · 436 unmodified lines
519520 __u64 kperfmon_ids;
520521 };
521522
523+/**
524+ * struct drm_v3d_copy_performance_query - ioctl extension for the CPU job to copy
525+ * performance query results to a buffer
526+ *
527+ * When an extension DRM_V3D_EXT_ID_CPU_COPY_PERFORMANCE_QUERY is defined, it
528+ * points to this extension to define a copy performance query submission. This
529+ * CPU job will copy the performance queries results to a BO with the offset
530+ * and stride defined in the extension.
531+ */
532+struct drm_v3d_copy_performance_query {
533+ struct drm_v3d_extension base;
534+
535+ /* Define if should write to buffer using 64 or 32 bits */
536+ __u8 do_64bit;
537+
538+ /* Define if it can write to buffer even if the query is not available */
539+ __u8 do_partial;
540+
541+ /* Define if it should write availability bit to buffer */
542+ __u8 availability_bit;
543+
544+ /* mbz */
545+ __u8 pad;
546+
547+ /* Offset of the buffer in the BO */
548+ __u32 offset;
549+
550+ /* Stride of the buffer in the BO */
551+ __u32 stride;
552+
553+ /* Number of performance monitors */
554+ __u32 nperfmons;
555+
556+ /* Number of performance counters related to this query pool */
557+ __u32 ncounters;
558+
559+ /* Number of queries */
560+ __u32 count;
561+
562+ /* Array of performance queries's syncobjs to indicate its availability */
563+ __u64 syncs;
564+
565+ /* Array of u64 user-pointers that point to an array of kperfmon_ids */
566+ __u64 kperfmon_ids;
567+};
568+
522569 struct drm_v3d_submit_cpu {
523570 /* Pointer to a u32 array of the BOs that are referenced by the job.
524571 *
@@ -537,6 +584,9 @@ struct drm_v3d_submit_cpu { · 12 unmodified lines
537584 *
538585 * For DRM_V3D_EXT_ID_CPU_RESET_PERFORMANCE_QUERY, it must contain no
539586 * BOs.
587+ *
588+ * For DRM_V3D_EXT_ID_CPU_COPY_PERFORMANCE_QUERY, it must contain one
589+ * BO, where the performance queries will be written.
540590 */
541591 __u64 bo_handles;
542592