git: afb44cb01018 - main - rmlock: Temporarily revert commit c84bb8cd771c

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=afb44cb01018eb1363cb4ee20a31534b844d00f7

commit afb44cb01018eb1363cb4ee20a31534b844d00f7
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2022-03-07 15:35:59 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2022-03-07 15:43:19 +0000

    rmlock: Temporarily revert commit c84bb8cd771c
    
    It appears to have introduced a regression on arm64, possibly due to the
    fact that the pcpu pointer is reloaded outside of the critical section
    in _rm_rlock().  Until this is resolved one way or another, let's
    revert.
    
    Reported by:    Ronald Klop <ronald-li...@klop.ws>
    Sponsored by:   The FreeBSD Foundation
---
 sys/kern/kern_rmlock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c
index 0cdcfb8fec62..d7dea8efc40e 100644
--- a/sys/kern/kern_rmlock.c
+++ b/sys/kern/kern_rmlock.c
@@ -451,7 +451,7 @@ _rm_rlock(struct rmlock *rm, struct rm_priotracker 
*tracker, int trylock)
        td->td_critnest++;      /* critical_enter(); */
        atomic_interrupt_fence();
 
-       pc = get_pcpu();
+       pc = cpuid_to_pcpu[td->td_oncpu];
        rm_tracker_add(pc, tracker);
        sched_pin();
 
@@ -515,7 +515,7 @@ _rm_runlock(struct rmlock *rm, struct rm_priotracker 
*tracker)
        td->td_critnest++;      /* critical_enter(); */
        atomic_interrupt_fence();
 
-       pc = get_pcpu();
+       pc = cpuid_to_pcpu[td->td_oncpu];
        rm_tracker_remove(pc, tracker);
 
        atomic_interrupt_fence();