From 17101fd093508fe5020554d5e5ad826d940e3c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 17 Apr 2020 08:36:24 +0200 Subject: [PATCH 1/3] Make ISC rwlock implementation the default again Revert the change from ad03c22e976411cad743bc02746b803a2f119df7 as further testing has shown that with hyper-threading disabled, named with ISC rwlocks outperforms named with pthread rwlocks in cold cache testing scenarios. Since building named with pthread rwlocks might still be a better choice for some workloads, keep the compile-time option which enables that. --- configure | 7 +++---- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 69ed062df3..9d84854757 100755 --- a/configure +++ b/configure @@ -1624,9 +1624,8 @@ Optional Features: --enable-devpoll use /dev/poll when available [default=yes] --disable-geoip support GeoIP2 geolocation ACLs if available [default=yes] - --disable-pthread-rwlock - use internal rwlock implementation instead of - pthread rwlock + --enable-pthread-rwlock use pthread rwlock instead of internal rwlock + implementation --enable-fips-mode enable FIPS mode in OpenSSL library [default=no] --enable-native-pkcs11 use native PKCS11 for public-key crypto [default=no] --disable-tcp-fastopen disable TCP Fast Open support [default=yes] @@ -16001,7 +16000,7 @@ done if test "${enable_pthread_rwlock+set}" = set; then : enableval=$enable_pthread_rwlock; else - enable_pthread_rwlock=yes + enable_pthread_rwlock=no fi diff --git a/configure.ac b/configure.ac index d2a94e1c0a..3f36c92c22 100644 --- a/configure.ac +++ b/configure.ac @@ -685,9 +685,9 @@ AC_SUBST(ALWAYS_DEFINES) # Do we want to use pthread rwlock? # AC_ARG_ENABLE([pthread_rwlock], - [AS_HELP_STRING([--disable-pthread-rwlock], - [use internal rwlock implementation instead of pthread rwlock])], - [], [enable_pthread_rwlock=yes]) + [AS_HELP_STRING([--enable-pthread-rwlock], + [use pthread rwlock instead of internal rwlock implementation])], + [], [enable_pthread_rwlock=no]) AS_IF([test "$enable_pthread_rwlock" = "yes"], [AC_CHECK_FUNCS([pthread_rwlock_rdlock], [], From 0cf1e2bf62d0c9d7b3489709a784c533cf205a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 17 Apr 2020 08:36:24 +0200 Subject: [PATCH 2/3] Add a release note --- doc/arm/notes-9.17.2.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/arm/notes-9.17.2.xml b/doc/arm/notes-9.17.2.xml index 5a8842f8f5..f3db134a68 100644 --- a/doc/arm/notes-9.17.2.xml +++ b/doc/arm/notes-9.17.2.xml @@ -45,7 +45,8 @@ - None. + The default rwlock implementation has been changed back to the native + BIND 9 rwlock implementation. [GL #1753] From 58daa5af1e441a5dbba2cf9e618212111136054d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 17 Apr 2020 08:36:24 +0200 Subject: [PATCH 3/3] Add CHANGES entry 5385. [func] Make ISC rwlock implementation the default again. [GL #1753] --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index e89d05adef..acc0e6c29c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5385. [func] Make ISC rwlock implementation the default again. + [GL #1753] + 5384. [bug] With dnssec-policy, inline-signing was implicitly set to yes. Change and only set inline-signing to yes if the zone is not dynamic. [GL #1709]