From: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
To: maarten.lankhorst@linux.intel.com, mripard@kernel.org,
tzimmermann@suse.de, airlied@linux.ie, sumit.semwal@linaro.org,
christian.koenig@amd.com, jani.nikula@linux.intel.com,
joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com,
chris@chris-wilson.co.uk, ville.syrjala@linux.intel.com,
matthew.auld@intel.com, dan.carpenter@oracle.com,
tvrtko.ursulin@intel.com, matthew.d.roper@intel.com,
lucas.demarchi@intel.com, karthik.b.s@intel.com,
jose.souza@intel.com, manasi.d.navare@intel.com,
airlied@redhat.com, aditya.swarup@intel.com,
andrescj@chromium.org, linux-graphics-maintainer@vmware.com,
zackr@vmware.com, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org,
linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org,
skhan@linuxfoundation.org, gregkh@linuxfoundation.org,
linux-kernel-mentees@lists.linuxfoundation.org,
Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH v8 3/7] drm: lock drm_global_mutex earlier in the ioctl handler
Date: Tue, 31 Aug 2021 05:04:04 +0800 [thread overview]
Message-ID: <c9e08f10-035f-63dd-698c-faa93c935cd6@gmail.com> (raw)
In-Reply-To: <YSdltHVQnIr+vkTn@phenom.ffwll.local>
On 26/8/21 5:58 pm, Daniel Vetter wrote:
> On Thu, Aug 26, 2021 at 10:01:18AM +0800, Desmond Cheong Zhi Xi wrote:
>> In a future patch, a read lock on drm_device.master_rwsem is
>> held in the ioctl handler before the check for ioctl
>> permissions. However, this inverts the lock hierarchy of
>> drm_global_mutex --> master_rwsem.
>>
>> To avoid this, we do some prep work to grab the drm_global_mutex
>> before checking for ioctl permissions.
>>
>> Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
>> ---
>> drivers/gpu/drm/drm_ioctl.c | 18 +++++++++---------
>> 1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
>> index d25713b09b80..158629d88319 100644
>> --- a/drivers/gpu/drm/drm_ioctl.c
>> +++ b/drivers/gpu/drm/drm_ioctl.c
>> @@ -772,19 +772,19 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
>> if (drm_dev_is_unplugged(dev))
>> return -ENODEV;
>>
>> + /* Enforce sane locking for modern driver ioctls. */
>> + if (unlikely(drm_core_check_feature(dev, DRIVER_LEGACY)) && !(flags & DRM_UNLOCKED))
>
> Maybe have a local bool locked_ioctl for this so it's extremely clear it's
> the same condition in both?
>
> Either way: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
Thanks for the suggestion and review. Sounds good, I'll update and send
out a new version.
(Sorry for delays, been busy with moving)
>> + mutex_lock(&drm_global_mutex);
>> +
>> retcode = drm_ioctl_permit(flags, file_priv);
>> if (unlikely(retcode))
>> - return retcode;
>> + goto out;
>>
>> - /* Enforce sane locking for modern driver ioctls. */
>> - if (likely(!drm_core_check_feature(dev, DRIVER_LEGACY)) ||
>> - (flags & DRM_UNLOCKED))
>> - retcode = func(dev, kdata, file_priv);
>> - else {
>> - mutex_lock(&drm_global_mutex);
>> - retcode = func(dev, kdata, file_priv);
>> + retcode = func(dev, kdata, file_priv);
>> +
>> +out:
>> + if (unlikely(drm_core_check_feature(dev, DRIVER_LEGACY)) && !(flags & DRM_UNLOCKED))
>> mutex_unlock(&drm_global_mutex);
>> - }
>> return retcode;
>> }
>> EXPORT_SYMBOL(drm_ioctl_kernel);
>> --
>> 2.25.1
>>
>
next prev parent reply other threads:[~2021-08-30 21:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 2:01 [PATCH v8 0/7] drm: update locking for modesetting Desmond Cheong Zhi Xi
2021-08-26 2:01 ` [PATCH v8 1/7] drm: fix null ptr dereference in drm_master_release Desmond Cheong Zhi Xi
2021-08-26 9:53 ` Daniel Vetter
2021-08-26 11:53 ` Desmond Cheong Zhi Xi
2021-08-26 12:51 ` [Intel-gfx] " Daniel Vetter
2021-08-26 2:01 ` [PATCH v8 2/7] drm: convert drm_device.master_mutex into a rwsem Desmond Cheong Zhi Xi
2021-08-26 9:55 ` Daniel Vetter
2021-08-26 2:01 ` [PATCH v8 3/7] drm: lock drm_global_mutex earlier in the ioctl handler Desmond Cheong Zhi Xi
2021-08-26 9:58 ` Daniel Vetter
2021-08-30 21:04 ` Desmond Cheong Zhi Xi [this message]
2021-08-26 2:01 ` [PATCH v8 4/7] drm: avoid races with modesetting rights Desmond Cheong Zhi Xi
2021-08-26 12:59 ` Daniel Vetter
2021-08-30 21:36 ` Desmond Cheong Zhi Xi
2021-08-26 2:01 ` [PATCH v8 5/7] drm: avoid circular locks in drm_mode_object_find Desmond Cheong Zhi Xi
2021-08-26 13:13 ` Daniel Vetter
2021-08-26 2:01 ` [PATCH v8 6/7] drm: avoid circular locks in drm_lease_held Desmond Cheong Zhi Xi
2021-08-26 2:01 ` [PATCH v8 7/7] drm: remove drm_file.master_lookup_lock Desmond Cheong Zhi Xi
2021-08-26 13:21 ` Daniel Vetter
2021-08-31 6:02 ` Desmond Cheong Zhi Xi
2021-08-31 12:28 ` Daniel Vetter
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=c9e08f10-035f-63dd-698c-faa93c935cd6@gmail.com \
--to=desmondcheongzx@gmail.com \
--cc=aditya.swarup@intel.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=andrescj@chromium.org \
--cc=chris@chris-wilson.co.uk \
--cc=christian.koenig@amd.com \
--cc=dan.carpenter@oracle.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jose.souza@intel.com \
--cc=karthik.b.s@intel.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=manasi.d.navare@intel.com \
--cc=matthew.auld@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=mripard@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=skhan@linuxfoundation.org \
--cc=sumit.semwal@linaro.org \
--cc=tvrtko.ursulin@intel.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
--cc=zackr@vmware.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).