AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: James Zhu <James.Zhu@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Felix.kuehling@amd.com, jamesz@amd.com
Subject: [PATCH v3 4/5] drm/amdkfd: update user space last_event_age
Date: Thu, 8 Jun 2023 13:07:04 -0400	[thread overview]
Message-ID: <20230608170705.2271276-5-James.Zhu@amd.com> (raw)
In-Reply-To: <20230608170705.2271276-1-James.Zhu@amd.com>

Update user space last_event_age when event age is enabled.
It is only for KFD_EVENT_TYPE_SIGNAL which is checked by user space.

Signed-off-by: James Zhu <James.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_events.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index 4c6907507190..9fcfec57a094 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -863,22 +863,29 @@ static int copy_signaled_event_data(uint32_t num_events,
 		struct kfd_event_waiter *event_waiters,
 		struct kfd_event_data __user *data)
 {
-	struct kfd_hsa_memory_exception_data *src;
-	struct kfd_hsa_memory_exception_data __user *dst;
+	void *src;
+	void __user *dst;
 	struct kfd_event_waiter *waiter;
 	struct kfd_event *event;
-	uint32_t i;
+	uint32_t i, size = 0;
 
 	for (i = 0; i < num_events; i++) {
 		waiter = &event_waiters[i];
 		event = waiter->event;
 		if (!event)
 			return -EINVAL; /* event was destroyed */
-		if (waiter->activated && event->type == KFD_EVENT_TYPE_MEMORY) {
-			dst = &data[i].memory_exception_data;
-			src = &event->memory_exception_data;
-			if (copy_to_user(dst, src,
-				sizeof(struct kfd_hsa_memory_exception_data)))
+		if (waiter->activated) {
+			if (event->type == KFD_EVENT_TYPE_MEMORY) {
+				dst = &data[i].memory_exception_data;
+				src = &event->memory_exception_data;
+				size = sizeof(struct kfd_hsa_memory_exception_data);
+			} else if (event->type == KFD_EVENT_TYPE_SIGNAL &&
+				waiter->event_age_enabled) {
+				dst = &data[i].signal_event_data.last_event_age;
+				src = &event->event_age;
+				size = sizeof(u64);
+			}
+			if (size && copy_to_user(dst, src, size))
 				return -EFAULT;
 		}
 	}
-- 
2.34.1


  parent reply	other threads:[~2023-06-08 17:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-08 17:07 [PATCH v3 0/5] new event wait support James Zhu
2023-06-08 17:07 ` [PATCH v3 1/5] drm/amdkfd: add event age tracking James Zhu
2023-06-08 17:07 ` [PATCH v3 2/5] drm/amdkfd: add event_age tracking when receiving interrupt James Zhu
2023-06-08 17:07 ` [PATCH v3 3/5] drm/amdkfd: set activated flag true when event age unmatchs James Zhu
2023-06-09 19:43   ` Felix Kuehling
2023-06-09 19:47     ` James Zhu
2023-06-09 20:13   ` [PATCH v4 " James Zhu
2023-06-09 20:22     ` Felix Kuehling
2023-06-09 20:27       ` James Zhu
2023-06-09 20:43   ` [PATCH v5 " James Zhu
2023-06-09 22:44     ` Felix Kuehling
2023-06-12 16:19       ` Yat Sin, David
2023-06-12 16:31         ` Felix Kuehling
2023-06-08 17:07 ` James Zhu [this message]
2023-06-08 17:07 ` [PATCH v3 5/5] drm/amdkfd: bump kfd ioctl minor version for event age availability James Zhu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230608170705.2271276-5-James.Zhu@amd.com \
    --to=james.zhu@amd.com \
    --cc=Felix.kuehling@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=jamesz@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox