From 89cf1dc665326f1531a8493c99f5faa3596bb848 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 2 Dec 2019 16:58:57 +1100 Subject: [PATCH 1/2] lock access to fctx->nqueries (cherry picked from commit 5589748ecac0b016c2221ba74249fbfbddf412b6) --- lib/dns/resolver.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index a17ba0dc4e0..7d7798058c3 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -877,9 +877,8 @@ resquery_destroy(resquery_t **queryp) { res = fctx->res; bucket = fctx->bucketnum; - fctx->nqueries--; - LOCK(&res->buckets[bucket].lock); + fctx->nqueries--; empty = fctx_decreference(query->fctx); UNLOCK(&res->buckets[bucket].lock); @@ -1670,6 +1669,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, bool have_addr = false; unsigned int srtt; isc_dscp_t dscp = -1; + unsigned int bucketnum; FCTXTRACE("query"); @@ -1895,7 +1895,10 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, fctx->querysent++; ISC_LIST_APPEND(fctx->queries, query, link); - query->fctx->nqueries++; + bucketnum = fctx->bucketnum; + LOCK(&res->buckets[bucketnum].lock); + fctx->nqueries++; + UNLOCK(&res->buckets[bucketnum].lock); if (isc_sockaddr_pf(&addrinfo->sockaddr) == PF_INET) inc_stats(res, dns_resstatscounter_queryv4); else -- GitLab From 020c29a8c85a21c16e9c45c9d638f70baa694ddb Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 5 Dec 2019 15:25:21 +1100 Subject: [PATCH 2/2] Note bucket lock requirements. (cherry picked from commit 13aaeaa06f79e520a0b18a431dfe449d2edf4476) --- lib/dns/resolver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 7d7798058c3..a9d1df08182 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -307,7 +307,7 @@ struct fetchctx { /*% * The number of events we're waiting for. */ - unsigned int pending; + unsigned int pending; /* Bucket lock. */ /*% * The number of times we've "restarted" the current @@ -336,7 +336,7 @@ struct fetchctx { /*% * Number of queries that reference this context. */ - unsigned int nqueries; + unsigned int nqueries; /* Bucket lock. */ /*% * The reason to print when logging a successful -- GitLab