Skip to contentSkip to conversation

drm/amdgpu: extend vm flags to 64-bit in tracepoint

PATCH In review Junwei Zhang 2 participants 4 messages Apr 24, 2017 – Apr 25, 2017 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: extend vm flags to 64-bit in tracepoint

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +9 -9
index 8676eff..998ff4d 100644
@@ -221,7 +221,7 @@
 			     __field(long, start)
 			     __field(long, last)
 			     __field(u64, offset)
-			     __field(u32, flags)
+			     __field(u64, flags)
 			     ),
 
 	    TP_fast_assign(
@@ -231,7 +231,7 @@
 			   __entry->offset = mapping->offset;
 			   __entry->flags = mapping->flags;
 			   ),
-	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",
 		      __entry->bo, __entry->start, __entry->last,
 		      __entry->offset, __entry->flags)
 );
@@ -245,7 +245,7 @@
 			     __field(long, start)
 			     __field(long, last)
 			     __field(u64, offset)
-			     __field(u32, flags)
+			     __field(u64, flags)
 			     ),
 
 	    TP_fast_assign(
@@ -255,7 +255,7 @@
 			   __entry->offset = mapping->offset;
 			   __entry->flags = mapping->flags;
 			   ),
-	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",
 		      __entry->bo, __entry->start, __entry->last,
 		      __entry->offset, __entry->flags)
 );
@@ -266,7 +266,7 @@
 	    TP_STRUCT__entry(
 			     __field(u64, soffset)
 			     __field(u64, eoffset)
-			     __field(u32, flags)
+			     __field(u64, flags)
 			     ),
 
 	    TP_fast_assign(
@@ -274,7 +274,7 @@
 			   __entry->eoffset = mapping->it.last + 1;
 			   __entry->flags = mapping->flags;
 			   ),
-	    TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
+	    TP_printk("soffs=%010llx, eoffs=%010llx, flags=%010llx",
 		      __entry->soffset, __entry->eoffset, __entry->flags)
 );
 
@@ -290,14 +290,14 @@
 
 TRACE_EVENT(amdgpu_vm_set_ptes,
 	    TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
-		     uint32_t incr, uint32_t flags),
+		     uint32_t incr, uint64_t flags),
 	    TP_ARGS(pe, addr, count, incr, flags),
 	    TP_STRUCT__entry(
 			     __field(u64, pe)
 			     __field(u64, addr)
 			     __field(u32, count)
 			     __field(u32, incr)
-			     __field(u32, flags)
+			     __field(u64, flags)
 			     ),
 
 	    TP_fast_assign(
@@ -307,7 +307,7 @@
 			   __entry->incr = incr;
 			   __entry->flags = flags;
 			   ),
-	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, count=%u",
+	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%010Lx, count=%u",
 		      __entry->pe, __entry->addr, __entry->incr,
 		      __entry->flags, __entry->count)
 );
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1493016220-2645-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Am 24.04.2017 um 08:43 schrieb Junwei Zhang:

Quoted 19 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
index 8676eff..998ff4d 100644
@@ -221,7 +221,7 @@
  			     __field(long, start)
  			     __field(long, last)
  			     __field(u64, offset)
-			     __field(u32, flags)
+			     __field(u64, flags)
  			     ),
 
  	    TP_fast_assign(

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h line 234

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
@@ -231,7 +231,7 @@
  			   __entry->offset = mapping->offset;
  			   __entry->flags = mapping->flags;
  			   ),
-	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",

The full 64bit flags need to be printed with %016llx.

We only use %010llx for the 40bit addresses and even that needs to be extended to %048llx for Vega10.

With that fixed the patch is Reviewed-by: Christian König <[email protected]>

Regards,
Christian.

Quoted 57 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +6 -6
  		      __entry->bo, __entry->start, __entry->last,
  		      __entry->offset, __entry->flags)
  );
@@ -245,7 +245,7 @@
  			     __field(long, start)
  			     __field(long, last)
  			     __field(u64, offset)
