Make is_signed_type() simpler
PATCH 1/1 Make is_signed_type() simpler
* Simply compare -1 with 0,
* Drop unnecessary parenthesis sets
New macro leaves pointer as "unsigned type" but gives a warning, which should be fine because asking whether a pointer is signed is strange question.
I'm not sure what's going on in the i915 driver, it is shipping kernel pointers to userspace.
---
drivers/gpu/drm/i915/i915_trace.h | 86 +++++++++++++++++++------------------- include/linux/overflow.h | 2 include/linux/trace_events.h | 2 tools/include/linux/overflow.h | 2 4 files changed, 46 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/i915_trace.h +43 -43
@@ -419,16 +419,16 @@ TRACE_EVENT(i915_gem_object_create,TP_ARGS (obj),TP_STRUCT__entry ( - __field(struct drm_i915_gem_object *, obj) + __field(unsigned long, obj)__field (u64 ,size ) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->size = obj->base.size; ), -TP_printk ("obj=%p, size=0x%llx" , __entry->obj, __entry->size) +TP_printk ("obj=%p, size=0x%llx" , (void *)__entry->obj, __entry->size) ); TRACE_EVENT(i915_gem_shrink,
@@ -456,25 +456,25 @@ TRACE_EVENT(i915_vma_bind, TP_ARGS(vma, flags),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) - __field(struct i915_address_space *, vm) +__field (unsigned long ,obj ) + __field(unsigned long, vm)__field (u64, offset)__field (u64, size)__field (unsigned, flags) ),TP_fast_assign ( - __entry->obj = vma->obj; - __entry->vm = vma->vm; + __entry->obj = (unsigned long)vma->obj; + __entry->vm = (unsigned long )vma->vm; __entry->offset = vma->node.start; __entry->size = vma->node.size; __entry->flags = flags; ),TP_printk ("obj=%p, offset=0x%016llx size=0x%llx%s vm=%p" , - __entry->obj, __entry->offset, __entry->size, + (void *)__entry->obj, __entry->offset, __entry->size, __entry->flags &PIN_MAPPABLE ?", mappable" :"" , - __entry->vm) + (void *)__entry->vm) ); TRACE_EVENT(i915_vma_unbind,
@@ -482,21 +482,21 @@ TRACE_EVENT(i915_vma_unbind,TP_ARGS (vma),TP_STRUCT__entry ( - __field(struct drm_i915_gem_object *, obj) -__field (struct i915_address_space *,vm ) + __field(unsigned long, obj) +__field (unsigned long ,vm )__field (u64, offset)__field (u64, size) ),TP_fast_assign ( - __entry->obj = vma->obj; - __entry->vm = vma->vm; + __entry->obj = (unsigned long)vma->obj; + __entry->vm = (unsigned long )vma->vm; __entry->offset = vma->node.start; __entry->size = vma->node.size; ),TP_printk ("obj=%p, offset=0x%016llx size=0x%llx vm=%p" , - __entry->obj, __entry->offset, __entry->size, __entry->vm) + (void *)__entry->obj, __entry->offset, __entry->size, (void *)__entry->vm) ); TRACE_EVENT(i915_gem_object_pwrite,
@@ -504,19 +504,19 @@ TRACE_EVENT(i915_gem_object_pwrite, TP_ARGS(obj, offset, len),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, offset)__field (u64, len) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->offset = offset; __entry->len = len; ),TP_printk ("obj=%p, offset=0x%llx, len=0x%llx" , - __entry->obj, __entry->offset, __entry->len) + (void *)__entry->obj, __entry->offset, __entry->len) ); TRACE_EVENT(i915_gem_object_pread,
@@ -524,19 +524,19 @@ TRACE_EVENT(i915_gem_object_pread, TP_ARGS(obj, offset, len),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, offset)__field (u64, len) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->offset = offset; __entry->len = len; ),TP_printk ("obj=%p, offset=0x%llx, len=0x%llx" , - __entry->obj, __entry->offset, __entry->len) + (void *)__entry->obj, __entry->offset, __entry->len) ); TRACE_EVENT(i915_gem_object_fault,
@@ -544,21 +544,21 @@ TRACE_EVENT(i915_gem_object_fault, TP_ARGS(obj, index, gtt, write),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, index)__field (bool, gtt)__field (bool, write) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->index = index; __entry->gtt = gtt; __entry->write = write; ),TP_printk ("obj=%p, %s index=%llu %s" , - __entry->obj, + (void *)__entry->obj, __entry->gtt ?"GTT" :"CPU" , __entry->index, __entry->write ?", writable" :"" )
@@ -569,14 +569,14 @@ DECLARE_EVENT_CLASS(i915_gem_object,TP_ARGS (obj),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj ) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; ), -TP_printk ("obj=%p" , __entry->obj) +TP_printk ("obj=%p" , (void *)__entry->obj) ); DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush,
@@ -595,7 +595,7 @@ TRACE_EVENT(i915_gem_evict,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u64, size)__field (u64, align) __field(unsigned int, flags)
@@ -603,14 +603,14 @@ TRACE_EVENT(i915_gem_evict,TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; __entry->size = size; __entry->align = align; __entry->flags = flags; ),TP_printk ("dev=%d, vm=%p, size=0x%llx, align=0x%llx %s" , - __entry->dev, __entry->vm, __entry->size, __entry->align, + __entry->dev, (void *)__entry->vm, __entry->size, __entry->align, __entry->flags &PIN_MAPPABLE ?", mappable" :"" ) );
@@ -620,7 +620,7 @@ TRACE_EVENT(i915_gem_evict_node,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u64, start)__field (u64, size) __field(unsigned long, color)
@@ -629,7 +629,7 @@ TRACE_EVENT(i915_gem_evict_node,TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; __entry->start = node->start; __entry->size = node->size; __entry->color = node->color;
@@ -637,7 +637,7 @@ TRACE_EVENT(i915_gem_evict_node, ),TP_printk ("dev=%d, vm=%p, start=0x%llx size=0x%llx, color=0x%lx, flags=%x" , - __entry->dev, __entry->vm, + __entry->dev, (void *)__entry->vm, __entry->start, __entry->size, __entry->color, __entry->flags) );
@@ -648,15 +648,15 @@ TRACE_EVENT(i915_gem_evict_vm,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm) ),TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; ), -TP_printk ("dev=%d, vm=%p" , __entry->dev, __entry->vm) +TP_printk ("dev=%d, vm=%p" , __entry->dev, (void *)__entry->vm) ); TRACE_EVENT(i915_request_queue,
@@ -922,16 +922,16 @@ DECLARE_EVENT_CLASS(i915_ppgtt,TP_ARGS (vm),TP_STRUCT__entry ( - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u32 ,dev ) ),TP_fast_assign ( - __entry->vm = vm; + __entry->vm = (unsigned long)vm; __entry->dev = vm->i915->drm.primary->index; ), - TP_printk("dev=%u, vm=%p", __entry->dev, __entry->vm) + TP_printk("dev=%u, vm=%p", __entry->dev, (void *)__entry->vm) ) DEFINE_EVENT(i915_ppgtt, i915_ppgtt_create,
@@ -957,20 +957,20 @@ DECLARE_EVENT_CLASS(i915_context,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_gem_context *, ctx) + __field(unsigned long, ctx)__field (u32, hw_id) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm) ),TP_fast_assign ( __entry->dev = ctx->i915->drm.primary->index; - __entry->ctx = ctx; + __entry->ctx = (unsigned long )ctx; __entry->hw_id = ctx->hw_id; - __entry->vm = ctx->vm; + __entry->vm = (unsigned long )ctx->vm; ), TP_printk("dev=%u, ctx=%p, ctx_vm=%p, hw_id=%u", - __entry->dev, __entry->ctx, __entry->vm, __entry->hw_id) + __entry->dev, (void *)__entry->ctx, (void *)__entry->vm, __entry->hw_id) ) DEFINE_EVENT(i915_context, i915_context_create,
include/linux/overflow.h +1 -1
@@ -31,7 +31,7 @@* https://mail-index.netbsd.org/tech-misc/2007/02/05/0000.html - * credit to Christian Biere. */ -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)#define __type_half_max (type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))#define type_max (T ) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))#define type_min (T ) ((T)((T)-type_max(T)-(T)1))
include/linux/trace_events.h +1 -1
@@ -546,7 +546,7 @@ extern int trace_add_event_call(struct trace_event_call *call);extern int trace_remove_event_call (struct trace_event_call *call);extern int trace_event_get_offsets (struct trace_event_call *call); -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)int ftrace_set_clr_event (struct trace_array *tr,char *buf,int set);int trace_set_clr_event (const char *system,const char *event,int set);
tools/include/linux/overflow.h +1 -1
@@ -31,7 +31,7 @@* https://mail-index.netbsd.org/tech-misc/2007/02/05/0000.html - * credit to Christian Biere. */ -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)#define __type_half_max (type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))#define type_max (T ) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))#define type_min (T ) ((T)((T)-type_max(T)-(T)1))
Steven Rostedt
maintainerQuoted 9 lines · On Sun, 29 Sep 2019 23:06:19 +0300 Alexey Dobriyan <[email protected]> wrote:
* Simply compare -1 with 0,
* Drop unnecessary parenthesis setsNew macro leaves pointer as "unsigned type" but gives a warning, which should be fine because asking whether a pointer is signed is strange question.
I'm not sure what's going on in the i915 driver, it is shipping kernel pointers to userspace.
This tells us what the patch does, not why.
-- Steve
Quoted 2 lines
Signed-off-by Alexey Dobriyan <[email protected]>
Review
Quoted 5 lines · Alexey Dobriyan
* Simply compare -1 with 0,
* Drop unnecessary parenthesis sets(quoted diff) +1
-1-#define is_signed_type(type) (((type)(-1)) < (type)1) +#define is_signed_type(type) ((type)-1 < 0)
NAK. I wrote it that way to avoid -Wtautological-compare when type is unsigned.
Rasmus
Quoted 6 lines · Steven Rostedt
Quoted 3 lines · On Sun, 29 Sep 2019 23:06:19 +0300 Alexey Dobriyan <[email protected]> wrote:
* Simply compare -1 with 0,
* Drop unnecessary parenthesis sets
Quoted 8 lines
Quoted 6 lines
New macro leaves pointer as "unsigned type" but gives a warning, which should be fine because asking whether a pointer is signed is strange question.
I'm not sure what's going on in the i915 driver, it is shipping kernel pointers to userspace.
This tells us what the patch does, not why.
Check the subject line.
Quoted 9 lines · Rasmus Villemoes
Review
Quoted 5 lines · Alexey Dobriyan
* Simply compare -1 with 0,
* Drop unnecessary parenthesis sets(quoted diff) +1
-1-#define is_signed_type(type) (((type)(-1)) < (type)1) +#define is_signed_type(type) ((type)-1 < 0)NAK. I wrote it that way to avoid -Wtautological-compare when type is unsigned.
Was is W=1?
godbolt doesn't show it with just -Wall
And the warning which found i915 case is -Wextra not -Wtautological-compare.
Steven Rostedt
maintainerQuoted 11 lines · On Sun, 29 Sep 2019 23:44:24 +0300 Alexey Dobriyan <[email protected]> wrote:
Quoted 10 lines · Steven Rostedt
Quoted 7 lines · On Sun, 29 Sep 2019 23:06:19 +0300 Alexey Dobriyan <[email protected]> wrote:
* Simply compare -1 with 0,
* Drop unnecessary parenthesis setsNew macro leaves pointer as "unsigned type" but gives a warning, which should be fine because asking whether a pointer is signed is strange question.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
I'm not sure what's going on in the i915 driver, it is shipping kernel pointers to userspace.
This tells us what the patch does, not why.
Check the subject line.
I don't see how it's simpler.
-#define is_signed_type(type) (((type)(-1)) < (type)1)
+#define is_signed_type(type) ((type)-1 < 0)
Requires more rational that "make it simpler". Rewriting futex or tty layer code would be something I would love to see, but just replacing "(type)1" with "0" isn't worth the churn.
-- Steve
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Alexey Dobriyan
Quoted 9 lines · Rasmus Villemoes
Review
Quoted 5 lines · Alexey Dobriyan
* Simply compare -1 with 0,
* Drop unnecessary parenthesis sets(quoted diff) +1
-1-#define is_signed_type(type) (((type)(-1)) < (type)1) +#define is_signed_type(type) ((type)-1 < 0)NAK. I wrote it that way to avoid -Wtautological-compare when type is unsigned.
Quoted 8 lines
Was is W=1?
godbolt doesn't show it with just -Wall
And the warning which found i915 case is -Wextra not -Wtautological-compare.
Yeah, it's usually disabled/not enabled in the kernel. I did most of the prototyping/testing in userspace with my default Cflags, and decided to keep it this way in case somebody copy-pastes it to a code base that does enable -Wtautological-compare. I see it's been copy-pasted to tools/, who knows what they do. IMO, "it may be copy-pasted" would not be valid reason for a transform the other way, but I really don't see a reason for changing it now. Especially since it seems to require some tree-wide adaptation.
Rasmus
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Alexey Dobriyan
Sent: Sunday, September 29, 2019 4:06 PM
To: [email protected]
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]
Subject: [Intel-gfx] [PATCH] Makeis_signed_type()simpler* Simply compare -1 with 0,
* Drop unnecessary parenthesis setsNew macro leaves pointer as "unsigned type" but gives a warning, which should be fine because asking whether a pointer is signed is strange question.
I'm not sure what's going on in the i915 driver, it is shipping kernel pointers to userspace.
Signed-off-by Alexey Dobriyan <[email protected]>---
drivers/gpu/drm/i915/i915_trace.h| 86 +++++++++++++++++++--------------
-----include/linux/overflow.h | 2 include/linux/trace_events.h | 2 tools/include/linux/overflow.h | 2 4 files changed, 46 insertions(+), 46 deletions(-)drivers/gpu/drm/i915/i915_trace.h +1
-1@@ -419,16 +419,16 @@ TRACE_EVENT(i915_gem_object_create, TP_ARGS(obj), TP_STRUCT__entry( - __field(struct drm_i915_gem_object *, obj) + __field(unsigned long, obj) __field(u64, size)
drivers/gpu/drm/i915/i915_trace.h TRACE_EVENT(i915_gem_object_create, · line 431
Quoted 10 lines
drivers/gpu/drm/i915/i915_trace.h +2
-2), TP_fast_assign( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->size = obj->base.size; ), -TP_printk ("obj=%p, size=0x%llx" , __entry->obj, __entry->size) + TP_printk("obj=%p, size=0x%llx", (void *)__entry->obj, __entry-
Looking up the printk format specifiers, I see:
%p
Pointers printed without a specifier extension (i.e unadorned %p) are hashed to give a unique identifier without leaking kernel addresses to user space.
This would seem to me that we this code is correct. Am I misreading this?
Mike
Quoted 311 lines
drivers/gpu/drm/i915/i915_trace.h +0
-0>size) );TRACE_EVENT(i915_gem_shrink,
drivers/gpu/drm/i915/i915_trace.h +11
-11@@ -456,25 +456,25 @@ TRACE_EVENT(i915_vma_bind, TP_ARGS(vma, flags),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) - __field(struct i915_address_space *, vm) +__field (unsigned long ,obj ) + __field(unsigned long, vm)__field (u64, offset)__field (u64, size)__field (unsigned, flags) ),TP_fast_assign ( - __entry->obj = vma->obj; - __entry->vm = vma->vm; + __entry->obj = (unsigned long)vma->obj; + __entry->vm = (unsigned long )vma->vm; __entry->offset = vma->node.start; __entry->size = vma->node.size; __entry->flags = flags; ),TP_printk ("obj=%p, offset=0x%016llx size=0x%llx%s vm=%p" , - __entry->obj, __entry->offset, __entry->size, + (void *)__entry->obj, __entry->offset, __entry->size, __entry->flags &PIN_MAPPABLE ?", mappable" :"" , - __entry->vm) + (void *)__entry->vm) ); TRACE_EVENT(i915_vma_unbind,@@ -482,21 +482,21 @@ TRACE_EVENT(i915_vma_unbind,TP_ARGS (vma),TP_STRUCT__entry ( - __field(struct drm_i915_gem_object *, obj) -__field (struct i915_address_space *,vm ) + __field(unsigned long, obj) +__field (unsigned long ,vm )__field (u64, offset)__field (u64, size) ),TP_fast_assign ( - __entry->obj = vma->obj; - __entry->vm = vma->vm; + __entry->obj = (unsigned long)vma->obj; + __entry->vm = (unsigned long )vma->vm; __entry->offset = vma->node.start; __entry->size = vma->node.size; ), TP_printk("obj=%p, offset=0x%016llx size=0x%llx vm=%p", - __entry->obj, __entry->offset, __entry->size, __entry- >vm) + (void *)__entry->obj, __entry->offset, __entry->size, (void *)__entry->vm) );TRACE_EVENT(i915_gem_object_pwrite,
drivers/gpu/drm/i915/i915_trace.h +15
-15@@ -504,19 +504,19 @@ TRACE_EVENT(i915_gem_object_pwrite, TP_ARGS(obj, offset, len),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, offset)__field (u64, len) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->offset = offset; __entry->len = len; ),TP_printk ("obj=%p, offset=0x%llx, len=0x%llx" , - __entry->obj, __entry->offset, __entry->len) + (void *)__entry->obj, __entry->offset, __entry->len) ); TRACE_EVENT(i915_gem_object_pread,@@ -524,19 +524,19 @@ TRACE_EVENT(i915_gem_object_pread, TP_ARGS(obj, offset, len),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, offset)__field (u64, len) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->offset = offset; __entry->len = len; ),TP_printk ("obj=%p, offset=0x%llx, len=0x%llx" , - __entry->obj, __entry->offset, __entry->len) + (void *)__entry->obj, __entry->offset, __entry->len) ); TRACE_EVENT(i915_gem_object_fault,@@ -544,21 +544,21 @@ TRACE_EVENT(i915_gem_object_fault, TP_ARGS(obj, index, gtt, write),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj )__field (u64, index)__field (bool, gtt)__field (bool, write) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; __entry->index = index; __entry->gtt = gtt; __entry->write = write; ),TP_printk ("obj=%p, %s index=%llu %s" , - __entry->obj, + (void *)__entry->obj, __entry->gtt ?"GTT" :"CPU" , __entry->index, __entry->write ?", writable" :"" )@@ -569,14 +569,14 @@ DECLARE_EVENT_CLASS(i915_gem_object,TP_ARGS (obj),TP_STRUCT__entry ( -__field (struct drm_i915_gem_object *,obj ) +__field (unsigned long ,obj ) ),TP_fast_assign ( - __entry->obj = obj; + __entry->obj = (unsigned long)obj; ), -TP_printk ("obj=%p" , __entry->obj) +TP_printk ("obj=%p" , (void *)__entry->obj) ); DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush,@@ -595,7 +595,7 @@ TRACE_EVENT(i915_gem_evict,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u64, size)__field (u64, align) __field(unsigned int, flags)@@ -603,14 +603,14 @@ TRACE_EVENT(i915_gem_evict,TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; __entry->size = size; __entry->align = align; __entry->flags = flags; ),TP_printk ("dev=%d, vm=%p, size=0x%llx, align=0x%llx %s" , - __entry->dev, __entry->vm, __entry->size, __entry- >align, + __entry->dev, (void *)__entry->vm, __entry->size, __entry->align, __entry->flags &PIN_MAPPABLE ?", mappable" :"" ));
drivers/gpu/drm/i915/i915_trace.h +3
-3@@ -620,7 +620,7 @@ TRACE_EVENT(i915_gem_evict_node,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u64, start)__field (u64, size) __field(unsigned long, color)@@ -629,7 +629,7 @@ TRACE_EVENT(i915_gem_evict_node,TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; __entry->start = node->start; __entry->size = node->size; __entry->color = node->color;@@ -637,7 +637,7 @@ TRACE_EVENT(i915_gem_evict_node, ),TP_printk ("dev=%d, vm=%p, start=0x%llx size=0x%llx, color=0x%lx, flags=%x", - __entry->dev, __entry->vm, + __entry->dev, (void *)__entry->vm, __entry->start, __entry->size, __entry->color, __entry->flags));
drivers/gpu/drm/i915/i915_trace.h +11
-11@@ -648,15 +648,15 @@ TRACE_EVENT(i915_gem_evict_vm,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm) ),TP_fast_assign ( __entry->dev = vm->i915->drm.primary->index; - __entry->vm = vm; + __entry->vm = (unsigned long )vm; ), -TP_printk ("dev=%d, vm=%p" , __entry->dev, __entry->vm) +TP_printk ("dev=%d, vm=%p" , __entry->dev, (void *)__entry->vm) ); TRACE_EVENT(i915_request_queue,@@ -922,16 +922,16 @@ DECLARE_EVENT_CLASS(i915_ppgtt,TP_ARGS (vm),TP_STRUCT__entry ( - __field(struct i915_address_space *, vm) + __field(unsigned long, vm)__field (u32 ,dev ) ),TP_fast_assign ( - __entry->vm = vm; + __entry->vm = (unsigned long)vm; __entry->dev = vm->i915->drm.primary->index; ), - TP_printk("dev=%u, vm=%p", __entry->dev, __entry->vm) + TP_printk("dev=%u, vm=%p", __entry->dev, (void *)__entry->vm) ) DEFINE_EVENT(i915_ppgtt, i915_ppgtt_create,@@ -957,20 +957,20 @@ DECLARE_EVENT_CLASS(i915_context,TP_STRUCT__entry (__field (u32 ,dev ) - __field(struct i915_gem_context *, ctx) + __field(unsigned long, ctx)__field (u32, hw_id) - __field(struct i915_address_space *, vm) + __field(unsigned long, vm) ),TP_fast_assign ( __entry->dev = ctx->i915->drm.primary->index; - __entry->ctx = ctx; + __entry->ctx = (unsigned long )ctx; __entry->hw_id = ctx->hw_id; - __entry->vm = ctx->vm; + __entry->vm = (unsigned long )ctx->vm; ),TP_printk ("dev=%u, ctx=%p, ctx_vm=%p, hw_id=%u" , - __entry->dev, __entry->ctx, __entry->vm, __entry->hw_id) + __entry->dev, (void *)__entry->ctx, (void *)__entry->vm, __entry->hw_id) )DEFINE_EVENT(i915_context,
i915_context_create,include/linux/overflow.h +1
-1@@ -31,7 +31,7 @@* https://mail-index.netbsd.org/tech-misc/2007/02/05/0000.html - * credit to Christian Biere. */ -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)#define __type_half_max (type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))#define type_max (T ) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))#define
type_min(T)((T)((T)-type_max(T)-(T)1))include/linux/trace_events.h +1
-1@@ -546,7 +546,7 @@ extern int trace_add_event_call(struct trace_event_call *call);extern int trace_remove_event_call (struct trace_event_call *call);extern int trace_event_get_offsets (struct trace_event_call *call); -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)int ftrace_set_clr_event (struct trace_array *tr,char *buf,int set);int
trace_set_clr_event(const char *system, const char *event, int set);tools/include/linux/overflow.h +1
-1@@ -31,7 +31,7 @@* https://mail-index.netbsd.org/tech-misc/2007/02/05/0000.html - * credit to Christian Biere. */ -#define is_signed_type (type) (((type)(-1)) < (type)1) +#define is_signed_type (type) ((type)-1 < 0)#define __type_half_max (type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type)))#define type_max (T ) ((T)((__type_half_max(T) - 1) + __type_half_max(T)))
Quoted 5 lines
#define
type_min(T)((T)((T)-type_max(T)-(T)1))
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BUILD: failure for Make is_signed_type() simpler
In reply to Alexey Dobriyan== Series Details ==
== Series Details ==
Series: Make is_signed_type() simpler
URL : https://patchwork.freedesktop.org/series/67413/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/gvt/trace_points.o
In file included from ./include/trace/define_trace.h:102:0,
from drivers/gpu/drm/i915/gvt/trace.h:383,
from drivers/gpu/drm/i915/gvt/trace_points.c:33:
./drivers/gpu/drm/i915/gvt/./trace.h: In function ‘trace_event_define_fields_spt_alloc’:
./include/linux/trace_events.h:549:40: error: ordered comparison of pointer with integer zero [-Werror=extra]
#define is_signed_type(type) ((type)-1 < 0)
^./include/trace/trace_events.h:455:2: note: in definition of macro ‘DECLARE_EVENT_CLASS’
tstruct; \
^~~~~~~./include/trace/trace_events.h:77:9: note: in expansion of macro ‘PARAMS’
PARAMS(tstruct), \
^~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:42:1: note: in expansion of macro ‘TRACE_EVENT’
TRACE_EVENT(spt_alloc,
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:48:2: note: in expansion of macro ‘TP_STRUCT__entry’
TP_STRUCT__entry(
^~~~~~~~~~~~~~~~./include/trace/trace_events.h:401:6: note: in expansion of macro ‘is_signed_type’
is_signed_type(type), filter_type); \
^~~~~~~~~~~~~~
./include/trace/trace_events.h:415:29: note: in expansion of macro ‘__field_ext’
#define __field(type, item) __field_ext(type, item, FILTER_OTHER)
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:50:3: note: in expansion of macro ‘__field’
__field(void *, spt)
^~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h: In function ‘trace_event_define_fields_spt_free’:./include/linux/trace_events.h:549:40: error: ordered comparison of pointer with integer zero [-Werror=extra]
#define is_signed_type(type) ((type)-1 < 0)
^./include/trace/trace_events.h:455:2: note: in definition of macro ‘DECLARE_EVENT_CLASS’
tstruct; \
^~~~~~~./include/trace/trace_events.h:77:9: note: in expansion of macro ‘PARAMS’
PARAMS(tstruct), \
^~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:72:1: note: in expansion of macro ‘TRACE_EVENT’
TRACE_EVENT(spt_free,
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:77:2: note: in expansion of macro ‘TP_STRUCT__entry’
TP_STRUCT__entry(
^~~~~~~~~~~~~~~~./include/trace/trace_events.h:401:6: note: in expansion of macro ‘is_signed_type’
is_signed_type(type), filter_type); \
^~~~~~~~~~~~~~
./include/trace/trace_events.h:415:29: note: in expansion of macro ‘__field_ext’
#define __field(type, item) __field_ext(type, item, FILTER_OTHER)
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:79:3: note: in expansion of macro ‘__field’
__field(void *, spt)
^~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h: In function ‘trace_event_define_fields_gvt_command’:./include/linux/trace_events.h:549:40: error: ordered comparison of pointer with integer zero [-Werror=extra]
#define is_signed_type(type) ((type)-1 < 0)
^./include/trace/trace_events.h:455:2: note: in definition of macro ‘DECLARE_EVENT_CLASS’
tstruct; \
^~~~~~~./include/trace/trace_events.h:77:9: note: in expansion of macro ‘PARAMS’
PARAMS(tstruct), \
^~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:228:1: note: in expansion of macro ‘TRACE_EVENT’
TRACE_EVENT(gvt_command,
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:236:2: note: in expansion of macro ‘TP_STRUCT__entry’
TP_STRUCT__entry(
^~~~~~~~~~~~~~~~./include/trace/trace_events.h:401:6: note: in expansion of macro ‘is_signed_type’
is_signed_type(type), filter_type); \
^~~~~~~~~~~~~~
./include/trace/trace_events.h:415:29: note: in expansion of macro ‘__field_ext’
#define __field(type, item) __field_ext(type, item, FILTER_OTHER)
^~~~~~~~~~~./drivers/gpu/drm/i915/gvt/./trace.h:243:3: note: in expansion of macro ‘__field’
__field(void*, workload)
^~~~~~~
cc1: all warnings being treated as errorsscripts/Makefile.build:280: recipe for target 'drivers/gpu/drm/i915/gvt/trace_points.o' failed make[4]: *** [drivers/gpu/drm/i915/gvt/trace_points.o] Error 1 scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:497: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1087: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx