[xen staging-4.18] x86/mm: use block_lock_speculation() in _mm_write_lock()

[patchbot@xxxxxxx]

commit 62d9ca19f9f50451c94d69050a5eaffd98ac1c20
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Mar 27 12:20:05 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Mar 27 12:20:05 2024 +0100

    x86/mm: use block_lock_speculation() in _mm_write_lock()
    
    I can only guess that using block_speculation() there was a leftover
    from, earlier on, SPECULATIVE_HARDEN_LOCK depending on
    SPECULATIVE_HARDEN_BRANCH.
    
    Fixes: 197ecd838a2a ("locking: attempt to ensure lock wrappers are always 
inline")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 62018f08708a5ff6ef8fc8ff2aaaac46e5a60430
    master date: 2024-03-18 13:53:37 +0100
---
 xen/arch/x86/mm/mm-locks.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/mm-locks.h b/xen/arch/x86/mm/mm-locks.h
index b4960fb90e..30eb5dfd60 100644
--- a/xen/arch/x86/mm/mm-locks.h
+++ b/xen/arch/x86/mm/mm-locks.h
@@ -138,7 +138,7 @@ static always_inline void _mm_write_lock(const struct 
domain *d, mm_rwlock_t *l,
         _set_lock_level(_lock_level(d, level));
     }
     else
-        block_speculation();
+        block_lock_speculation();
     l->recurse_count++;
 }
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.18