-			     __field(u32, flags)
+			     __field(u64, flags)
  			     ),
 
  	    TP_fast_assign(
@@ -255,7 +255,7 @@
  			   __entry->offset = mapping->offset;
  			   __entry->flags = mapping->flags;
  			   ),
-	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",
  		      __entry->bo, __entry->start, __entry->last,
  		      __entry->offset, __entry->flags)
  );
@@ -266,7 +266,7 @@
  	    TP_STRUCT__entry(
  			     __field(u64, soffset)
  			     __field(u64, eoffset)
-			     __field(u32, flags)
+			     __field(u64, flags)
  			     ),
 
  	    TP_fast_assign(
@@ -274,7 +274,7 @@
  			   __entry->eoffset = mapping->it.last + 1;
  			   __entry->flags = mapping->flags;
  			   ),
-	    TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
+	    TP_printk("soffs=%010llx, eoffs=%010llx, flags=%010llx",
  		      __entry->soffset, __entry->eoffset, __entry->flags)
  );
 
@@ -290,14 +290,14 @@
 
  TRACE_EVENT(amdgpu_vm_set_ptes,
  	    TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
-		     uint32_t incr, uint32_t flags),
+		     uint32_t incr, uint64_t flags),
  	    TP_ARGS(pe, addr, count, incr, flags),
  	    TP_STRUCT__entry(
  			     __field(u64, pe)
  			     __field(u64, addr)
  			     __field(u32, count)
  			     __field(u32, incr)
-			     __field(u32, flags)
+			     __field(u64, flags)
  			     ),
 
  	    TP_fast_assign(

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h line 313

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
@@ -307,7 +307,7 @@
  			   __entry->incr = incr;
  			   __entry->flags = flags;
  			   ),
-	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, count=%u",
+	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%010Lx, count=%u",
  		      __entry->pe, __entry->addr, __entry->incr,
  		      __entry->flags, __entry->count)
  );

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 87ebb269-c73d-1ab5-5004-aaf1f8bf9514-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#4 lore raw

Am 24.04.2017 um 10:55 schrieb Christian König:

Quoted 29 lines

Am 24.04.2017 um 08:43 schrieb Junwei Zhang:

Quoted 18 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
index 8676eff..998ff4d 100644
@@ -221,7 +221,7 @@
                   __field(long, start)
                   __field(long, last)
                   __field(u64, offset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h line 236

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
@@ -231,7 +231,7 @@
                 __entry->offset = mapping->offset;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, 
 flags=%08x",
+        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, 
 flags=%010llx",

The full 64bit flags need to be printed with %016llx.

Quoted 1 line

We only use %010llx for the 40bit addresses and even that needs to be extended to %048llx for Vega10.

Ups, hit send to early. That should read "needs to be extended to %012llx for Vega10 because it has 48bit addresses".

Christian.

Quoted 68 lines

With that fixed the patch is Reviewed-by: Christian König <[email protected]>

Regards,
Christian.

Quoted 62 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +0 -0
                __entry->bo, __entry->start, __entry->last,
                __entry->offset, __entry->flags)

);

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +2 -2
@@ -245,7 +245,7 @@
                   __field(long, start)
                   __field(long, last)
                   __field(u64, offset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(
@@ -255,7 +255,7 @@
                 __entry->offset = mapping->offset;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, 
 flags=%08x",
+        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, 
 flags=%010llx",
                __entry->bo, __entry->start, __entry->last,
                __entry->offset, __entry->flags)

);

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +2 -2
@@ -266,7 +266,7 @@
          TP_STRUCT__entry(
                   __field(u64, soffset)
                   __field(u64, eoffset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(
@@ -274,7 +274,7 @@
                 __entry->eoffset = mapping->it.last + 1;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
+        TP_printk("soffs=%010llx, eoffs=%010llx, flags=%010llx",
                __entry->soffset, __entry->eoffset, __entry->flags)
  );
  @@ -290,14 +290,14 @@

TRACE_EVENT(amdgpu_vm_set_ptes,
TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +3 -3
-             uint32_t incr, uint32_t flags),
+             uint32_t incr, uint64_t flags),
          TP_ARGS(pe, addr, count, incr, flags),
          TP_STRUCT__entry(
                   __field(u64, pe)
                   __field(u64, addr)
                   __field(u32, count)
                   __field(u32, incr)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(
@@ -307,7 +307,7 @@
                 __entry->incr = incr;
                 __entry->flags = flags;
                 ),
-        TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, 
 count=%u",
+        TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%010Lx, 
 count=%u",
                __entry->pe, __entry->addr, __entry->incr,
Quoted 8 lines
Quoted 2 lines
                __entry->flags, __entry->count)

);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 8d18068b-37a3-4a1b-b86d-6d9fcb171699-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#6 lore raw
Quoted 29 lines · Christian König

