From a105a962320a540106f21abbfc4b74551acc3d8a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 25 Feb 2022 05:23:54 +0000 Subject: [PATCH] import bind-9.11.36-3.el8 --- SOURCES/bind-9.15-resolver-ntasks.patch | 58 +++++++++++++++++++++++++ SPECS/bind.spec | 8 +++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 SOURCES/bind-9.15-resolver-ntasks.patch diff --git a/SOURCES/bind-9.15-resolver-ntasks.patch b/SOURCES/bind-9.15-resolver-ntasks.patch new file mode 100644 index 0000000..5269016 --- /dev/null +++ b/SOURCES/bind-9.15-resolver-ntasks.patch @@ -0,0 +1,58 @@ +From 6d6acf236841da5c2511f8afcd3e4a89af4c5658 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= +Date: Fri, 14 Feb 2020 09:18:48 +0100 +Subject: [PATCH] Use RESOLVER_NTASKS_PERCPU - 32 for regular tuning, 8 for + small + +Modify original upstream commit 0d80266f7e3, add high limit of used +tasks. Minimum would be lower on machines with few cpus, but maximum +would stay unchanged. Should prevent negatives of this change. + +Signed-off-by: Petr Mensik +--- + bin/named/server.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/bin/named/server.c b/bin/named/server.c +index 39b1124..94b4daa 100644 +--- a/bin/named/server.c ++++ b/bin/named/server.c +@@ -148,11 +148,13 @@ + #endif + + #ifdef TUNE_LARGE +-#define RESOLVER_NTASKS 523 ++#define RESOLVER_NTASKS_MAX 523 ++#define RESOLVER_NTASKS_PERCPU 32 + #define UDPBUFFERS 32768 + #define EXCLBUFFERS 32768 + #else +-#define RESOLVER_NTASKS 31 ++#define RESOLVER_NTASKS_MAX 31 ++#define RESOLVER_NTASKS_PERCPU 8 + #define UDPBUFFERS 1000 + #define EXCLBUFFERS 4096 + #endif /* TUNE_LARGE */ +@@ -3318,7 +3320,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, + ns_cache_t *nsc; + bool zero_no_soattl; + dns_acl_t *clients = NULL, *mapped = NULL, *excluded = NULL; +- unsigned int query_timeout, ndisp; ++ unsigned int query_timeout, ndisp, ntasks; + bool old_rpz_ok = false; + isc_dscp_t dscp4 = -1, dscp6 = -1; + dns_dyndbctx_t *dctx = NULL; +@@ -3926,7 +3928,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, + dns_view_setresquerystats(view, resquerystats); + + ndisp = 4 * ISC_MIN(ns_g_udpdisp, MAX_UDP_DISPATCH); +- CHECK(dns_view_createresolver(view, ns_g_taskmgr, RESOLVER_NTASKS, ++ ntasks = ISC_MIN(RESOLVER_NTASKS_PERCPU * ns_g_cpus, ++ RESOLVER_NTASKS_MAX); ++ CHECK(dns_view_createresolver(view, ns_g_taskmgr, ntasks, + ndisp, ns_g_socketmgr, ns_g_timermgr, + resopts, ns_g_dispatchmgr, + dispatch4, dispatch6)); +-- +2.34.1 + diff --git a/SPECS/bind.spec b/SPECS/bind.spec index 2ef1e6b..e4f85d3 100644 --- a/SPECS/bind.spec +++ b/SPECS/bind.spec @@ -68,7 +68,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.36 -Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -156,6 +156,8 @@ Patch177:bind-9.11-serve-stale.patch Patch178:bind-9.11-dhcp-time-monotonic.patch # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5253 Patch183:bind-9.11-rh1980757.patch +# modified, https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/3067 +Patch184: bind-9.15-resolver-ntasks.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -550,6 +552,7 @@ are used for building ISC DHCP. %patch177 -p1 -b .serve-stale %patch178 -p1 -b .time-monotonic %patch183 -p1 -b .rh1980757 +%patch184 -p1 -b .rh2030239 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1602,6 +1605,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Thu Feb 10 2022 Petr Menšík - 32:9.11.36-2 +- Reduce memory used per-view on machine with few processors (#2030239) + * Tue Dec 21 2021 Petr Menšík - 32:9.11.36-2 - Rebuilt on a new side-tag (#2013993)