From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F116314F9D6 for ; Tue, 4 Feb 2025 15:31:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738683074; cv=none; b=PLo3cFb6/t7qAyCezQd7QCSVGMLcv7ITm7xurliBChfIOn2/kdNVsuaTnkDi2bS9VTctxFi5B4v81fYQg+FrxZ0D8WLyCIu11+RD1zA9pEz2qwhVTtQlAjrzFDsmOx/0Q/nBK7CuvUnzLpAZOD4H7nUOFLEs6wPIq3xqzN6JB78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738683074; c=relaxed/simple; bh=w7uyyrr4hji67+OQhdxfK+juNW+27vozeL0bcgS/b6o=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iiqIUhMwmNO7hBfgF/cGYaT9dtbrdgihm8+qgjuXtQDKU3nCFXeQuPS8TNB1V754pgyud3UgYmnUdwzn4X3xFOP+HvjvB6K+tb12XZBgOIHpO2kHdfi7KPoFYH3Kc4cv1/MAfzuR3JCbvlf8x7a+rRT83c/z8Ybyvj2DhmzZXm0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net; spf=none smtp.mailfrom=ursulin.net; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b=JdYZoNMi; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ursulin.net Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ursulin.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ursulin-net.20230601.gappssmtp.com header.i=@ursulin-net.20230601.gappssmtp.com header.b="JdYZoNMi" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4361b6f9faeso35667455e9.1 for ; Tue, 04 Feb 2025 07:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20230601.gappssmtp.com; s=20230601; t=1738683071; x=1739287871; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YO04QLH+X8zKP3vbuSZ62NP1UERnKX1EVSjge29Xk6E=; b=JdYZoNMiFf8s6Ue571L77VD5phGSxyXzgIJ2V7X7PvN6Kb0XMhua73PXrYGp6RIfnU n8hSxeLZfZE9SipOlTk+cDX2L98XhupRgmX2yRAXsyLztQMquICYIP31i4gWMQWx93JZ Q9oVoMDz9OlzPM52n2j/T98C9Ii+nwjrzo/lX+st77kv3Haqxf3WtTJkzUKuhkNur5Vf cnSitxjuEOB6JXBEonyuyXfwA34WiOanDPyjZ4PS4IhlEzmd/Jmh7L7Rq/wK8GVjIg8f 4bDfSlfOxP/mP7aXfxCdch27JW46mtWpf8293fvc29bzNBYjLePTVSh4/nmwuJ0O9xh7 ICpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738683071; x=1739287871; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YO04QLH+X8zKP3vbuSZ62NP1UERnKX1EVSjge29Xk6E=; b=hG1xhu9p0wxRWfkKBTN8IddvpalnnZLZVzAI3Gjotui53gMc6IiAxNgHCCczEceiE6 Br3ExlWA5B3xUSqkT0u1+QkMq+5cDWWN+IY5zCYkc3zhUzuw1BNLoskSeIKRNLF871Lp EBQLxHg7e2o53JTyvzKjb9EvmSn3CR7WQESveEZd2k40GBSVF8AvkKJDHflNWj8Hs4VH 7dDx28fgBK//CsW1uZz0YF6KUowBLVwhI6nnK/MSwE8/wp+qcvk3LJVwTnfIqiV79Ej5 RIZXybcM+uuttu28eLvSnUx6i4PVXpMUtIDBKXFuwRhGfWDp9/8KP3xDb7nc5bqrjXA+ Iuuw== X-Forwarded-Encrypted: i=1; AJvYcCWZYRTfCWaDiuYa/BnET4mloAXNjAVKCrJfPNrukhX5i1jIKYAqUv/zM1yTpLn9kdUQmwUoUwmpZe7pAig=@vger.kernel.org X-Gm-Message-State: AOJu0YyP7Ak88vasaXPi0xBXuWv2AGTZJm9R9mdVxrtMQbb7CinpwiWC wtENzeDOgCBjXsz+VKMlQHzdoeLV21i5SR5FYo4Tw0O2K5o8ApmA4nG2nmX5u8Y= X-Gm-Gg: ASbGncu93ybTAn6DEUlBbRg3MCWylXTsVQrn3nQnSpOx8dkPTfKqaL+lfDFUGQFd0Iv DuoRxKZw+m+OxPjw9Qzv54N5EYyBYYVhIFcVtkb2UkWTab4Tmdc5i611DDUEbFRt/lNVqHa0zyi 7j7wOhOWq+7z8grA2do9uz9YUTmye+JE5XI33e+M3vi2hE7+GzK3temmY/U6rwQ2PDkf9REl4B5 ihpVeB4m3NCars/0s6hVaZpn6sBxh8xfX2maLZ6OfZKxNW/OQUv033Q0Ovlycaqs4Opgmqsk2JE 31NZ5DXNuEqVg/zi7N7kO30Z6qhxz4g= X-Google-Smtp-Source: AGHT+IGyCOrMOzLOqDd5nklSWFy5dFMUUbqMYwM7tDC92GnRTMCdM70CAqKld747kDZSUFBqJ1B0DA== X-Received: by 2002:a05:600c:3ac4:b0:436:185f:dfae with SMTP id 5b1f17b1804b1-43905f6ab6amr24808885e9.6.1738683069360; Tue, 04 Feb 2025 07:31:09 -0800 (PST) Received: from [192.168.0.101] ([90.241.98.187]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438e23de772sm191993285e9.13.2025.02.04.07.31.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 07:31:08 -0800 (PST) Message-ID: Date: Tue, 4 Feb 2025 15:31:07 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 5/7] drm/sched: trace dependencies for gpu jobs To: Pierre-Eric Pelloux-Prayer , Luben Tuikov , Matthew Brost , Danilo Krummrich , Philipp Stanner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?UTF-8?Q?Christian_K=C3=B6nig?= Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org References: <20250131110328.706695-1-pierre-eric.pelloux-prayer@amd.com> <20250131110328.706695-6-pierre-eric.pelloux-prayer@amd.com> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <20250131110328.706695-6-pierre-eric.pelloux-prayer@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 31/01/2025 11:03, Pierre-Eric Pelloux-Prayer wrote: > Trace the fence dependencies similarly to how we print fences: > > ... , dependencies:{fence=606:38006} > > This allows tools to analyze the dependencies between the jobs (previously > it was only possible for fences traced by drm_sched_job_wait_dep). > > Since drm_sched_job and drm_run_job use the same base event class, > the caller of trace_drm_run_job have to pass a dep_count of 0 (which > is ignored because dependencies are only considered at submit time). > > Signed-off-by: Pierre-Eric Pelloux-Prayer > --- > .../gpu/drm/scheduler/gpu_scheduler_trace.h | 59 ++++++++++++++++--- > drivers/gpu/drm/scheduler/sched_entity.c | 8 ++- > drivers/gpu/drm/scheduler/sched_main.c | 2 +- > 3 files changed, 58 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > index 3cdd8d8f8021..ca19cd9a146a 100644 > --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h > @@ -26,15 +26,41 @@ > > #include > #include > +#include > #include > > #undef TRACE_SYSTEM > #define TRACE_SYSTEM gpu_scheduler > #define TRACE_INCLUDE_FILE gpu_scheduler_trace > > +#ifndef __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN > +#define __TRACE_EVENT_GPU_SCHEDULER_PRINT_FN > +/* Similar to trace_print_array_seq but for fences. */ > +static inline const char *__print_dma_fence_array(struct trace_seq *p, const void *buf, int count) > +{ > + const char *ret = trace_seq_buffer_ptr(p); > + u64 *fences = (u64 *) buf; > + const char *prefix = ""; > + > + trace_seq_putc(p, '{'); > + for (int i = 0; i < count; i++) { > + u64 context = fences[2 * i], seqno = fences[2 * i + 1]; > + > + trace_seq_printf(p, "%sfence=%llu:%llu", > + prefix, context, seqno); > + prefix = ","; > + } > + trace_seq_putc(p, '}'); > + trace_seq_putc(p, 0); > + > + return ret; > +} > +#endif > + > DECLARE_EVENT_CLASS(drm_sched_job, > - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), > - TP_ARGS(sched_job, entity), > + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, > + unsigned int dep_count), > + TP_ARGS(sched_job, entity, dep_count), > TP_STRUCT__entry( > __field(uint64_t, id) > __string(name, sched_job->sched->name) > @@ -43,9 +69,14 @@ DECLARE_EVENT_CLASS(drm_sched_job, > __string(dev, dev_name(sched_job->sched->dev)) > __field(uint64_t, fence_context) > __field(uint64_t, fence_seqno) > + __field(int, n_deps) > + __dynamic_array(u64, deps, dep_count * 2) > ), > > TP_fast_assign( > + unsigned long idx; > + struct dma_fence *fence; > + u64 *dyn_arr; > __entry->id = sched_job->id; > __assign_str(name); > __entry->job_count = spsc_queue_count(&entity->job_queue); > @@ -54,22 +85,32 @@ DECLARE_EVENT_CLASS(drm_sched_job, > __assign_str(dev); > __entry->fence_context = sched_job->s_fence->finished.context; > __entry->fence_seqno = sched_job->s_fence->finished.seqno; > - > + __entry->n_deps = dep_count; > + if (dep_count) { > + dyn_arr = __get_dynamic_array(deps); > + xa_for_each(&sched_job->dependencies, idx, fence) { > + dyn_arr[2 * idx] = fence->context; > + dyn_arr[2 * idx + 1] = fence->seqno; > + } > + } > ), > - TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d", > + TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d, dependencies:%s", > __get_str(dev), __entry->id, > __entry->fence_context, __entry->fence_seqno, __get_str(name), > - __entry->job_count, __entry->hw_job_count) > + __entry->job_count, __entry->hw_job_count, > + __print_dma_fence_array(p, __get_dynamic_array(deps), __entry->n_deps)) > ); > > DEFINE_EVENT(drm_sched_job, drm_sched_job, > - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), > - TP_ARGS(sched_job, entity) > + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, > + unsigned int dep_count), > + TP_ARGS(sched_job, entity, dep_count) > ); > > DEFINE_EVENT(drm_sched_job, drm_run_job, > - TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), > - TP_ARGS(sched_job, entity) > + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity, > + unsigned int dep_count), > + TP_ARGS(sched_job, entity, 0) > ); > > TRACE_EVENT(drm_sched_process_job, > diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c > index 69bcf0e99d57..0ce3a82fe6fd 100644 > --- a/drivers/gpu/drm/scheduler/sched_entity.c > +++ b/drivers/gpu/drm/scheduler/sched_entity.c > @@ -592,7 +592,13 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job) > bool first; > ktime_t submit_ts; > > - trace_drm_sched_job(sched_job, entity); > + if (trace_drm_sched_job_enabled()) { > + unsigned long index, n = 0; > + void *f; > + > + xa_for_each(&sched_job->dependencies, index, f) { n++; } > + trace_drm_sched_job(sched_job, entity, n); > + } I wonder if it would be good enough to simply trace dependencies one by one in drm_sched_job_add_dependency and drop all the array magic/support code? In which case that was the drm_sched_job_depdency tracepoint I hinted in my reply to 4/7. I know you are at v7 but as we are going towards the stable ABI route I am thinking it is worth discussing this option. We could even leave the separate "wait dep" vs "add dep" and have a set like: drm_sched_job_add_dependency drm_sched_job_queue drm_sched_job_wait_dependency drm_sched_job_run drm_sched_job_done By tracing them one by one we remove the complications from the kernel side and let the userspace parse multiple lines. Shouldn't be a problem for there. Regards, Tvrtko > atomic_inc(entity->rq->sched->score); > WRITE_ONCE(entity->last_user, current->group_leader); > > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > index ad306d3d7282..c645f07ebe26 100644 > --- a/drivers/gpu/drm/scheduler/sched_main.c > +++ b/drivers/gpu/drm/scheduler/sched_main.c > @@ -1214,7 +1214,7 @@ static void drm_sched_run_job_work(struct work_struct *w) > atomic_add(sched_job->credits, &sched->credit_count); > drm_sched_job_begin(sched_job); > > - trace_drm_run_job(sched_job, entity); > + trace_drm_run_job(sched_job, entity, 0); > fence = sched->ops->run_job(sched_job); > complete_all(&entity->entity_idle); > drm_sched_fence_scheduled(s_fence, fence);