Am 24.04.2017 um 10:55 schrieb Christian König:

Quoted 28 lines

Am 24.04.2017 um 08:43 schrieb Junwei Zhang:

Quoted 19 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
index 8676eff..998ff4d 100644
@@ -221,7 +221,7 @@
                   __field(long, start)
                   __field(long, last)
                   __field(u64, offset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h line 234

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
@@ -231,7 +231,7 @@
                 __entry->offset = mapping->offset;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",

The full 64bit flags need to be printed with %016llx.

Quoted 5 lines
Quoted 2 lines

We only use %010llx for the 40bit addresses and even that needs to be extended to %048llx for Vega10.

Ups, hit send to early. That should read "needs to be extended to %012llx for Vega10 because it has 48bit addresses".

You reminder me that the flags may be printed as:
- flags: %015llx (58-bit at most for vega10)

About the address, like offset/soffs/eoffs/pe/addr, need to be
- addr: %012llx (48-bit)

How do you think about it?

BTW, anyway it turns out to print the correct result, even if the format is less than the output.

Jerry

Quoted 78 lines

Christian.

Quoted 73 lines

With that fixed the patch is Reviewed-by: Christian König <[email protected]>

Regards,
Christian.

Quoted 52 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +4 -4
                __entry->bo, __entry->start, __entry->last,
                __entry->offset, __entry->flags)
  );
@@ -245,7 +245,7 @@
                   __field(long, start)
                   __field(long, last)
                   __field(u64, offset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(
@@ -255,7 +255,7 @@
                 __entry->offset = mapping->offset;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",
+        TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%010llx",
                __entry->bo, __entry->start, __entry->last,
                __entry->offset, __entry->flags)
  );
@@ -266,7 +266,7 @@
          TP_STRUCT__entry(
                   __field(u64, soffset)
                   __field(u64, eoffset)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(
@@ -274,7 +274,7 @@
                 __entry->eoffset = mapping->it.last + 1;
                 __entry->flags = mapping->flags;
                 ),
-        TP_printk("soffs=%010llx, eoffs=%010llx, flags=%08x",
+        TP_printk("soffs=%010llx, eoffs=%010llx, flags=%010llx",
                __entry->soffset, __entry->eoffset, __entry->flags)
  );
  @@ -290,14 +290,14 @@

TRACE_EVENT(amdgpu_vm_set_ptes,
TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +2 -2
-             uint32_t incr, uint32_t flags),
+             uint32_t incr, uint64_t flags),
          TP_ARGS(pe, addr, count, incr, flags),
          TP_STRUCT__entry(
                   __field(u64, pe)
                   __field(u64, addr)
                   __field(u32, count)
                   __field(u32, incr)
-                 __field(u32, flags)
+                 __field(u64, flags)
                   ),
            TP_fast_assign(

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h line 313

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +1 -1
@@ -307,7 +307,7 @@
                 __entry->incr = incr;
                 __entry->flags = flags;
                 ),
-        TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%08x, count=%u",
+        TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%010Lx, count=%u",
                __entry->pe, __entry->addr, __entry->incr,
                __entry->flags, __entry->count)
  );

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx