From: Chris Wilson <chris@chris-wilson.co.uk>
To: Arnd Bergmann <arnd@arndb.de>, Daniel Vetter <daniel@ffwll.ch>,
David Airlie <airlied@linux.ie>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Mika Kuoppala <mika.kuoppala@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>, Arnd Bergmann <arnd@arndb.de>,
Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org,
Matthew Auld <matthew.auld@intel.com>
Subject: Re: [PATCH 3/3] drm/i915/selftests: avoid bogus maybe-uninitialized warning
Date: Wed, 27 May 2020 16:47:54 +0100 [thread overview]
Message-ID: <159059447457.30979.14504945135116433938@build.alporthouse.com> (raw)
In-Reply-To: <20200527140526.1458215-3-arnd@arndb.de>
Quoting Arnd Bergmann (2020-05-27 15:05:10)
> gcc has a problem following values through IS_ERR/PTR_ERR macros,
> leading to a false-positive warning in allmodconfig, with any
> compiler version:
>
> In file included from drivers/gpu/drm/i915/gt/intel_lrc.c:5892:
> drivers/gpu/drm/i915/gt/selftest_lrc.c: In function 'create_gpr_client.isra.0':
> drivers/gpu/drm/i915/gt/selftest_lrc.c:2902:23: error: 'rq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>
> This one is hard to avoid without impairing readability or adding a
> bugus NULL pointer.
>
> Fixes: c92724de6db1 ("drm/i915/selftests: Try to detect rollback during batchbuffer preemption")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpu/drm/i915/gt/selftest_lrc.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index 824f99c4cc7c..933c3f5adf0a 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -2908,23 +2908,25 @@ create_gpr_client(struct intel_engine_cs *engine,
>
> vma = i915_vma_instance(global->obj, ce->vm, NULL);
> if (IS_ERR(vma)) {
> - err = PTR_ERR(vma);
> + rq = ERR_CAST(vma);
> goto out_ce;
> }
>
> err = i915_vma_pin(vma, 0, 0, PIN_USER);
> - if (err)
> + if (err) {
> + rq = ERR_PTR(err);
> goto out_ce;
> + }
>
> batch = create_gpr_user(engine, vma, offset);
> if (IS_ERR(batch)) {
> - err = PTR_ERR(batch);
> + rq = ERR_CAST(batch);
> goto out_vma;
> }
>
> rq = intel_context_create_request(ce);
> if (IS_ERR(rq)) {
> - err = PTR_ERR(rq);
> + rq = ERR_CAST(rq);
> goto out_batch;
> }
>
> @@ -2946,17 +2948,20 @@ create_gpr_client(struct intel_engine_cs *engine,
> i915_vma_unlock(batch);
> i915_vma_unpin(batch);
>
> - if (!err)
> + if (!err) {
> i915_request_get(rq);
> - i915_request_add(rq);
> -
> + i915_request_add(rq);
> + } else {
> + i915_request_add(rq);
> + rq = ERR_PTR(err);
> + }
> out_batch:
> i915_vma_put(batch);
> out_vma:
> i915_vma_unpin(vma);
> out_ce:
> intel_context_put(ce);
> - return err ? ERR_PTR(err) : rq;
> + return rq;
Hmm, I've used this style a few times, so could do with some syntactic
refinement.
drivers/gpu/drm/i915/gem/i915_gem_userptr.c: return err ? ERR_PTR(err) : mm->mn;
drivers/gpu/drm/i915/gt/selftest_hangcheck.c: return err ? ERR_PTR(err) : rq;
drivers/gpu/drm/i915/gt/selftest_lrc.c: return err ? ERR_PTR(err) : rq;
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c: return err ? ERR_PTR(err) : rq;
drivers/gpu/drm/i915/selftests/i915_request.c: return err ? ERR_PTR(err) : request;
drivers/gpu/drm/i915/selftests/igt_spinner.c: return err ? ERR_PTR(err) : rq;
-Chris
prev parent reply other threads:[~2020-05-27 15:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 14:05 [PATCH 1/3] drm/i915/pmu: avoid an maybe-uninitialized warning Arnd Bergmann
2020-05-27 14:05 ` [PATCH 2/3] drm/i915: work around false-positive " Arnd Bergmann
2020-05-27 15:43 ` Chris Wilson
2020-05-27 14:05 ` [PATCH 3/3] drm/i915/selftests: avoid bogus " Arnd Bergmann
2020-05-27 15:47 ` Chris Wilson [this message]
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=159059447457.30979.14504945135116433938@build.alporthouse.com \
--to=chris@chris-wilson.co.uk \
--cc=airlied@linux.ie \
--cc=andi.shyti@intel.com \
--cc=arnd@arndb.de \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=mika.kuoppala@linux.intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=tvrtko.ursulin@intel.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;
as well as URLs for NNTP newsgroup(s).