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.koe...@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.
