mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Merge branch '4086-run-dispentry_destroy-on-associated-loop' into 'main'

Browse Source 
Pin dns_request to the associated loop

Closes #4086

See merge request isc-projects/bind9!8137
This commit is contained in:
Ondřej Surý 2023-07-28 07:07:50 +00:00
commit baa8f81b3d
10 changed files with 415 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
6216. [bug] Pin dns_request events to the originating loop
to serialize access to the data. [GL #4086]
6215. [protocol] Return REFUSED to GSS-API TKEY requests if GSS-API
support is not configured. [GL #4225]

3
bin/delv/delv.c
View File

@ -1927,6 +1927,7 @@ cleanup:
static void
shutdown_server(void) {
if (requestmgr != NULL) {
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
}
if (interfacemgr != NULL) {
@ -2095,7 +2096,7 @@ sendquery(void *arg) {
NULL, 0));
CHECK(dns_message_setopt(message, opt));
CHECK(dns_requestmgr_create(mctx, dispatchmgr, NULL, NULL,
CHECK(dns_requestmgr_create(mctx, loopmgr, dispatchmgr, NULL, NULL,
&requestmgr));
dns_view_attach(view, &(dns_view_t *){ NULL });

2
bin/nsupdate/nsupdate.c
View File

@ -967,7 +967,7 @@ setup_system(void) {
dns_transport_set_always_verify_remote(transport,
tls_always_verify_remote);
result = dns_requestmgr_create(gmctx, dispatchmgr, dispatchv4,
result = dns_requestmgr_create(gmctx, loopmgr, dispatchmgr, dispatchv4,
dispatchv6, &requestmgr);
check_result(result, "dns_requestmgr_create");

43
bin/tests/system/pipelined/pipequeries.c
View File

@ -183,6 +183,32 @@ sendqueries(void *arg) {
return;
}
static void
teardown_view(void *arg) {
dns_view_t *view = arg;
dns_view_detach(&view);
}
static void
teardown_requestmgr(void *arg) {
dns_requestmgr_t *mgr = arg;
dns_requestmgr_shutdown(mgr);
dns_requestmgr_detach(&mgr);
}
static void
teardown_dispatchv4(void *arg) {
dns_dispatch_t *dispatchv4 = arg;
dns_dispatch_detach(&dispatchv4);
}
static void
teardown_dispatchmgr(void *arg) {
dns_dispatchmgr_t *dispatchmgr = arg;
dns_dispatchmgr_detach(&dispatchmgr);
}
int
main(int argc, char *argv[]) {
isc_sockaddr_t bind_any;
@ -253,22 +279,19 @@ main(int argc, char *argv[]) {
RUNCHECK(dns_dispatch_createudp(
dispatchmgr, have_src ? &srcaddr : &bind_any, &dispatchv4));
RUNCHECK(dns_requestmgr_create(mctx, dispatchmgr, dispatchv4, NULL,
&requestmgr));
RUNCHECK(dns_requestmgr_create(mctx, loopmgr, dispatchmgr, dispatchv4,
NULL, &requestmgr));
RUNCHECK(dns_view_create(mctx, 0, "_test", &view));
isc_loopmgr_setup(loopmgr, sendqueries, NULL);
isc_loopmgr_teardown(loopmgr, teardown_view, view);
isc_loopmgr_teardown(loopmgr, teardown_requestmgr, requestmgr);
isc_loopmgr_teardown(loopmgr, teardown_dispatchv4, dispatchv4);
isc_loopmgr_teardown(loopmgr, teardown_dispatchmgr, dispatchmgr);
isc_loopmgr_run(loopmgr);
dns_view_detach(&view);
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
dns_dispatch_detach(&dispatchv4);
dns_dispatchmgr_detach(&dispatchmgr);
dst_lib_destroy();
isc_log_destroy(&lctx);

40
bin/tools/mdig.c
View File

@ -2068,6 +2068,32 @@ set_source_ports(dns_dispatchmgr_t *manager) {
isc_portset_destroy(mctx, &v6portset);
}
static void
teardown_view(void *arg) {
dns_view_t *view = arg;
dns_view_detach(&view);
}
static void
teardown_requestmgr(void *arg) {
dns_requestmgr_t *mgr = arg;
dns_requestmgr_shutdown(mgr);
dns_requestmgr_detach(&mgr);
}
static void
teardown_dispatch(void *arg) {
dns_dispatch_t *dispatchv4 = arg;
dns_dispatch_detach(&dispatchv4);
}
static void
teardown_dispatchmgr(void *arg) {
dns_dispatchmgr_t *dispatchmgr = arg;
dns_dispatchmgr_detach(&dispatchmgr);
}
/*% Main processing routine for mdig */
int
main(int argc, char *argv[]) {
@ -2138,13 +2164,17 @@ main(int argc, char *argv[]) {
dispatchmgr, have_src ? &srcaddr : &bind_any, &dispatchvx));
RUNCHECK(dns_requestmgr_create(
mctx, dispatchmgr, have_ipv4 ? dispatchvx : NULL,
mctx, loopmgr, dispatchmgr, have_ipv4 ? dispatchvx : NULL,
have_ipv6 ? dispatchvx : NULL, &requestmgr));
RUNCHECK(dns_view_create(mctx, 0, "_mdig", &view));
query = ISC_LIST_HEAD(queries);
isc_loopmgr_setup(loopmgr, sendqueries, query);
isc_loopmgr_teardown(loopmgr, teardown_view, view);
isc_loopmgr_teardown(loopmgr, teardown_requestmgr, requestmgr);
isc_loopmgr_teardown(loopmgr, teardown_dispatch, dispatchvx);
isc_loopmgr_teardown(loopmgr, teardown_dispatchmgr, dispatchmgr);
/*
* Stall to the start of a new second.
@ -2174,14 +2204,6 @@ main(int argc, char *argv[]) {
isc_loopmgr_run(loopmgr);
dns_view_detach(&view);
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
dns_dispatch_detach(&dispatchvx);
dns_dispatchmgr_detach(&dispatchmgr);
dst_lib_destroy();
isc_log_destroy(&lctx);

59
lib/dns/include/dns/request.h
View File

@ -36,10 +36,14 @@
#include <stdbool.h>
#include <isc/job.h>
#include <isc/lang.h>
#include <isc/tls.h>
#include <dns/types.h>
#undef DNS_REQUEST_TRACE
#define DNS_REQUESTOPT_TCP 0x00000001U
#define DNS_REQUESTOPT_CASE 0x00000002U
#define DNS_REQUESTOPT_FIXEDID 0x00000004U
@ -48,7 +52,8 @@
ISC_LANG_BEGINDECLS
isc_result_t
dns_requestmgr_create(isc_mem_t *mctx, dns_dispatchmgr_t *dispatchmgr,
dns_requestmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr,
dns_dispatchmgr_t *dispatchmgr,
dns_dispatch_t *dispatchv4, dns_dispatch_t *dispatchv6,
dns_requestmgr_t **requestmgrp);
/*%<
@ -90,33 +95,19 @@ dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr);
*\li 'requestmgr' is a valid requestmgr.
*/
void
dns_requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp);
/*%<
* Attach to the request manager. dns_requestmgr_shutdown() must not
* have been called on 'source' prior to calling dns_requestmgr_attach().
*
* Requires:
*
*\li 'source' is a valid requestmgr.
*
*\li 'targetp' to be non NULL and '*targetp' to be NULL.
*/
void
dns_requestmgr_detach(dns_requestmgr_t **requestmgrp);
/*%<
* Detach from the given requestmgr. If this is the final detach
* requestmgr will be destroyed. dns_requestmgr_shutdown() must
* be called before the final detach.
*
* Requires:
*
*\li '*requestmgrp' is a valid requestmgr.
*
* Ensures:
*\li '*requestmgrp' is NULL.
*/
#if DNS_REQUEST_TRACE
#define dns_requestmgr_ref(ptr) \
dns_requestmgr__ref(ptr, __func__, __FILE__, __LINE__)
#define dns_requestmgr_unref(ptr) \
dns_requestmgr__unref(ptr, __func__, __FILE__, __LINE__)
#define dns_requestmgr_attach(ptr, ptrp) \
dns_requestmgr__attach(ptr, ptrp, __func__, __FILE__, __LINE__)
#define dns_requestmgr_detach(ptrp) \
dns_requestmgr__detach(ptrp, __func__, __FILE__, __LINE__)
ISC_REFCOUNT_TRACE_DECL(dns_requestmgr);
#else
ISC_REFCOUNT_DECL(dns_requestmgr);
#endif
isc_result_t
dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
@ -302,5 +293,17 @@ dns_request_getresult(dns_request_t *request);
* completion handler.)
*/
#if DNS_REQUEST_TRACE
#define dns_request_ref(ptr) dns_request__ref(ptr, __func__, __FILE__, __LINE__)
#define dns_request_unref(ptr) \
dns_request__unref(ptr, __func__, __FILE__, __LINE__)
#define dns_request_attach(ptr, ptrp) \
dns_request__attach(ptr, ptrp, __func__, __FILE__, __LINE__)
#define dns_request_detach(ptrp) \
dns_request__detach(ptrp, __func__, __FILE__, __LINE__)
ISC_REFCOUNT_TRACE_DECL(dns_request);
#else
ISC_REFCOUNT_DECL(dns_request);
#endif
ISC_LANG_ENDDECLS

673
lib/dns/request.c
View File

File diff suppressed because it is too large Load Diff

2
lib/dns/view.c
View File

@ -622,7 +622,7 @@ dns_view_createresolver(dns_view_t *view, isc_loopmgr_t *loopmgr,
dns_adb_create(mctx, view, loopmgr, &view->adb);
isc_mem_detach(&mctx);
result = dns_requestmgr_create(view->mctx, view->dispatchmgr,
result = dns_requestmgr_create(view->mctx, loopmgr, view->dispatchmgr,
dispatchv4, dispatchv6,
&view->requestmgr);
if (result != ISC_R_SUCCESS) {

24
lib/dns/zone.c
View File

@ -11730,13 +11730,6 @@ checkds_cancel(dns_zone_t *zone) {
}
}
static void
forward_cancel_cb(void *arg) {
dns_request_t *request = arg;
dns_request_cancel(request);
dns_request_detach(&request);
}
static void
forward_cancel(dns_zone_t *zone) {
dns_forward_t *forward;
@ -11751,9 +11744,7 @@ forward_cancel(dns_zone_t *zone) {
forward = ISC_LIST_NEXT(forward, link))
{
if (forward->request != NULL) {
dns_request_t *request = NULL;
dns_request_attach(forward->request, &request);
isc_async_run(zone->loop, forward_cancel_cb, request);
dns_request_cancel(forward->request);
}
}
}
@ -12878,8 +12869,9 @@ cleanup:
if (msg != NULL) {
dns_message_detach(&msg);
}
dns_name_free(&sgr->name, zone->mctx);
dns_request_destroy(&request);
dns_request_destroy(&sgr->request);
isc_mem_put(zone->mctx, sgr, sizeof(*sgr));
/* If last request, release all related resources */
@ -12912,10 +12904,12 @@ stub_request_nameserver_address(struct stub_cb_args *args, bool ipv4,
zone = args->stub->zone;
sgr = isc_mem_get(zone->mctx, sizeof(*sgr));
sgr->request = NULL;
sgr->args = args;
sgr->name = (dns_name_t)DNS_NAME_INITEMPTY;
sgr->ipv4 = ipv4;
*sgr = (struct stub_glue_request){
.args = args,
.name = (dns_name_t)DNS_NAME_INITEMPTY,
.ipv4 = ipv4,
};
dns_name_dup(name, zone->mctx, &sgr->name);
create_query(zone, ipv4 ? dns_rdatatype_a : dns_rdatatype_aaaa,

3
lib/isc/loop.c
View File

@ -282,6 +282,9 @@ loop_thread(void *arg) {
r = uv_run(&loop->loop, UV_RUN_DEFAULT);
UV_RUNTIME_CHECK(uv_run, r);
/* Invalidate the loop early */
loop->magic = 0;
isc_barrier_wait(&loop->loopmgr->stopping);
return (NULL);