The ->profile member is at different offsets in struct rspinlock and
struct spinlock. When initializing the profiling bits of an rspinlock,
an unrelated member in struct rspinlock was being overwritten, leading
to mild havoc. Use the correct pointer.
Fixes: b053075d1a7b ("xen/spinlock: make struct lock_profile rspinlock_t aware")
Signed-off-by: Stewart Hildebrand <stewart.hildebr...@amd.com>
---
xen/common/spinlock.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index 558ea7ac3518..28c6e9d3ac60 100644
--- a/xen/common/spinlock.c
+++ b/xen/common/spinlock.c
@@ -789,7 +789,11 @@ static int __init cf_check lock_prof_init(void)
{
(*q)->next = lock_profile_glb_q.elem_q;
lock_profile_glb_q.elem_q = *q;
- (*q)->ptr.lock->profile = *q;
+
+ if ( (*q)->is_rlock )
+ (*q)->ptr.rlock->profile = *q;
+ else
+ (*q)->ptr.lock->profile = *q;
}
_lock_profile_register_struct(LOCKPROF_TYPE_GLOBAL,
base-commit: 23cd1207e7f6ee3e51fb42e11dba8d7cdb28e1e5
--
2.43.2
