From: Ondřej Surý <ondrej@isc.org>
Date: Fri, 21 Mar 2025 08:29:17 +0000 (+0100)
Subject: Fix invalid cache-line padding for qpcache buckets
X-Git-Tag: v9.21.7~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef9b09620c3c3360498098fad5a33b765767ab2;p=thirdparty%2Fbind9.git

Fix invalid cache-line padding for qpcache buckets

The isc_queue_t was missing in the calculation of the required
padding size inside the qpcache bucket structure.
---

diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index 5ec6bc66db3..44339525a16 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -238,8 +238,8 @@ typedef struct qpcache_bucket {
 
 	/* Padding to prevent false sharing between locks. */
 	uint8_t __padding[ISC_OS_CACHELINE_SIZE -
-			  (sizeof(dns_slabheaderlist_t) + sizeof(isc_heap_t *) +
-			   sizeof(isc_rwlock_t)) %
+			  (sizeof(isc_queue_t) + sizeof(isc_rwlock_t) +
+			   sizeof(dns_slabheaderlist_t) + sizeof(isc_heap_t *)) %
 				  ISC_OS_CACHELINE_SIZE];
 
 } qpcache_bucket_t;