git: cbca929869a8 - stable/13 - libpthread: allocate rwlocks and spinlocks in dedicated cachelines

The branch stable/13 has been updated by mjg:

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

commit cbca929869a818c9b3353753df71210816a126d6
Author:     Greg Becker <becker.greg@att.net>
AuthorDate: 2023-06-27 01:08:29 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-07-05 12:34:09 +0000

    libpthread: allocate rwlocks and spinlocks in dedicated cachelines
    
    Reduces severe performance degradation due to false-sharing. Note that this
    does not account for hardware which can perform adjacent cacheline prefetch.
    
    [mjg: massaged the commit message and the patch to use aligned_alloc
    instead of malloc]
    
    PR:     272238
    MFC after:      1 week
    
    (cherry picked from commit a6c0d801ca5934bb9b9cca6870ea7406d5db0641)
---
 lib/libthr/thread/thr_pspinlock.c | 3 ++-
 lib/libthr/thread/thr_rwlock.c    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index d1a53446f654..b1b8164c9777 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -60,7 +60,8 @@ _pthread_spin_init(pthread_spinlock_t *lock, int pshared)
 	if (lock == NULL)
 		return (EINVAL);
 	if (pshared == PTHREAD_PROCESS_PRIVATE) {
-		lck = malloc(sizeof(struct pthread_spinlock));
+		lck = aligned_alloc(CACHE_LINE_SIZE,
+		    roundup(sizeof(struct pthread_spinlock), CACHE_LINE_SIZE));
 		if (lck == NULL)
 			return (ENOMEM);
 		*lock = lck;
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 1d110a7bf285..8457250e60f7 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "namespace.h"
 #include <pthread.h>
@@ -102,9 +103,11 @@ rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
 
 	if (attr == NULL || *attr == NULL ||
 	    (*attr)->pshared == PTHREAD_PROCESS_PRIVATE) {
-		prwlock = calloc(1, sizeof(struct pthread_rwlock));
+		prwlock = aligned_alloc(CACHE_LINE_SIZE,
+		    roundup(sizeof(struct pthread_rwlock), CACHE_LINE_SIZE));
 		if (prwlock == NULL)
 			return (ENOMEM);
+		memset(prwlock, 0, sizeof(struct pthread_rwlock));
 		*rwlock = prwlock;
 	} else {
 		prwlock = __thr_pshared_offpage(rwlock, 1);