[igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[Chris Wilson]

valgrind complains we feed uninitialised stack into the CONTEXT_SETPARAM
ioctl. It is unused by the kernel, but valgrind doesn't know that and
it's easy enough to clear the struct to prevent the warning.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/igt_gt.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 799ca1ae..168c5a07 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -126,11 +126,10 @@ void igt_require_hang_ring(int fd, int ring)
 
 static unsigned context_get_ban(int fd, unsigned ctx)
 {
-	struct drm_i915_gem_context_param param;
-
-	param.param = I915_CONTEXT_PARAM_BANNABLE;
-	param.value = 0;
-	param.size = 0;
+	struct drm_i915_gem_context_param param = {
+		.ctx_id = ctx,
+		.param = I915_CONTEXT_PARAM_BANNABLE,
+	};
 
 	if (__gem_context_get_param(fd, &param) == -EINVAL) {
 		igt_assert(param.value == 0);
@@ -143,13 +142,11 @@ static unsigned context_get_ban(int fd, unsigned ctx)
 
 static void context_set_ban(int fd, unsigned ctx, unsigned ban)
 {
-	struct drm_i915_gem_context_param param;
-
-	memset(&param, 0, sizeof(param));
-	param.ctx_id = ctx;
-	param.value = ban;
-	param.size = 0;
-	param.param = I915_CONTEXT_PARAM_BANNABLE;
+	struct drm_i915_gem_context_param param = {
+		.ctx_id = ctx,
+		.param = I915_CONTEXT_PARAM_BANNABLE,
+		.value = ban,
+	};
 
 	if(__gem_context_set_param(fd, &param) == -EINVAL) {
 		igt_assert(param.value == ban);
@@ -160,7 +157,9 @@ static void context_set_ban(int fd, unsigned ctx, unsigned ban)
 
 igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 {
-	struct drm_i915_gem_context_param param;
+	struct drm_i915_gem_context_param param = {
+		.ctx_id = ctx,
+	};
 	unsigned ban;
 
 	igt_assert(igt_sysfs_set_parameter
@@ -172,9 +171,6 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
 		igt_require(has_gpu_reset(fd));
 
-	param.ctx_id = ctx;
-	param.size = 0;
-
 	if ((flags & HANG_ALLOW_CAPTURE) == 0) {
 		param.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE;
 		param.value = 1;
@@ -194,7 +190,6 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 
 void igt_disallow_hang(int fd, igt_hang_t arg)
 {
-
 	context_set_ban(fd, arg.ctx, arg.ban);
 
 	if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) {
-- 
2.16.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for lib: Use C99 initialisers to clear context parameters

[Patchwork]

== Series Details ==

Series: lib: Use C99 initialisers to clear context parameters
URL   : https://patchwork.freedesktop.org/series/39528/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
b4689dce36d0fbd9aec70d5a4b077c43a6b9c254 igt: Remove gen7_forcewake_mt

with latest DRM-Tip kernel build CI_DRM_3885
8a4eb4556f66 drm-tip: 2018y-03m-06d-22h-59m-29s UTC integration manifest

No testlist changes.

---- Known issues:

Test prime_vgem:
        Subgroup basic-fence-flip:
                fail       -> PASS       (fi-ilk-650) fdo#104008

fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:424s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:427s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:373s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:506s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:279s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:498s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:492s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:470s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:403s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:576s
fi-cfl-u         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:512s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:418s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:292s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:519s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:399s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:416s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:458s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:420s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:469s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:464s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:509s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:591s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:433s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:524s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:538s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:498s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:484s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:419s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:428s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:516s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:392s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1075/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.IGT: failure for lib: Use C99 initialisers to clear context parameters

[Patchwork]

== Series Details ==

Series: lib: Use C99 initialisers to clear context parameters
URL   : https://patchwork.freedesktop.org/series/39528/
State : failure

== Summary ==

---- Possible new issues:

Test gem_linear_blits:
        Subgroup normal:
                pass       -> SKIP       (shard-apl)
Test kms_frontbuffer_tracking:
        Subgroup fbc-indfb-scaledprimary:
                pass       -> FAIL       (shard-apl)

---- Known issues:

Test gem_eio:
        Subgroup in-flight-contexts:
                pass       -> INCOMPLETE (shard-apl) fdo#105341
Test gem_softpin:
        Subgroup noreloc-s3:
                skip       -> PASS       (shard-snb) fdo#103375 +1
Test kms_chv_cursor_fail:
        Subgroup pipe-b-256x256-right-edge:
                dmesg-warn -> PASS       (shard-snb) fdo#105185 +3
Test kms_cursor_crc:
        Subgroup cursor-128x128-suspend:
                pass       -> INCOMPLETE (shard-hsw) fdo#103540
Test kms_flip:
        Subgroup 2x-plain-flip-ts-check:
                fail       -> PASS       (shard-hsw) fdo#100368 +1
Test kms_frontbuffer_tracking:
        Subgroup fbc-rgb565-draw-mmap-gtt:
                pass       -> SKIP       (shard-snb) fdo#103167
Test kms_sysfs_edid_timing:
                warn       -> PASS       (shard-apl) fdo#100047
Test perf:
        Subgroup polling:
                fail       -> PASS       (shard-hsw) fdo#102252 +1
Test pm_lpsp:
        Subgroup screens-disabled:
                fail       -> PASS       (shard-hsw) fdo#104941

fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#104941 https://bugs.freedesktop.org/show_bug.cgi?id=104941

shard-apl        total:3383 pass:1774 dwarn:1   dfail:0   fail:8   skip:1599 time:11781s
shard-hsw        total:3380 pass:1730 dwarn:1   dfail:0   fail:1   skip:1646 time:11522s
shard-snb        total:3467 pass:1361 dwarn:2   dfail:0   fail:2   skip:2102 time:7056s
Blacklisted hosts:
shard-kbl        total:3467 pass:1932 dwarn:18  dfail:0   fail:8   skip:1509 time:9554s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1075/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[Tvrtko Ursulin]

On 07/03/2018 12:17, Chris Wilson wrote:
> valgrind complains we feed uninitialised stack into the CONTEXT_SETPARAM
> ioctl. It is unused by the kernel, but valgrind doesn't know that and
> it's easy enough to clear the struct to prevent the warning.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   lib/igt_gt.c | 29 ++++++++++++-----------------
>   1 file changed, 12 insertions(+), 17 deletions(-)
> 
> diff --git a/lib/igt_gt.c b/lib/igt_gt.c
> index 799ca1ae..168c5a07 100644
> --- a/lib/igt_gt.c
> +++ b/lib/igt_gt.c
> @@ -126,11 +126,10 @@ void igt_require_hang_ring(int fd, int ring)
>   
>   static unsigned context_get_ban(int fd, unsigned ctx)
>   {
> -	struct drm_i915_gem_context_param param;
> -
> -	param.param = I915_CONTEXT_PARAM_BANNABLE;
> -	param.value = 0;
> -	param.size = 0;
> +	struct drm_i915_gem_context_param param = {
> +		.ctx_id = ctx,

Where was this assignment before? Was it all broken as well as upsetting 
Valgrind?

Regards,

Tvrtko

> +		.param = I915_CONTEXT_PARAM_BANNABLE,
> +	};
>   
>   	if (__gem_context_get_param(fd, &param) == -EINVAL) {
>   		igt_assert(param.value == 0);
> @@ -143,13 +142,11 @@ static unsigned context_get_ban(int fd, unsigned ctx)
>   
>   static void context_set_ban(int fd, unsigned ctx, unsigned ban)
>   {
> -	struct drm_i915_gem_context_param param;
> -
> -	memset(&param, 0, sizeof(param));
> -	param.ctx_id = ctx;
> -	param.value = ban;
> -	param.size = 0;
> -	param.param = I915_CONTEXT_PARAM_BANNABLE;
> +	struct drm_i915_gem_context_param param = {
> +		.ctx_id = ctx,
> +		.param = I915_CONTEXT_PARAM_BANNABLE,
> +		.value = ban,
> +	};
>   
>   	if(__gem_context_set_param(fd, &param) == -EINVAL) {
>   		igt_assert(param.value == ban);
> @@ -160,7 +157,9 @@ static void context_set_ban(int fd, unsigned ctx, unsigned ban)
>   
>   igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
>   {
> -	struct drm_i915_gem_context_param param;
> +	struct drm_i915_gem_context_param param = {
> +		.ctx_id = ctx,
> +	};
>   	unsigned ban;
>   
>   	igt_assert(igt_sysfs_set_parameter
> @@ -172,9 +171,6 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
>   	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
>   		igt_require(has_gpu_reset(fd));
>   
> -	param.ctx_id = ctx;
> -	param.size = 0;
> -
>   	if ((flags & HANG_ALLOW_CAPTURE) == 0) {
>   		param.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE;
>   		param.value = 1;
> @@ -194,7 +190,6 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
>   
>   void igt_disallow_hang(int fd, igt_hang_t arg)
>   {
> -
>   	context_set_ban(fd, arg.ctx, arg.ban);
>   
>   	if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) {
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[Chris Wilson]

Quoting Tvrtko Ursulin (2018-03-07 14:36:34)
> 
> On 07/03/2018 12:17, Chris Wilson wrote:
> > valgrind complains we feed uninitialised stack into the CONTEXT_SETPARAM
> > ioctl. It is unused by the kernel, but valgrind doesn't know that and
> > it's easy enough to clear the struct to prevent the warning.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> >   lib/igt_gt.c | 29 ++++++++++++-----------------
> >   1 file changed, 12 insertions(+), 17 deletions(-)
> > 
> > diff --git a/lib/igt_gt.c b/lib/igt_gt.c
> > index 799ca1ae..168c5a07 100644
> > --- a/lib/igt_gt.c
> > +++ b/lib/igt_gt.c
> > @@ -126,11 +126,10 @@ void igt_require_hang_ring(int fd, int ring)
> >   
> >   static unsigned context_get_ban(int fd, unsigned ctx)
> >   {
> > -     struct drm_i915_gem_context_param param;
> > -
> > -     param.param = I915_CONTEXT_PARAM_BANNABLE;
> > -     param.value = 0;
> > -     param.size = 0;
> > +     struct drm_i915_gem_context_param param = {
> > +             .ctx_id = ctx,
> 
> Where was this assignment before? Was it all broken as well as upsetting 
> Valgrind?

It existed only in the callers imagination. Broken is an
overstatement, since no one varied from the defaults, i.e. the caller
has to mix in using PARAM_BANNABLE with igt_hang_ctx.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[Tvrtko Ursulin]

On 07/03/2018 14:40, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2018-03-07 14:36:34)
>>
>> On 07/03/2018 12:17, Chris Wilson wrote:
>>> valgrind complains we feed uninitialised stack into the CONTEXT_SETPARAM
>>> ioctl. It is unused by the kernel, but valgrind doesn't know that and
>>> it's easy enough to clear the struct to prevent the warning.
>>>
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> ---
>>>    lib/igt_gt.c | 29 ++++++++++++-----------------
>>>    1 file changed, 12 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/lib/igt_gt.c b/lib/igt_gt.c
>>> index 799ca1ae..168c5a07 100644
>>> --- a/lib/igt_gt.c
>>> +++ b/lib/igt_gt.c
>>> @@ -126,11 +126,10 @@ void igt_require_hang_ring(int fd, int ring)
>>>    
>>>    static unsigned context_get_ban(int fd, unsigned ctx)
>>>    {
>>> -     struct drm_i915_gem_context_param param;
>>> -
>>> -     param.param = I915_CONTEXT_PARAM_BANNABLE;
>>> -     param.value = 0;
>>> -     param.size = 0;
>>> +     struct drm_i915_gem_context_param param = {
>>> +             .ctx_id = ctx,
>>
>> Where was this assignment before? Was it all broken as well as upsetting
>> Valgrind?
> 
> It existed only in the callers imagination. Broken is an
> overstatement, since no one varied from the defaults, i.e. the caller
> has to mix in using PARAM_BANNABLE with igt_hang_ctx.

gem_reset_stats is doing that, both with default and own context. But I 
don't feel like untangling this right now. Whatever it is supposed to 
be, if it breaks, it was broken anyway and not a fault of this patch. so:

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH igt] lib: Use C99 initialisers to clear context parameters

[Chris Wilson]

Quoting Tvrtko Ursulin (2018-03-07 15:06:37)
> 
> On 07/03/2018 14:40, Chris Wilson wrote:
> > Quoting Tvrtko Ursulin (2018-03-07 14:36:34)
> >>
> >> On 07/03/2018 12:17, Chris Wilson wrote:
> >>> valgrind complains we feed uninitialised stack into the CONTEXT_SETPARAM
> >>> ioctl. It is unused by the kernel, but valgrind doesn't know that and
> >>> it's easy enough to clear the struct to prevent the warning.
> >>>
> >>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >>> ---
> >>>    lib/igt_gt.c | 29 ++++++++++++-----------------
> >>>    1 file changed, 12 insertions(+), 17 deletions(-)
> >>>
> >>> diff --git a/lib/igt_gt.c b/lib/igt_gt.c
> >>> index 799ca1ae..168c5a07 100644
> >>> --- a/lib/igt_gt.c
> >>> +++ b/lib/igt_gt.c
> >>> @@ -126,11 +126,10 @@ void igt_require_hang_ring(int fd, int ring)
> >>>    
> >>>    static unsigned context_get_ban(int fd, unsigned ctx)
> >>>    {
> >>> -     struct drm_i915_gem_context_param param;
> >>> -
> >>> -     param.param = I915_CONTEXT_PARAM_BANNABLE;
> >>> -     param.value = 0;
> >>> -     param.size = 0;
> >>> +     struct drm_i915_gem_context_param param = {
> >>> +             .ctx_id = ctx,
> >>
> >> Where was this assignment before? Was it all broken as well as upsetting
> >> Valgrind?
> > 
> > It existed only in the callers imagination. Broken is an
> > overstatement, since no one varied from the defaults, i.e. the caller
> > has to mix in using PARAM_BANNABLE with igt_hang_ctx.
> 
> gem_reset_stats is doing that, both with default and own context. But I 
> don't feel like untangling this right now. Whatever it is supposed to 
> be, if it breaks, it was broken anyway and not a fault of this patch. so:

gem_reset_stats doesn't exist... We basically need to rewrite the test
from scratch to check expected behaviour.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev