linux-kernel - Re: [Intel-gfx] [PATCH] drm/i915: mark wait_for_engine() __maybe

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 23 May 2017 09:39:39 +0100
From:   Tvrtko Ursulin <tvrtko.ursulin@...ux.intel.com>
To:     Nick Desaulniers <nick.desaulniers@...il.com>
Cc:     airlied@...ux.ie, intel-gfx@...ts.freedesktop.org,
        linux-kernel@...r.kernel.org, dri-devel@...ts.freedesktop.org,
        daniel.vetter@...el.com
Subject: Re: [Intel-gfx] [PATCH] drm/i915: mark wait_for_engine()
 __maybe_unused


Hi,

On 21/05/2017 05:03, Nick Desaulniers wrote:
> This solves a warning when compiling the driver with Clang, -Werror enabled,
> and CONFIG_DRM_I915_DEBUG_GEM unset, since Clang warns that:
>
> drivers/gpu/drm/i915/i915_gem.c:3274:12: error: function
> 'wait_for_engine' is not needed
>       and will not be emitted [-Werror,-Wunneeded-internal-declaration]
> static int wait_for_engine(struct intel_engine_cs *engine, int
> timeout_ms)
>            ^

You have actually uncovered a bug here where the call is not supposed to 
be optional in the first place. I'll send a different fix and copy you 
on it.

Regards,

Tvrtko

> Signed-off-by: Nick Desaulniers <nick.desaulniers@...il.com>
> ---
> Additionally, it only has one call site. Should I mark it inline, too, while
> I'm at it?
>
>  drivers/gpu/drm/i915/i915_gem.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index b6ac3df18b58..73b82fb94b0e 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3271,7 +3271,8 @@ static int wait_for_timeline(struct i915_gem_timeline *tl, unsigned int flags)
>  	return 0;
>  }
>
> -static int wait_for_engine(struct intel_engine_cs *engine, int timeout_ms)
> +static __maybe_unused int wait_for_engine(
> +	struct intel_engine_cs *engine, int timeout_ms)
>  {
>  	return wait_for(intel_engine_is_idle(engine), timeout_ms);
>  }
>