Commit 318ce71f authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Peter Zijlstra

dma-buf: Remove custom seqcount lockdep class key

Commit 3c3b177a ("reservation: add support for read-only access
using rcu") introduced a sequence counter to manage updates to
reservations. Back then, the reservation object initializer
reservation_object_init() was always inlined.

Having the sequence counter initialization inlined meant that each of
the call sites would have a different lockdep class key, which would've
broken lockdep's deadlock detection. The aforementioned commit thus
introduced, and exported, a custom seqcount lockdep class key and name.

The commit 8735f168 ("dma-buf: cleanup reservation_object_init...")
transformed the reservation object initializer to a normal non-inlined C
function. seqcount_init(), which automatically defines the seqcount
lockdep class key and must be called non-inlined, can now be safely used.

Remove the seqcount custom lockdep class key, name, and export. Use
seqcount_init() inside the dma reservation object initializer.
Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://lkml.kernel.org/r/20200720155530.1173732-12-a.darwish@linutronix.de
parent ec8702da
...@@ -51,12 +51,6 @@ ...@@ -51,12 +51,6 @@
DEFINE_WD_CLASS(reservation_ww_class); DEFINE_WD_CLASS(reservation_ww_class);
EXPORT_SYMBOL(reservation_ww_class); EXPORT_SYMBOL(reservation_ww_class);
struct lock_class_key reservation_seqcount_class;
EXPORT_SYMBOL(reservation_seqcount_class);
const char reservation_seqcount_string[] = "reservation_seqcount";
EXPORT_SYMBOL(reservation_seqcount_string);
/** /**
* dma_resv_list_alloc - allocate fence list * dma_resv_list_alloc - allocate fence list
* @shared_max: number of fences we need space for * @shared_max: number of fences we need space for
...@@ -135,9 +129,8 @@ subsys_initcall(dma_resv_lockdep); ...@@ -135,9 +129,8 @@ subsys_initcall(dma_resv_lockdep);
void dma_resv_init(struct dma_resv *obj) void dma_resv_init(struct dma_resv *obj)
{ {
ww_mutex_init(&obj->lock, &reservation_ww_class); ww_mutex_init(&obj->lock, &reservation_ww_class);
seqcount_init(&obj->seq);
__seqcount_init(&obj->seq, reservation_seqcount_string,
&reservation_seqcount_class);
RCU_INIT_POINTER(obj->fence, NULL); RCU_INIT_POINTER(obj->fence, NULL);
RCU_INIT_POINTER(obj->fence_excl, NULL); RCU_INIT_POINTER(obj->fence_excl, NULL);
} }
......
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
extern struct ww_class reservation_ww_class; extern struct ww_class reservation_ww_class;
extern struct lock_class_key reservation_seqcount_class;
extern const char reservation_seqcount_string[];
/** /**
* struct dma_resv_list - a list of shared fences * struct dma_resv_list - a list of shared fences
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment