diff --git a/lib/dns/db.c b/lib/dns/db.c index 43edbb76a4..1567111d20 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -41,6 +41,8 @@ #include #include #include +#include +#include /*** *** Private Types @@ -1214,3 +1216,260 @@ dns__db_logtoomanyrecords(dns_db_t *db, const dns_name_t *name, (db->attributes & DNS_DBATTR_CACHE) != 0 ? "cache" : "zone", isc_result_totext(DNS_R_TOOMANYRECORDS), limit); } + +void +dns__db_free_glue(isc_mem_t *mctx, dns_glue_t *glue) { + while (glue != NULL) { + dns_glue_t *next = glue->next; + + if (dns_rdataset_isassociated(&glue->rdataset_a)) { + dns_rdataset_disassociate(&glue->rdataset_a); + } + if (dns_rdataset_isassociated(&glue->sigrdataset_a)) { + dns_rdataset_disassociate(&glue->sigrdataset_a); + } + + if (dns_rdataset_isassociated(&glue->rdataset_aaaa)) { + dns_rdataset_disassociate(&glue->rdataset_aaaa); + } + if (dns_rdataset_isassociated(&glue->sigrdataset_aaaa)) { + dns_rdataset_disassociate(&glue->sigrdataset_aaaa); + } + + dns_rdataset_invalidate(&glue->rdataset_a); + dns_rdataset_invalidate(&glue->sigrdataset_a); + dns_rdataset_invalidate(&glue->rdataset_aaaa); + dns_rdataset_invalidate(&glue->sigrdataset_aaaa); + + dns_name_free(&glue->name, mctx); + + isc_mem_put(mctx, glue, sizeof(*glue)); + + glue = next; + } +} + +void +dns__db_destroy_gluelist(dns_gluelist_t **gluelistp) { + REQUIRE(gluelistp != NULL); + if (*gluelistp == NULL) { + return; + } + + dns_gluelist_t *gluelist = *gluelistp; + + dns__db_free_glue(gluelist->mctx, gluelist->glue); + + isc_mem_putanddetach(&gluelist->mctx, gluelist, sizeof(*gluelist)); +} + +void +dns__db_free_gluelist_rcu(struct rcu_head *rcu_head) { + dns_gluelist_t *gluelist = caa_container_of(rcu_head, dns_gluelist_t, + rcu_head); + dns__db_destroy_gluelist(&gluelist); +} + +void +dns__db_cleanup_gluelists(struct cds_wfs_stack *glue_stack) { + struct cds_wfs_head *head = __cds_wfs_pop_all(glue_stack); + struct cds_wfs_node *node = NULL, *next = NULL; + + rcu_read_lock(); + cds_wfs_for_each_blocking_safe(head, node, next) { + dns_gluelist_t *gluelist = + caa_container_of(node, dns_gluelist_t, wfs_node); + dns_slabheader_t *header = rcu_xchg_pointer(&gluelist->header, + NULL); + (void)rcu_cmpxchg_pointer(&header->gluelist, gluelist, NULL); + + call_rcu(&gluelist->rcu_head, dns__db_free_gluelist_rcu); + } + rcu_read_unlock(); +} + +#define IS_REQUIRED_GLUE(r) (((r)->attributes & DNS_RDATASETATTR_REQUIRED) != 0) + +static void +addglue_to_message(dns_glue_t *ge, dns_message_t *msg) { + for (; ge != NULL; ge = ge->next) { + dns_name_t *name = NULL; + dns_rdataset_t *rdataset_a = NULL; + dns_rdataset_t *sigrdataset_a = NULL; + dns_rdataset_t *rdataset_aaaa = NULL; + dns_rdataset_t *sigrdataset_aaaa = NULL; + bool prepend_name = false; + + dns_message_gettempname(msg, &name); + + dns_name_copy(&ge->name, name); + + if (dns_rdataset_isassociated(&ge->rdataset_a)) { + dns_message_gettemprdataset(msg, &rdataset_a); + } + + if (dns_rdataset_isassociated(&ge->sigrdataset_a)) { + dns_message_gettemprdataset(msg, &sigrdataset_a); + } + + if (dns_rdataset_isassociated(&ge->rdataset_aaaa)) { + dns_message_gettemprdataset(msg, &rdataset_aaaa); + } + + if (dns_rdataset_isassociated(&ge->sigrdataset_aaaa)) { + dns_message_gettemprdataset(msg, &sigrdataset_aaaa); + } + + if (rdataset_a != NULL) { + dns_rdataset_clone(&ge->rdataset_a, rdataset_a); + ISC_LIST_APPEND(name->list, rdataset_a, link); + if (IS_REQUIRED_GLUE(rdataset_a)) { + prepend_name = true; + } + } + + if (sigrdataset_a != NULL) { + dns_rdataset_clone(&ge->sigrdataset_a, sigrdataset_a); + ISC_LIST_APPEND(name->list, sigrdataset_a, link); + } + + if (rdataset_aaaa != NULL) { + dns_rdataset_clone(&ge->rdataset_aaaa, rdataset_aaaa); + ISC_LIST_APPEND(name->list, rdataset_aaaa, link); + if (IS_REQUIRED_GLUE(rdataset_aaaa)) { + prepend_name = true; + } + } + if (sigrdataset_aaaa != NULL) { + dns_rdataset_clone(&ge->sigrdataset_aaaa, + sigrdataset_aaaa); + ISC_LIST_APPEND(name->list, sigrdataset_aaaa, link); + } + + dns_message_addname(msg, name, DNS_SECTION_ADDITIONAL); + + /* + * When looking for required glue, dns_message_rendersection() + * only processes the first rdataset associated with the first + * name added to the ADDITIONAL section. dns_message_addname() + * performs an append on the list of names in a given section, + * so if any glue record was marked as required, we need to + * move the name it is associated with to the beginning of the + * list for the ADDITIONAL section or else required glue might + * not be rendered. + */ + if (prepend_name) { + ISC_LIST_UNLINK(msg->sections[DNS_SECTION_ADDITIONAL], + name, link); + ISC_LIST_PREPEND(msg->sections[DNS_SECTION_ADDITIONAL], + name, link); + } + } +} + +static dns_gluelist_t * +new_gluelist(dns_db_t *db, dns_slabheader_t *header, + const dns_dbversion_t *dbversion) { + dns_gluelist_t *gluelist = isc_mem_get(db->mctx, sizeof(*gluelist)); + *gluelist = (dns_gluelist_t){ + .version = dbversion, + .header = header, + }; + + isc_mem_attach(db->mctx, &gluelist->mctx); + + cds_wfs_node_init(&gluelist->wfs_node); + + return gluelist; +} + +static dns_gluelist_t * +create_gluelist(dns_db_t *db, dns_dbversion_t *dbversion, dns_dbnode_t *dbnode, + dns_rdataset_t *rdataset, dns_additionaldatafunc_t add) { + dns_slabheader_t *header = dns_slabheader_fromrdataset(rdataset); + dns_glue_additionaldata_ctx_t ctx = { + .db = db, + .version = dbversion, + .node = dbnode, + }; + dns_gluelist_t *gluelist = new_gluelist(ctx.db, header, ctx.version); + + /* + * Get the owner name of the NS RRset - it will be necessary for + * identifying required glue in glue_nsdname_cb() (by + * determining which NS records in the delegation are + * in-bailiwick). + */ + + (void)dns_rdataset_additionaldata(rdataset, dns_rootname, add, &ctx); + + gluelist->glue = ctx.glue; + + return gluelist; +} + +isc_result_t +dns__db_addglue(dns_db_t *db, dns_dbversion_t *dbversion, + dns_rdataset_t *rdataset, dns_message_t *msg, + dns_additionaldatafunc_t add, + struct cds_wfs_stack *glue_stack) { + dns_dbnode_t *dbnode = (dns_dbnode_t *)rdataset->slab.node; + dns_slabheader_t *header = dns_slabheader_fromrdataset(rdataset); + dns_glue_t *glue = NULL; + isc_result_t result = ISC_R_SUCCESS; + + REQUIRE(rdataset->type == dns_rdatatype_ns); + + rcu_read_lock(); + + dns_gluelist_t *gluelist = rcu_dereference(header->gluelist); + if (gluelist == NULL || gluelist->version != dbversion) { + /* No or old glue list was found in the table. */ + + dns_gluelist_t *xchg_gluelist = gluelist; + dns_gluelist_t *old_gluelist = (void *)-1; + dns_gluelist_t *new_gluelist = + create_gluelist(db, dbversion, dbnode, rdataset, add); + + while (old_gluelist != xchg_gluelist && + (xchg_gluelist == NULL || + xchg_gluelist->version != dbversion)) + { + old_gluelist = xchg_gluelist; + xchg_gluelist = rcu_cmpxchg_pointer( + &header->gluelist, old_gluelist, new_gluelist); + } + + if (old_gluelist == xchg_gluelist) { + /* CAS was successful */ + cds_wfs_push(glue_stack, &new_gluelist->wfs_node); + gluelist = new_gluelist; + } else { + dns__db_destroy_gluelist(&new_gluelist); + gluelist = xchg_gluelist; + } + } + + glue = gluelist->glue; + + if (glue != NULL) { + addglue_to_message(glue, msg); + result = ISC_R_NOTFOUND; + } + + rcu_read_unlock(); + + return result; +} + +dns_glue_t * +dns__db_new_glue(isc_mem_t *mctx, const dns_name_t *name) { + dns_glue_t *glue = isc_mem_get(mctx, sizeof(*glue)); + *glue = (dns_glue_t){ + .name = DNS_NAME_INITEMPTY, + }; + + dns_name_dup(name, mctx, &glue->name); + + return glue; +} diff --git a/lib/dns/db_p.h b/lib/dns/db_p.h index 3a982252a6..19788bbe4c 100644 --- a/lib/dns/db_p.h +++ b/lib/dns/db_p.h @@ -21,9 +21,6 @@ #include #include -#define GLUETABLE_INIT_SIZE 1 << 2 -#define GLUETABLE_MIN_SIZE 1 << 8 - #define RDATATYPE_NCACHEANY DNS_TYPEPAIR_VALUE(0, dns_rdatatype_any) #ifdef STRONG_RWLOCK_CHECK @@ -123,18 +120,31 @@ ISC_LANG_BEGINDECLS struct dns_glue { struct dns_glue *next; - dns_fixedname_t fixedname; + dns_name_t name; dns_rdataset_t rdataset_a; dns_rdataset_t sigrdataset_a; dns_rdataset_t rdataset_aaaa; dns_rdataset_t sigrdataset_aaaa; }; -typedef struct { - dns_glue_t *glue_list; +struct dns_gluelist { + isc_mem_t *mctx; + + const dns_dbversion_t *version; + dns_slabheader_t *header; + + struct dns_glue *glue; + + struct rcu_head rcu_head; + struct cds_wfs_node wfs_node; +}; + +typedef struct dns_glue_additionaldata_ctx { dns_db_t *db; dns_dbversion_t *version; - dns_name_t *nodename; + dns_dbnode_t *node; + + dns_glue_t *glue; } dns_glue_additionaldata_ctx_t; typedef struct { @@ -196,4 +206,20 @@ dns__db_logtoomanyrecords(dns_db_t *db, const dns_name_t *name, * the addition is to create a new rdataset or to merge to an existing one. */ +void +dns__db_free_glue(isc_mem_t *mctx, dns_glue_t *glue); +void +dns__db_destroy_gluelist(dns_gluelist_t **gluelistp); +void +dns__db_free_gluelist_rcu(struct rcu_head *rcu_head); +void +dns__db_cleanup_gluelists(struct cds_wfs_stack *glue_stack); +isc_result_t +dns__db_addglue(dns_db_t *db, dns_dbversion_t *dbversion, + dns_rdataset_t *rdataset, dns_message_t *msg, + dns_additionaldatafunc_t add, struct cds_wfs_stack *glue_stack); + +dns_glue_t * +dns__db_new_glue(isc_mem_t *mctx, const dns_name_t *name); + ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index e38f4a3aca..254b7d38e5 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -177,8 +177,8 @@ typedef struct dns_dbmethods { void (*locknode)(dns_db_t *db, dns_dbnode_t *node, isc_rwlocktype_t t); void (*unlocknode)(dns_db_t *db, dns_dbnode_t *node, isc_rwlocktype_t t); - void (*addglue)(dns_db_t *db, dns_dbversion_t *version, - dns_rdataset_t *rdataset, dns_message_t *msg); + isc_result_t (*addglue)(dns_db_t *db, dns_dbversion_t *version, + dns_rdataset_t *rdataset, dns_message_t *msg); void (*expiredata)(dns_db_t *db, dns_dbnode_t *node, void *data); void (*deletedata)(dns_db_t *db, dns_dbnode_t *node, void *data); isc_result_t (*nodefullname)(dns_db_t *db, dns_dbnode_t *node, diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index e5ecbebf33..3061f0ece4 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/lib/dns/include/dns/rdataslab.h @@ -133,6 +133,8 @@ struct dns_slabheader { unsigned char upper[32]; isc_heap_t *heap; + + dns_gluelist_t *gluelist; }; enum { diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index c4353aef4c..6b124bf734 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -94,6 +94,7 @@ typedef struct dns_forwarder dns_forwarder_t; typedef struct dns_fwdtable dns_fwdtable_t; typedef struct dns_geoip_databases dns_geoip_databases_t; typedef struct dns_glue dns_glue_t; +typedef struct dns_gluelist dns_gluelist_t; typedef struct dns_iptable dns_iptable_t; typedef uint32_t dns_iterations_t; typedef struct dns_kasp dns_kasp_t; diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c index 687aa40847..e15be4504f 100644 --- a/lib/dns/qpzone.c +++ b/lib/dns/qpzone.c @@ -143,7 +143,7 @@ struct qpz_version { uint64_t records; uint64_t xfrsize; - struct cds_lfht *glue_table; + struct cds_wfs_stack glue_stack; }; typedef ISC_LIST(qpz_version_t) qpz_versionlist_t; @@ -214,17 +214,6 @@ typedef struct { isc_stdtime_t now; } qpz_search_t; -typedef struct dns_gluenode_t { - isc_mem_t *mctx; - - struct dns_glue *glue; - - qpznode_t *node; - - struct cds_lfht_node ht_node; - struct rcu_head rcu_head; -} dns_gluenode_t; - /*% * Load Context */ @@ -380,24 +369,6 @@ set_index(void *what, unsigned int idx) { h->heap_index = idx; } -static void -free_gluenode(dns_gluenode_t *gluenode); - -static void -free_gluetable(struct cds_lfht *glue_table) { - struct cds_lfht_iter iter; - dns_gluenode_t *gluenode = NULL; - - rcu_read_lock(); - cds_lfht_for_each_entry(glue_table, &iter, gluenode, ht_node) { - INSIST(!cds_lfht_del(glue_table, &gluenode->ht_node)); - free_gluenode(gluenode); - } - rcu_read_unlock(); - - cds_lfht_destroy(glue_table, NULL); -} - static void free_db_rcu(struct rcu_head *rcu_head) { qpzonedb_t *qpdb = caa_container_of(rcu_head, qpzonedb_t, rcu_head); @@ -442,6 +413,7 @@ free_qpdb(qpzonedb_t *qpdb, bool log) { isc_refcount_destroy(&qpdb->current_version->references); UNLINK(qpdb->open_versions, qpdb->current_version, link); + cds_wfs_destroy(&qpdb->current_version->glue_stack); isc_rwlock_destroy(&qpdb->current_version->rwlock); isc_mem_put(qpdb->common.mctx, qpdb->current_version, sizeof(*qpdb->current_version)); @@ -483,7 +455,7 @@ qpdb_destroy(dns_db_t *arg) { * node count below. */ if (qpdb->current_version != NULL) { - free_gluetable(qpdb->current_version->glue_table); + dns__db_cleanup_gluelists(&qpdb->current_version->glue_stack); } /* @@ -555,11 +527,9 @@ allocate_version(isc_mem_t *mctx, uint32_t serial, unsigned int references, .changed_list = ISC_LIST_INITIALIZER, .resigned_list = ISC_LIST_INITIALIZER, .link = ISC_LINK_INITIALIZER, - .glue_table = cds_lfht_new(GLUETABLE_INIT_SIZE, - GLUETABLE_MIN_SIZE, 0, - CDS_LFHT_AUTO_RESIZE, NULL), }; + cds_wfs_init(&version->glue_stack); isc_rwlock_init(&version->rwlock); isc_refcount_init(&version->references, references); @@ -1447,7 +1417,8 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, if (cleanup_version != NULL) { isc_refcount_destroy(&cleanup_version->references); INSIST(EMPTY(cleanup_version->changed_list)); - free_gluetable(cleanup_version->glue_table); + dns__db_cleanup_gluelists(&cleanup_version->glue_stack); + cds_wfs_destroy(&cleanup_version->glue_stack); isc_rwlock_destroy(&cleanup_version->rwlock); isc_mem_put(qpdb->common.mctx, cleanup_version, sizeof(*cleanup_version)); @@ -4954,25 +4925,15 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { return ISC_R_SUCCESS; } -static dns_glue_t * -new_gluelist(isc_mem_t *mctx, dns_name_t *name) { - dns_glue_t *glue = isc_mem_get(mctx, sizeof(*glue)); - *glue = (dns_glue_t){ 0 }; - dns_name_t *gluename = dns_fixedname_initname(&glue->fixedname); - - dns_name_copy(name, gluename); - - return glue; -} - static isc_result_t glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, - dns_rdataset_t *unused DNS__DB_FLARG) { + dns_rdataset_t *rdataset ISC_ATTR_UNUSED DNS__DB_FLARG) { dns_glue_additionaldata_ctx_t *ctx = NULL; isc_result_t result; dns_fixedname_t fixedname_a; dns_name_t *name_a = NULL; dns_rdataset_t rdataset_a, sigrdataset_a; + const qpznode_t *node = NULL; qpznode_t *node_a = NULL; dns_fixedname_t fixedname_aaaa; dns_name_t *name_aaaa = NULL; @@ -4980,8 +4941,6 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, qpznode_t *node_aaaa = NULL; dns_glue_t *glue = NULL; - UNUSED(unused); - /* * NS records want addresses in additional records. */ @@ -4989,6 +4948,8 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, ctx = (dns_glue_additionaldata_ctx_t *)arg; + node = (qpznode_t *)ctx->node; + name_a = dns_fixedname_initname(&fixedname_a); dns_rdataset_init(&rdataset_a); dns_rdataset_init(&sigrdataset_a); @@ -5001,7 +4962,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, DNS_DBFIND_GLUEOK, 0, (dns_dbnode_t **)&node_a, name_a, &rdataset_a, &sigrdataset_a DNS__DB_FLARG_PASS); if (result == DNS_R_GLUE) { - glue = new_gluelist(ctx->db->mctx, name_a); + glue = dns__db_new_glue(ctx->db->mctx, name_a); dns_rdataset_init(&glue->rdataset_a); dns_rdataset_init(&glue->sigrdataset_a); @@ -5021,7 +4982,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, &sigrdataset_aaaa DNS__DB_FLARG_PASS); if (result == DNS_R_GLUE) { if (glue == NULL) { - glue = new_gluelist(ctx->db->mctx, name_aaaa); + glue = dns__db_new_glue(ctx->db->mctx, name_aaaa); dns_rdataset_init(&glue->rdataset_a); dns_rdataset_init(&glue->sigrdataset_a); @@ -5047,7 +5008,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, * attributes for the first rdataset associated with the first name * added to the ADDITIONAL section. */ - if (glue != NULL && dns_name_issubdomain(name, ctx->nodename)) { + if (glue != NULL && dns_name_issubdomain(name, &node->name)) { if (dns_rdataset_isassociated(&glue->rdataset_a)) { glue->rdataset_a.attributes |= DNS_RDATASETATTR_REQUIRED; @@ -5059,8 +5020,8 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, } if (glue != NULL) { - glue->next = ctx->glue_list; - ctx->glue_list = glue; + glue->next = ctx->glue; + ctx->glue = glue; } result = ISC_R_SUCCESS; @@ -5091,264 +5052,31 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, return result; } -#define IS_REQUIRED_GLUE(r) (((r)->attributes & DNS_RDATASETATTR_REQUIRED) != 0) - -static void -addglue_to_message(dns_glue_t *ge, dns_message_t *msg) { - for (; ge != NULL; ge = ge->next) { - dns_name_t *name = NULL; - dns_rdataset_t *rdataset_a = NULL; - dns_rdataset_t *sigrdataset_a = NULL; - dns_rdataset_t *rdataset_aaaa = NULL; - dns_rdataset_t *sigrdataset_aaaa = NULL; - dns_name_t *gluename = dns_fixedname_name(&ge->fixedname); - bool prepend_name = false; - - dns_message_gettempname(msg, &name); - - dns_name_copy(gluename, name); - - if (dns_rdataset_isassociated(&ge->rdataset_a)) { - dns_message_gettemprdataset(msg, &rdataset_a); - } - - if (dns_rdataset_isassociated(&ge->sigrdataset_a)) { - dns_message_gettemprdataset(msg, &sigrdataset_a); - } - - if (dns_rdataset_isassociated(&ge->rdataset_aaaa)) { - dns_message_gettemprdataset(msg, &rdataset_aaaa); - } - - if (dns_rdataset_isassociated(&ge->sigrdataset_aaaa)) { - dns_message_gettemprdataset(msg, &sigrdataset_aaaa); - } - - if (rdataset_a != NULL) { - dns_rdataset_clone(&ge->rdataset_a, rdataset_a); - ISC_LIST_APPEND(name->list, rdataset_a, link); - if (IS_REQUIRED_GLUE(rdataset_a)) { - prepend_name = true; - } - } - - if (sigrdataset_a != NULL) { - dns_rdataset_clone(&ge->sigrdataset_a, sigrdataset_a); - ISC_LIST_APPEND(name->list, sigrdataset_a, link); - } - - if (rdataset_aaaa != NULL) { - dns_rdataset_clone(&ge->rdataset_aaaa, rdataset_aaaa); - ISC_LIST_APPEND(name->list, rdataset_aaaa, link); - if (IS_REQUIRED_GLUE(rdataset_aaaa)) { - prepend_name = true; - } - } - if (sigrdataset_aaaa != NULL) { - dns_rdataset_clone(&ge->sigrdataset_aaaa, - sigrdataset_aaaa); - ISC_LIST_APPEND(name->list, sigrdataset_aaaa, link); - } - - dns_message_addname(msg, name, DNS_SECTION_ADDITIONAL); - - /* - * When looking for required glue, dns_message_rendersection() - * only processes the first rdataset associated with the first - * name added to the ADDITIONAL section. dns_message_addname() - * performs an append on the list of names in a given section, - * so if any glue record was marked as required, we need to - * move the name it is associated with to the beginning of the - * list for the ADDITIONAL section or else required glue might - * not be rendered. - */ - if (prepend_name) { - ISC_LIST_UNLINK(msg->sections[DNS_SECTION_ADDITIONAL], - name, link); - ISC_LIST_PREPEND(msg->sections[DNS_SECTION_ADDITIONAL], - name, link); - } - } -} - -static dns_glue_t * -newglue(dns_db_t *db, qpz_version_t *version, qpznode_t *node, - dns_rdataset_t *rdataset) { - dns_fixedname_t nodename; - dns_glue_additionaldata_ctx_t ctx = { - .db = db, - .version = (dns_dbversion_t *)version, - .nodename = dns_fixedname_initname(&nodename), - }; - - /* - * Get the owner name of the NS RRset - it will be necessary for - * identifying required glue in glue_nsdname_cb() (by - * determining which NS records in the delegation are - * in-bailiwick). - */ - dns_name_copy(&node->name, ctx.nodename); - - (void)dns_rdataset_additionaldata(rdataset, dns_rootname, - glue_nsdname_cb, &ctx); - - return ctx.glue_list; -} - -static dns_gluenode_t * -new_gluenode(dns_db_t *db, qpz_version_t *version, qpznode_t *node, - dns_rdataset_t *rdataset) { - dns_gluenode_t *gluenode = isc_mem_get(db->mctx, sizeof(*gluenode)); - *gluenode = (dns_gluenode_t){ - .glue = newglue(db, version, node, rdataset), - }; - - isc_mem_attach(db->mctx, &gluenode->mctx); - qpznode_attach(node, &gluenode->node); - - return gluenode; -} - -static void -freeglue(isc_mem_t *mctx, dns_glue_t *glue) { - while (glue != NULL) { - dns_glue_t *next = glue->next; - - if (dns_rdataset_isassociated(&glue->rdataset_a)) { - dns_rdataset_disassociate(&glue->rdataset_a); - } - if (dns_rdataset_isassociated(&glue->sigrdataset_a)) { - dns_rdataset_disassociate(&glue->sigrdataset_a); - } - - if (dns_rdataset_isassociated(&glue->rdataset_aaaa)) { - dns_rdataset_disassociate(&glue->rdataset_aaaa); - } - if (dns_rdataset_isassociated(&glue->sigrdataset_aaaa)) { - dns_rdataset_disassociate(&glue->sigrdataset_aaaa); - } - - dns_rdataset_invalidate(&glue->rdataset_a); - dns_rdataset_invalidate(&glue->sigrdataset_a); - dns_rdataset_invalidate(&glue->rdataset_aaaa); - dns_rdataset_invalidate(&glue->sigrdataset_aaaa); - - isc_mem_put(mctx, glue, sizeof(*glue)); - - glue = next; - } -} - -static void -free_gluenode_rcu(struct rcu_head *rcu_head) { - dns_gluenode_t *gluenode = caa_container_of(rcu_head, dns_gluenode_t, - rcu_head); - - freeglue(gluenode->mctx, gluenode->glue); - - qpznode_detach(&gluenode->node); - - isc_mem_putanddetach(&gluenode->mctx, gluenode, sizeof(*gluenode)); -} - -static void -free_gluenode(dns_gluenode_t *gluenode) { - call_rcu(&gluenode->rcu_head, free_gluenode_rcu); -} - -static uint32_t -qpznode_hash(const qpznode_t *node) { - return isc_hash32(&node, sizeof(node), true); -} - -static int -qpznode_match(struct cds_lfht_node *ht_node, const void *key) { - const dns_gluenode_t *gluenode = - caa_container_of(ht_node, dns_gluenode_t, ht_node); - const qpznode_t *node = key; - - return gluenode->node == node; -} - -static uint32_t -gluenode_hash(const dns_gluenode_t *gluenode) { - return qpznode_hash(gluenode->node); -} - -static int -gluenode_match(struct cds_lfht_node *ht_node, const void *key) { - const dns_gluenode_t *gluenode = key; - - return qpznode_match(ht_node, gluenode->node); -} - -static void +static isc_result_t addglue(dns_db_t *db, dns_dbversion_t *dbversion, dns_rdataset_t *rdataset, dns_message_t *msg) { qpzonedb_t *qpdb = (qpzonedb_t *)db; qpz_version_t *version = dbversion; - qpznode_t *node = (qpznode_t *)rdataset->slab.node; - dns_gluenode_t *gluenode = NULL; + isc_result_t result; REQUIRE(rdataset->type == dns_rdatatype_ns); REQUIRE(qpdb == (qpzonedb_t *)rdataset->slab.db); REQUIRE(qpdb == version->qpdb); REQUIRE(!IS_STUB(qpdb)); - /* - * The glue table cache that forms a part of the DB version - * structure is not explicitly bounded and there's no cache - * cleaning. The zone data size itself is an implicit bound. - * - * The key into the glue hashtable is the node pointer. This is - * because the glue hashtable is a property of the DB version, - * and the glue is keyed for the ownername/NS tuple. We don't - * bother with using an expensive dns_name_t comparison here as - * the node pointer is a fixed value that won't change for a DB - * version and can be compared directly. - */ - - rcu_read_lock(); - - struct cds_lfht_iter iter; - cds_lfht_lookup(version->glue_table, qpznode_hash(node), qpznode_match, - node, &iter); - - gluenode = cds_lfht_entry(cds_lfht_iter_get_node(&iter), dns_gluenode_t, - ht_node); - if (gluenode == NULL) { - /* No cached glue was found in the table. Get new glue. */ - gluenode = new_gluenode(db, version, node, rdataset); - - struct cds_lfht_node *ht_node = cds_lfht_add_unique( - version->glue_table, gluenode_hash(gluenode), - gluenode_match, gluenode, &gluenode->ht_node); - - if (ht_node != &gluenode->ht_node) { - free_gluenode_rcu(&gluenode->rcu_head); - - gluenode = cds_lfht_entry(ht_node, dns_gluenode_t, - ht_node); - } - } - - INSIST(gluenode != NULL); - - dns_glue_t *glue = gluenode->glue; - isc_statscounter_t counter = dns_gluecachestatscounter_hits_present; - - if (glue != NULL) { - /* We have a cached result. Add it to the message and return. */ - addglue_to_message(glue, msg); - } else { - counter = dns_gluecachestatscounter_hits_absent; - } - - rcu_read_unlock(); + result = dns__db_addglue(db, dbversion, rdataset, msg, glue_nsdname_cb, + &version->glue_stack); if (qpdb->gluecachestats != NULL) { + isc_statscounter_t counter = + (result == ISC_R_SUCCESS) + ? dns_gluecachestatscounter_hits_present + : dns_gluecachestatscounter_hits_absent; + isc_stats_increment(qpdb->gluecachestats, counter); } + + return ISC_R_SUCCESS; } static void diff --git a/lib/dns/rbt-zonedb.c b/lib/dns/rbt-zonedb.c index bed5c29527..226603dea5 100644 --- a/lib/dns/rbt-zonedb.c +++ b/lib/dns/rbt-zonedb.c @@ -2091,17 +2091,6 @@ setgluecachestats(dns_db_t *db, isc_stats_t *stats) { return ISC_R_SUCCESS; } -static dns_glue_t * -new_gluelist(isc_mem_t *mctx, dns_name_t *name) { - dns_glue_t *glue = isc_mem_get(mctx, sizeof(*glue)); - *glue = (dns_glue_t){ 0 }; - dns_name_t *gluename = dns_fixedname_initname(&glue->fixedname); - - dns_name_copy(name, gluename); - - return glue; -} - static isc_result_t glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, dns_rdataset_t *unused DNS__DB_FLARG) { @@ -2116,6 +2105,8 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, dns_rdataset_t rdataset_aaaa, sigrdataset_aaaa; dns_rbtnode_t *node_aaaa = NULL; dns_glue_t *glue = NULL; + dns_fixedname_t f_nodename; + dns_name_t *nodename = dns_fixedname_initname(&f_nodename); UNUSED(unused); @@ -2126,6 +2117,8 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, ctx = (dns_glue_additionaldata_ctx_t *)arg; + dns__rbtdb_nodefullname(ctx->db, ctx->node, nodename); + name_a = dns_fixedname_initname(&fixedname_a); dns_rdataset_init(&rdataset_a); dns_rdataset_init(&sigrdataset_a); @@ -2139,7 +2132,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, name_a, &rdataset_a, &sigrdataset_a DNS__DB_FLARG_PASS); if (result == DNS_R_GLUE) { - glue = new_gluelist(ctx->db->mctx, name_a); + glue = dns__db_new_glue(ctx->db->mctx, name_a); dns_rdataset_init(&glue->rdataset_a); dns_rdataset_init(&glue->sigrdataset_a); @@ -2159,7 +2152,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, &sigrdataset_aaaa DNS__DB_FLARG_PASS); if (result == DNS_R_GLUE) { if (glue == NULL) { - glue = new_gluelist(ctx->db->mctx, name_aaaa); + glue = dns__db_new_glue(ctx->db->mctx, name_aaaa); dns_rdataset_init(&glue->rdataset_a); dns_rdataset_init(&glue->sigrdataset_a); @@ -2185,7 +2178,10 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, * attributes for the first rdataset associated with the first name * added to the ADDITIONAL section. */ - if (glue != NULL && dns_name_issubdomain(name, ctx->nodename)) { + isc_result_t dns_rbt_fullnamefromnode(dns_rbtnode_t * node, + dns_name_t * name); + + if (glue != NULL && dns_name_issubdomain(name, nodename)) { if (dns_rdataset_isassociated(&glue->rdataset_a)) { glue->rdataset_a.attributes |= DNS_RDATASETATTR_REQUIRED; @@ -2197,8 +2193,8 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, } if (glue != NULL) { - glue->next = ctx->glue_list; - ctx->glue_list = glue; + glue->next = ctx->glue; + ctx->glue = glue; } result = ISC_R_SUCCESS; @@ -2229,221 +2225,31 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype, return result; } -#define IS_REQUIRED_GLUE(r) (((r)->attributes & DNS_RDATASETATTR_REQUIRED) != 0) - -static void -addglue_to_message(dns_glue_t *ge, dns_message_t *msg) { - for (; ge != NULL; ge = ge->next) { - dns_name_t *name = NULL; - dns_rdataset_t *rdataset_a = NULL; - dns_rdataset_t *sigrdataset_a = NULL; - dns_rdataset_t *rdataset_aaaa = NULL; - dns_rdataset_t *sigrdataset_aaaa = NULL; - dns_name_t *gluename = dns_fixedname_name(&ge->fixedname); - bool prepend_name = false; - - dns_message_gettempname(msg, &name); - - dns_name_copy(gluename, name); - - if (dns_rdataset_isassociated(&ge->rdataset_a)) { - dns_message_gettemprdataset(msg, &rdataset_a); - } - - if (dns_rdataset_isassociated(&ge->sigrdataset_a)) { - dns_message_gettemprdataset(msg, &sigrdataset_a); - } - - if (dns_rdataset_isassociated(&ge->rdataset_aaaa)) { - dns_message_gettemprdataset(msg, &rdataset_aaaa); - } - - if (dns_rdataset_isassociated(&ge->sigrdataset_aaaa)) { - dns_message_gettemprdataset(msg, &sigrdataset_aaaa); - } - - if (rdataset_a != NULL) { - dns_rdataset_clone(&ge->rdataset_a, rdataset_a); - ISC_LIST_APPEND(name->list, rdataset_a, link); - if (IS_REQUIRED_GLUE(rdataset_a)) { - prepend_name = true; - } - } - - if (sigrdataset_a != NULL) { - dns_rdataset_clone(&ge->sigrdataset_a, sigrdataset_a); - ISC_LIST_APPEND(name->list, sigrdataset_a, link); - } - - if (rdataset_aaaa != NULL) { - dns_rdataset_clone(&ge->rdataset_aaaa, rdataset_aaaa); - ISC_LIST_APPEND(name->list, rdataset_aaaa, link); - if (IS_REQUIRED_GLUE(rdataset_aaaa)) { - prepend_name = true; - } - } - if (sigrdataset_aaaa != NULL) { - dns_rdataset_clone(&ge->sigrdataset_aaaa, - sigrdataset_aaaa); - ISC_LIST_APPEND(name->list, sigrdataset_aaaa, link); - } - - dns_message_addname(msg, name, DNS_SECTION_ADDITIONAL); - - /* - * When looking for required glue, dns_message_rendersection() - * only processes the first rdataset associated with the first - * name added to the ADDITIONAL section. dns_message_addname() - * performs an append on the list of names in a given section, - * so if any glue record was marked as required, we need to - * move the name it is associated with to the beginning of the - * list for the ADDITIONAL section or else required glue might - * not be rendered. - */ - if (prepend_name) { - ISC_LIST_UNLINK(msg->sections[DNS_SECTION_ADDITIONAL], - name, link); - ISC_LIST_PREPEND(msg->sections[DNS_SECTION_ADDITIONAL], - name, link); - } - } -} - -static dns_glue_t * -newglue(dns_db_t *db, dns_dbversion_t *dbversion, dns_rbtnode_t *node, - dns_rdataset_t *rdataset) { - dns_fixedname_t nodename; - dns_glue_additionaldata_ctx_t ctx = { - .db = db, - .version = dbversion, - .nodename = dns_fixedname_initname(&nodename), - }; - - /* - * Get the owner name of the NS RRset - it will be necessary for - * identifying required glue in glue_nsdname_cb() (by - * determining which NS records in the delegation are - * in-bailiwick). - */ - dns__rbtdb_nodefullname(db, node, ctx.nodename); - - (void)dns_rdataset_additionaldata(rdataset, dns_rootname, - glue_nsdname_cb, &ctx); - - return ctx.glue_list; -} - -/* FIXME: Perhaps we can squash dns_gluenode_t with - * dns_glue_additionaldata_ctx_t */ - -static dns_gluenode_t * -new_gluenode(dns_db_t *db, dns_dbversion_t *dbversion, dns_rbtnode_t *node, - dns_rdataset_t *rdataset) { - dns_gluenode_t *gluenode = isc_mem_get(db->mctx, sizeof(*gluenode)); - *gluenode = (dns_gluenode_t){ - .glue = newglue(db, dbversion, node, rdataset), - .db = db, - }; - - isc_mem_attach(db->mctx, &gluenode->mctx); - dns_db_attachnode(db, node, (dns_dbnode_t **)&gluenode->node); - - return gluenode; -} - -static uint32_t -rbtnode_hash(const dns_rbtnode_t *node) { - return isc_hash32(&node, sizeof(node), true); -} - -static int -rbtnode_match(struct cds_lfht_node *ht_node, const void *key) { - const dns_gluenode_t *gluenode = - caa_container_of(ht_node, dns_gluenode_t, ht_node); - const dns_rbtnode_t *node = key; - - return gluenode->node == node; -} - -static uint32_t -gluenode_hash(const dns_gluenode_t *gluenode) { - return rbtnode_hash(gluenode->node); -} - -static int -gluenode_match(struct cds_lfht_node *ht_node, const void *key) { - const dns_gluenode_t *gluenode = key; - - return rbtnode_match(ht_node, gluenode->node); -} - -static void +static isc_result_t addglue(dns_db_t *db, dns_dbversion_t *dbversion, dns_rdataset_t *rdataset, dns_message_t *msg) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; - dns_rbtdb_version_t *version = dbversion; - dns_rbtnode_t *node = (dns_rbtnode_t *)rdataset->slab.node; - dns_gluenode_t *gluenode = NULL; + dns_rbtdb_version_t *rbtversion = dbversion; + isc_result_t result; REQUIRE(rdataset->type == dns_rdatatype_ns); REQUIRE(rbtdb == (dns_rbtdb_t *)rdataset->slab.db); - REQUIRE(rbtdb == version->rbtdb); + REQUIRE(rbtdb == rbtversion->rbtdb); REQUIRE(!IS_CACHE(rbtdb) && !IS_STUB(rbtdb)); - /* - * The glue table cache that forms a part of the DB version - * structure is not explicitly bounded and there's no cache - * cleaning. The zone data size itself is an implicit bound. - * - * The key into the glue hashtable is the node pointer. This is - * because the glue hashtable is a property of the DB version, - * and the glue is keyed for the ownername/NS tuple. We don't - * bother with using an expensive dns_name_t comparison here as - * the node pointer is a fixed value that won't change for a DB - * version and can be compared directly. - */ - - rcu_read_lock(); - - struct cds_lfht_iter iter; - cds_lfht_lookup(version->glue_table, rbtnode_hash(node), rbtnode_match, - node, &iter); - - gluenode = cds_lfht_entry(cds_lfht_iter_get_node(&iter), dns_gluenode_t, - ht_node); - if (gluenode == NULL) { - /* No cached glue was found in the table. Get new glue. */ - gluenode = new_gluenode(db, version, node, rdataset); - - struct cds_lfht_node *ht_node = cds_lfht_add_unique( - version->glue_table, gluenode_hash(gluenode), - gluenode_match, gluenode, &gluenode->ht_node); - - if (ht_node != &gluenode->ht_node) { - dns__rbtdb_free_gluenode_rcu(&gluenode->rcu_head); - - gluenode = cds_lfht_entry(ht_node, dns_gluenode_t, - ht_node); - } - } - - INSIST(gluenode != NULL); - - dns_glue_t *glue = gluenode->glue; - isc_statscounter_t counter = dns_gluecachestatscounter_hits_present; - - if (glue != NULL) { - /* We have a cached result. Add it to the message and return. */ - addglue_to_message(glue, msg); - } else { - counter = dns_gluecachestatscounter_hits_absent; - } - - rcu_read_unlock(); + result = dns__db_addglue(db, dbversion, rdataset, msg, glue_nsdname_cb, + &rbtversion->glue_stack); if (rbtdb->gluecachestats != NULL) { + isc_statscounter_t counter = + (result == ISC_R_SUCCESS) + ? dns_gluecachestatscounter_hits_present + : dns_gluecachestatscounter_hits_absent; + isc_stats_increment(rbtdb->gluecachestats, counter); } + + return ISC_R_SUCCESS; } dns_dbmethods_t dns__rbtdb_zonemethods = { diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 7d97640f84..8e8db1e4df 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -166,8 +166,6 @@ static void delete_callback(void *data, void *arg); static void prune_tree(void *arg); -static void -free_gluetable(struct cds_lfht *glue_table); static void rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp DNS__DB_FLARG); @@ -466,6 +464,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log) { isc_refcount_destroy(&rbtdb->current_version->references); UNLINK(rbtdb->open_versions, rbtdb->current_version, link); + cds_wfs_destroy(&rbtdb->current_version->glue_stack); isc_rwlock_destroy(&rbtdb->current_version->rwlock); isc_mem_put(rbtdb->common.mctx, rbtdb->current_version, sizeof(*rbtdb->current_version)); @@ -622,7 +621,7 @@ dns__rbtdb_destroy(dns_db_t *arg) { * node count below. */ if (rbtdb->current_version != NULL) { - free_gluetable(rbtdb->current_version->glue_table); + dns__db_cleanup_gluelists(&rbtdb->current_version->glue_stack); } /* @@ -688,12 +687,10 @@ allocate_version(isc_mem_t *mctx, uint32_t serial, unsigned int references, .changed_list = ISC_LIST_INITIALIZER, .resigned_list = ISC_LIST_INITIALIZER, .link = ISC_LINK_INITIALIZER, - .glue_table = cds_lfht_new(GLUETABLE_INIT_SIZE, - GLUETABLE_MIN_SIZE, 0, - CDS_LFHT_AUTO_RESIZE, NULL), }; - isc_rwlock_init(&version->rwlock); + cds_wfs_init(&version->glue_stack); + isc_refcount_init(&version->references, references); return version; @@ -730,6 +727,7 @@ dns__rbtdb_newversion(dns_db_t *db, dns_dbversion_t **versionp) { version->salt_length = 0; memset(version->salt, 0, sizeof(version->salt)); } + isc_rwlock_init(&version->rwlock); RWLOCK(&rbtdb->current_version->rwlock, isc_rwlocktype_read); version->records = rbtdb->current_version->records; version->xfrsize = rbtdb->current_version->xfrsize; @@ -1947,7 +1945,8 @@ dns__rbtdb_closeversion(dns_db_t *db, dns_dbversion_t **versionp, if (cleanup_version != NULL) { isc_refcount_destroy(&cleanup_version->references); INSIST(EMPTY(cleanup_version->changed_list)); - free_gluetable(cleanup_version->glue_table); + dns__db_cleanup_gluelists(&cleanup_version->glue_stack); + cds_wfs_destroy(&cleanup_version->glue_stack); isc_rwlock_destroy(&cleanup_version->rwlock); isc_mem_put(rbtdb->common.mctx, cleanup_version, sizeof(*cleanup_version)); @@ -4084,6 +4083,7 @@ dns__rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, */ rbtdb->current_version = allocate_version(mctx, 1, 1, false); rbtdb->current_version->rbtdb = rbtdb; + isc_rwlock_init(&rbtdb->current_version->rwlock); /* * Keep the current version in the open list so that list operation @@ -4871,68 +4871,6 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { return ISC_R_SUCCESS; } -static void -freeglue(isc_mem_t *mctx, dns_glue_t *glue) { - while (glue != NULL) { - dns_glue_t *next = glue->next; - - if (dns_rdataset_isassociated(&glue->rdataset_a)) { - dns_rdataset_disassociate(&glue->rdataset_a); - } - if (dns_rdataset_isassociated(&glue->sigrdataset_a)) { - dns_rdataset_disassociate(&glue->sigrdataset_a); - } - - if (dns_rdataset_isassociated(&glue->rdataset_aaaa)) { - dns_rdataset_disassociate(&glue->rdataset_aaaa); - } - if (dns_rdataset_isassociated(&glue->sigrdataset_aaaa)) { - dns_rdataset_disassociate(&glue->sigrdataset_aaaa); - } - - dns_rdataset_invalidate(&glue->rdataset_a); - dns_rdataset_invalidate(&glue->sigrdataset_a); - dns_rdataset_invalidate(&glue->rdataset_aaaa); - dns_rdataset_invalidate(&glue->sigrdataset_aaaa); - - isc_mem_put(mctx, glue, sizeof(*glue)); - - glue = next; - } -} - -void -dns__rbtdb_free_gluenode_rcu(struct rcu_head *rcu_head) { - dns_gluenode_t *gluenode = caa_container_of(rcu_head, dns_gluenode_t, - rcu_head); - - freeglue(gluenode->mctx, gluenode->glue); - - dns_db_detachnode(gluenode->db, (dns_dbnode_t **)&gluenode->node); - - isc_mem_putanddetach(&gluenode->mctx, gluenode, sizeof(*gluenode)); -} - -void -dns__rbtdb_free_gluenode(dns_gluenode_t *gluenode) { - call_rcu(&gluenode->rcu_head, dns__rbtdb_free_gluenode_rcu); -} - -static void -free_gluetable(struct cds_lfht *glue_table) { - struct cds_lfht_iter iter; - dns_gluenode_t *gluenode = NULL; - - rcu_read_lock(); - cds_lfht_for_each_entry(glue_table, &iter, gluenode, ht_node) { - INSIST(!cds_lfht_del(glue_table, &gluenode->ht_node)); - dns__rbtdb_free_gluenode(gluenode); - } - rcu_read_unlock(); - - cds_lfht_destroy(glue_table, NULL); -} - void dns__rbtdb_deletedata(dns_db_t *db ISC_ATTR_UNUSED, dns_dbnode_t *node ISC_ATTR_UNUSED, void *data) { diff --git a/lib/dns/rbtdb_p.h b/lib/dns/rbtdb_p.h index 6552ee9143..b28863eac7 100644 --- a/lib/dns/rbtdb_p.h +++ b/lib/dns/rbtdb_p.h @@ -15,7 +15,6 @@ #include #include -#include #include #include @@ -91,7 +90,7 @@ struct dns_rbtdb_version { uint64_t records; uint64_t xfrsize; - struct cds_lfht *glue_table; + struct cds_wfs_stack glue_stack; }; typedef ISC_LIST(dns_rbtdb_version_t) rbtdb_versionlist_t; @@ -214,18 +213,6 @@ typedef struct { extern dns_dbmethods_t dns__rbtdb_zonemethods; extern dns_dbmethods_t dns__rbtdb_cachemethods; -typedef struct dns_gluenode_t { - isc_mem_t *mctx; - - struct dns_glue *glue; - - dns_db_t *db; - dns_rbtnode_t *node; - - struct cds_lfht_node ht_node; - struct rcu_head rcu_head; -} dns_gluenode_t; - /* * Common DB implementation methods shared by both cache and zone RBT * databases: @@ -383,9 +370,7 @@ isc_result_t dns__rbtdb_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name); void -dns__rbtdb_free_gluenode_rcu(struct rcu_head *rcu_head); -void -dns__rbtdb_free_gluenode(dns_gluenode_t *gluenode); +dns__rbtdb_freeglue(dns_glue_t *glue_list); void dns__rbtdb_newref(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,