From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: Peter Zijlstra <peterz@infradead.org> Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Date: Tue, 20 Feb 2018 14:26:55 +0100 [thread overview] Message-ID: <8fd80334-4d0e-8ed0-8a09-02a7e36a0eae@gmail.com> (raw) In-Reply-To: <20180220131253.GF25314@hirez.programming.kicks-ass.net> Am 20.02.2018 um 14:12 schrieb Peter Zijlstra: > On Tue, Feb 20, 2018 at 01:58:26PM +0100, Christian König wrote: >> amdgpu needs to verify if userspace sends us valid addresses and the simplest >> way of doing this is to check if the buffer object is locked with the ticket >> of the current submission. >> >> Clean up the access to the ww_mutex internals by providing a function >> for this and extend the check to the thread owning the underlying mutex. >> Signed-off-by: Christian König <christian.koenig@amd.com> > Much thanks for Cc'ing the relevant maintainers :/ Sorry for that. >> --- >> include/linux/ww_mutex.h | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h >> index 39fda195bf78..14e4149d3d9d 100644 >> --- a/include/linux/ww_mutex.h >> +++ b/include/linux/ww_mutex.h >> @@ -358,4 +358,21 @@ static inline bool ww_mutex_is_locked(struct ww_mutex *lock) >> return mutex_is_locked(&lock->base); >> } >> >> +/** >> + * ww_mutex_is_owned_by - is the w/w mutex locked by this task in that context >> + * @lock: the mutex to be queried >> + * @ctx: the w/w acquire context to test >> + * >> + * If @ctx is not NULL test if the mutex is owned by this context. >> + * If @ctx is NULL test if the mutex is owned by the current thread. >> + */ >> +static inline bool ww_mutex_is_owned_by(struct ww_mutex *lock, >> + struct ww_acquire_ctx *ctx) >> +{ >> + if (ctx) >> + return likely(READ_ONCE(lock->ctx) == ctx); >> + else >> + return likely(__mutex_owner(&lock->base) == current); >> +} > Much better than the previous version. If you want to bike-shed, you can > leave out the 'else' and unindent the last line. Thanks for the suggestion, going to do this. > I do worry about potential users of .ctx = NULL, though. It makes it far > too easy to do recursive locking, which is something we should strongly > discourage. Well, one of the addressed use cases is indeed checking for recursive locking. But recursive locking is something rather normal for ww_mutex and we are just exercising an existing code path. E.g. the most common use case for the ww_mutex is in the graphics drivers where usespace sends us a list of buffer objects to work with. Now when userspace sends us duplicates in that buffer list the expectation is to get -EALREADY from ww_mutex_lock when we try to lock the same ww_mutex twice. Depending on the driver this then results in returning an error code to userspace or just ignoring the duplicate (because of backward compatibility). The intention behind this function is now to a) be able to extend those checks to make sure user space doesn't sends us potentially harmful nonsense and b) allow to check for recursion in TTM during buffer object eviction which uses ww_mutex_trylock instead of ww_mutex_lock. Regards, Christian.
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Date: Tue, 20 Feb 2018 14:26:55 +0100 [thread overview] Message-ID: <8fd80334-4d0e-8ed0-8a09-02a7e36a0eae@gmail.com> (raw) In-Reply-To: <20180220131253.GF25314-Nxj+rRp3nVydTX5a5knrm8zTDFooKrT+cvkQGrU6aU0@public.gmane.org> Am 20.02.2018 um 14:12 schrieb Peter Zijlstra: > On Tue, Feb 20, 2018 at 01:58:26PM +0100, Christian König wrote: >> amdgpu needs to verify if userspace sends us valid addresses and the simplest >> way of doing this is to check if the buffer object is locked with the ticket >> of the current submission. >> >> Clean up the access to the ww_mutex internals by providing a function >> for this and extend the check to the thread owning the underlying mutex. >> Signed-off-by: Christian König <christian.koenig@amd.com> > Much thanks for Cc'ing the relevant maintainers :/ Sorry for that. >> --- >> include/linux/ww_mutex.h | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h >> index 39fda195bf78..14e4149d3d9d 100644 >> --- a/include/linux/ww_mutex.h >> +++ b/include/linux/ww_mutex.h >> @@ -358,4 +358,21 @@ static inline bool ww_mutex_is_locked(struct ww_mutex *lock) >> return mutex_is_locked(&lock->base); >> } >> >> +/** >> + * ww_mutex_is_owned_by - is the w/w mutex locked by this task in that context >> + * @lock: the mutex to be queried >> + * @ctx: the w/w acquire context to test >> + * >> + * If @ctx is not NULL test if the mutex is owned by this context. >> + * If @ctx is NULL test if the mutex is owned by the current thread. >> + */ >> +static inline bool ww_mutex_is_owned_by(struct ww_mutex *lock, >> + struct ww_acquire_ctx *ctx) >> +{ >> + if (ctx) >> + return likely(READ_ONCE(lock->ctx) == ctx); >> + else >> + return likely(__mutex_owner(&lock->base) == current); >> +} > Much better than the previous version. If you want to bike-shed, you can > leave out the 'else' and unindent the last line. Thanks for the suggestion, going to do this. > I do worry about potential users of .ctx = NULL, though. It makes it far > too easy to do recursive locking, which is something we should strongly > discourage. Well, one of the addressed use cases is indeed checking for recursive locking. But recursive locking is something rather normal for ww_mutex and we are just exercising an existing code path. E.g. the most common use case for the ww_mutex is in the graphics drivers where usespace sends us a list of buffer objects to work with. Now when userspace sends us duplicates in that buffer list the expectation is to get -EALREADY from ww_mutex_lock when we try to lock the same ww_mutex twice. Depending on the driver this then results in returning an error code to userspace or just ignoring the duplicate (because of backward compatibility). The intention behind this function is now to a) be able to extend those checks to make sure user space doesn't sends us potentially harmful nonsense and b) allow to check for recursion in TTM during buffer object eviction which uses ww_mutex_trylock instead of ww_mutex_lock. Regards, Christian. _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2018-02-20 13:27 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-20 12:58 [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Christian König 2018-02-20 12:58 ` Christian König 2018-02-20 12:58 ` [PATCH 2/4] drm/amdgpu: use new ww_mutex_is_owned_by function Christian König 2018-02-20 12:58 ` Christian König 2018-02-23 9:48 ` He, Roger 2018-02-23 9:48 ` He, Roger 2018-02-20 12:58 ` [PATCH 3/4] drm/ttm: handle already locked BOs during eviction and swapout Christian König 2018-02-20 12:58 ` Christian König 2018-02-23 9:46 ` He, Roger 2018-02-23 9:46 ` He, Roger 2018-02-23 12:05 ` Christian König 2018-02-23 12:05 ` Christian König 2018-02-24 3:36 ` He, Roger 2018-02-24 3:36 ` He, Roger 2018-02-24 3:46 ` He, Roger 2018-02-24 3:46 ` He, Roger 2018-02-20 12:58 ` [PATCH 4/4] drm/ttm: keep BOs reserved until end of eviction Christian König 2018-02-20 12:58 ` Christian König 2018-02-23 9:29 ` He, Roger 2018-02-23 9:29 ` He, Roger 2018-02-20 13:12 ` [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Peter Zijlstra 2018-02-20 13:12 ` Peter Zijlstra 2018-02-20 13:26 ` Christian König [this message] 2018-02-20 13:26 ` Christian König 2018-02-20 13:57 ` Peter Zijlstra 2018-02-20 13:57 ` Peter Zijlstra 2018-02-20 14:34 ` Christian König 2018-02-20 14:34 ` Christian König 2018-02-20 14:54 ` Peter Zijlstra 2018-02-20 14:54 ` Peter Zijlstra 2018-02-20 15:05 ` Christian König 2018-02-20 15:05 ` Christian König 2018-02-20 15:21 ` Peter Zijlstra 2018-02-20 15:21 ` Peter Zijlstra 2018-02-20 23:56 ` Daniel Vetter 2018-02-20 23:56 ` Daniel Vetter 2018-02-21 10:54 ` Maarten Lankhorst 2018-02-21 10:54 ` Maarten Lankhorst 2018-02-21 11:50 ` Christian König 2018-02-21 11:50 ` Christian König 2018-02-21 21:10 ` Emil Velikov 2018-02-21 21:10 ` Emil Velikov 2018-02-20 14:02 ` Daniel Vetter 2018-02-20 14:02 ` 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=8fd80334-4d0e-8ed0-8a09-02a7e36a0eae@gmail.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=christian.koenig@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=peterz@infradead.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.