From: Sean Paul <seanpaul@chromium.org>
To: Nicholas Mc Guire <hofrat@osadl.org>
Cc: Gustavo Padovan <gustavo@padovan.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm: re-enable error handling
Date: Mon, 16 Jul 2018 10:39:18 -0400 [thread overview]
Message-ID: <20180716143918.GT20303@art_vandelay> (raw)
In-Reply-To: <1531571532-22733-1-git-send-email-hofrat@osadl.org>
On Sat, Jul 14, 2018 at 02:32:12PM +0200, Nicholas Mc Guire wrote:
> drm_legacy_ctxbitmap_next() returns idr_alloc() which can return
> -ENOMEM, -EINVAL or -ENOSPC none of which are -1 . but the call sites
> of drm_legacy_ctxbitmap_next() seem to be assuming that the error case
> would be -1 (original return of drm_ctxbitmap_next() prior to 2.6.23
> was actually -1). Thus reenable error handling by checking for < 0.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Thanks for your patch, I've applied it to drm-misc-fixes.
Sean
> Fixes: 62968144e673 ("drm: convert drm context code to use Linux idr")
> ---
>
> Problem located with experimental coccinelle script
>
> The noted Fixes tag is one of the commits that removed the -1 return
> value in 2.6.23 in drm_ctxbitmap_next() but thats not the only change
> that must have taken place to invalidate the error check.
>
> Patch was compile tested with: x86_64_defconfig
>
> Patch is against 4.18-rc4 (localversion-next is next-20180713)
>
> drivers/gpu/drm/drm_context.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
> index 3c4000f..f973d28 100644
> --- a/drivers/gpu/drm/drm_context.c
> +++ b/drivers/gpu/drm/drm_context.c
> @@ -372,7 +372,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
> ctx->handle = drm_legacy_ctxbitmap_next(dev);
> }
> DRM_DEBUG("%d\n", ctx->handle);
> - if (ctx->handle == -1) {
> + if (ctx->handle < 0) {
> DRM_DEBUG("Not enough free contexts.\n");
> /* Should this return -EBUSY instead? */
> return -ENOMEM;
> --
> 2.1.4
>
--
Sean Paul, Software Engineer, Google / Chromium OS
prev parent reply other threads:[~2018-07-16 14:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-14 12:32 [PATCH] drm: re-enable error handling Nicholas Mc Guire
2018-07-16 14:39 ` Sean Paul [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=20180716143918.GT20303@art_vandelay \
--to=seanpaul@chromium.org \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo@padovan.org \
--cc=hofrat@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.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