From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Dec 2023 02:15:03 +0000 (+1100)
Subject: Also cleanup the space for the rbt nodes
X-Git-Tag: v9.19.19~4^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e462c2b26299f77944fb225923b7b01e0017856;p=thirdparty%2Fbind9.git

Also cleanup the space for the rbt nodes

As we are in overmem state we want to free more memory than we are
adding so we need to add in an allowance for the rbtnodes that may
have been added and the names stored with them.  There is the node
for the owner name and a possible ENT node if there was a node split.
---

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 08b4803ab99..93e429069bb 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -991,4 +991,11 @@ dns__rbtnode_namelen(dns_rbtnode_t *node);
  * Returns the length of the full name of the node. Used only internally
  * and in unit tests.
  */
+
+unsigned int
+dns__rbtnode_getsize(dns_rbtnode_t *node);
+/*
+ * Return allocated size for a node.
+ */
+
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/rbt-cachedb.c b/lib/dns/rbt-cachedb.c
index 51d56c4ede7..ea2ff089969 100644
--- a/lib/dns/rbt-cachedb.c
+++ b/lib/dns/rbt-cachedb.c
@@ -1673,7 +1673,9 @@ dns__cachedb_overmem(dns_rbtdb_t *rbtdb, dns_slabheader_t *newheader,
 		     isc_rwlocktype_t *tlocktypep DNS__DB_FLARG) {
 	uint32_t locknum_start = rbtdb->lru_sweep++ % rbtdb->node_lock_count;
 	uint32_t locknum = locknum_start;
-	size_t purgesize = rdataset_size(newheader);
+	/* Size of added data, possible node and possible ENT node. */
+	size_t purgesize = rdataset_size(newheader) +
+			   2 * dns__rbtnode_getsize(HEADER_NODE(newheader));
 	size_t purged = 0;
 	isc_stdtime_t min_last_used = 0;
 	size_t max_passes = 8;
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index f4115d1070e..07028f6b133 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -251,6 +251,13 @@ dns__rbtnode_namelen(dns_rbtnode_t *node) {
 	return (len);
 }
 
+unsigned int
+dns__rbtnode_getsize(dns_rbtnode_t *node) {
+	REQUIRE(DNS_RBTNODE_VALID(node));
+
+	return (NODE_SIZE(node));
+}
+
 /*
  * Initialize a red/black tree of trees.
  */