From 13893a58e28d0fee355ec299216568e4ab1c2c23 Mon Sep 17 00:00:00 2001 From: Stewart Hildebrand Date: Fri, 26 Apr 2024 12:43:24 +0200 Subject: [PATCH] xen/spinlock: use correct pointer 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 Reviewed-by: Jan Beulich --- 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 558ea7ac35..28c6e9d3ac 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,