generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for deleting per-network DNS resolver caches.

Browse Source 
This is required when the possible range of NetIds is large to
prevent netd consuming excessive amounts of memory.
This required replacing the per-cache locks in favor of a single
global lock to prevent accesses to deleted caches.

Change-Id: I99d058bafea5de743e56075dbed74031da4df63f
This commit is contained in:
Paul Jensen 2014-04-08 15:43:41 -04:00 committed by Lorenzo Colitti
parent 7fbc7481cc
commit 41d9a50371
4 changed files with 100 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libc/dns/include/resolv_cache.h
View File

@ -32,11 +32,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
struct __res_state; struct __res_state;
struct resolv_cache; /* forward */
/* Gets the cache for a network. Returned cache might be NULL. */
__LIBC_HIDDEN__
extern struct resolv_cache* __get_res_cache(unsigned netid);
/* sets the name server addresses to the provided res_state structure. The /* sets the name server addresses to the provided res_state structure. The
* name servers are retrieved from the cache which is associated * name servers are retrieved from the cache which is associated
@ -53,7 +48,7 @@ typedef enum {
__LIBC_HIDDEN__ __LIBC_HIDDEN__
extern ResolvCacheStatus extern ResolvCacheStatus
_resolv_cache_lookup( struct resolv_cache* cache, _resolv_cache_lookup( unsigned netid,
const void* query, const void* query,
int querylen, int querylen,
void* answer, void* answer,
@ -65,7 +60,7 @@ _resolv_cache_lookup( struct resolv_cache* cache,
*/ */
__LIBC_HIDDEN__ __LIBC_HIDDEN__
extern void extern void
_resolv_cache_add( struct resolv_cache* cache, _resolv_cache_add( unsigned netid,
const void* query, const void* query,
int querylen, int querylen,
const void* answer, const void* answer,
@ -74,7 +69,7 @@ _resolv_cache_add( struct resolv_cache* cache,
/* Notify the cache a request failed */ /* Notify the cache a request failed */
__LIBC_HIDDEN__ __LIBC_HIDDEN__
extern void extern void
_resolv_cache_query_failed( struct resolv_cache* cache, _resolv_cache_query_failed( unsigned netid,
const void* query, const void* query,
int querylen); int querylen);

3
libc/dns/include/resolv_netid.h
View File

@ -65,6 +65,9 @@ extern void _resolv_set_nameservers_for_net(unsigned netid,
/* flush the cache associated with a certain network */ /* flush the cache associated with a certain network */
extern void _resolv_flush_cache_for_net(unsigned netid); extern void _resolv_flush_cache_for_net(unsigned netid);
/* delete the cache associated with a certain network */
extern void _resolv_delete_cache_for_net(unsigned netid);
__END_DECLS __END_DECLS
#endif /* _RESOLV_NETID_H */ #endif /* _RESOLV_NETID_H */

128
libc/dns/resolv/res_cache.c
View File

@ -1218,7 +1218,6 @@ typedef struct resolv_cache {
int max_entries; int max_entries;
int num_entries; int num_entries;
Entry mru_list; Entry mru_list;
pthread_mutex_t lock;
int last_id; int last_id;
Entry* entries; Entry* entries;
PendingReqInfo pending_requests; PendingReqInfo pending_requests;
@ -1236,6 +1235,15 @@ struct resolv_cache_info {
#define HTABLE_VALID(x) ((x) != NULL && (x) != HTABLE_DELETED) #define HTABLE_VALID(x) ((x) != NULL && (x) != HTABLE_DELETED)
static pthread_once_t _res_cache_once = PTHREAD_ONCE_INIT;
static void _res_cache_init(void);
// lock protecting everything in the _resolve_cache_info structs (next ptr, etc)
static pthread_mutex_t _res_cache_list_lock;
/* gets cache associated with a network, or NULL if none exists */
static struct resolv_cache* _find_named_cache_locked(unsigned netid);
static void static void
_cache_flush_pending_requests_locked( struct resolv_cache* cache ) _cache_flush_pending_requests_locked( struct resolv_cache* cache )
{ {
@ -1256,18 +1264,18 @@ _cache_flush_pending_requests_locked( struct resolv_cache* cache )
} }
} }
/* return 0 if no pending request is found matching the key /* Return 0 if no pending request is found matching the key.
* if a matching request is found the calling thread will wait * If a matching request is found the calling thread will wait until
* and return 1 when released */ * the matching request completes, then update *cache and return 1. */
static int static int
_cache_check_pending_request_locked( struct resolv_cache* cache, Entry* key ) _cache_check_pending_request_locked( struct resolv_cache** cache, Entry* key, unsigned netid )
{ {
struct pending_req_info *ri, *prev; struct pending_req_info *ri, *prev;
int exist = 0; int exist = 0;
if (cache && key) { if (*cache && key) {
ri = cache->pending_requests.next; ri = (*cache)->pending_requests.next;
prev = &cache->pending_requests; prev = &(*cache)->pending_requests;
while (ri) { while (ri) {
if (ri->hash == key->hash) { if (ri->hash == key->hash) {
exist = 1; exist = 1;
@ -1288,7 +1296,9 @@ _cache_check_pending_request_locked( struct resolv_cache* cache, Entry* key )
struct timespec ts = {0,0}; struct timespec ts = {0,0};
XLOG("Waiting for previous request"); XLOG("Waiting for previous request");
ts.tv_sec = _time_now() + PENDING_REQUEST_TIMEOUT; ts.tv_sec = _time_now() + PENDING_REQUEST_TIMEOUT;
pthread_cond_timedwait(&ri->cond, &cache->lock, &ts); pthread_cond_timedwait(&ri->cond, &_res_cache_list_lock, &ts);
/* Must update *cache as it could have been deleted. */
*cache = _find_named_cache_locked(netid);
} }
} }
@ -1325,17 +1335,25 @@ _cache_notify_waiting_tid_locked( struct resolv_cache* cache, Entry* key )
/* notify the cache that the query failed */ /* notify the cache that the query failed */
void void
_resolv_cache_query_failed( struct resolv_cache* cache, _resolv_cache_query_failed( unsigned netid,
const void* query, const void* query,
int querylen) int querylen)
{ {
Entry key[1]; Entry key[1];
Cache* cache;
if (cache && entry_init_key(key, query, querylen)) { if (!entry_init_key(key, query, querylen))
pthread_mutex_lock(&cache->lock); return;
pthread_mutex_lock(&_res_cache_list_lock);
cache = _find_named_cache_locked(netid);
if (cache) {
_cache_notify_waiting_tid_locked(cache, key); _cache_notify_waiting_tid_locked(cache, key);
pthread_mutex_unlock(&cache->lock);
} }
pthread_mutex_unlock(&_res_cache_list_lock);
} }
static void static void
@ -1391,7 +1409,6 @@ _resolv_cache_create( void )
cache->max_entries = _res_cache_get_max_entries(); cache->max_entries = _res_cache_get_max_entries();
cache->entries = calloc(sizeof(*cache->entries), cache->max_entries); cache->entries = calloc(sizeof(*cache->entries), cache->max_entries);
if (cache->entries) { if (cache->entries) {
pthread_mutex_init( &cache->lock, NULL );
cache->mru_list.mru_prev = cache->mru_list.mru_next = &cache->mru_list; cache->mru_list.mru_prev = cache->mru_list.mru_next = &cache->mru_list;
XLOG("%s: cache created\n", __FUNCTION__); XLOG("%s: cache created\n", __FUNCTION__);
} else { } else {
@ -1586,7 +1603,7 @@ static void _cache_remove_expired(Cache* cache) {
} }
ResolvCacheStatus ResolvCacheStatus
_resolv_cache_lookup( struct resolv_cache* cache, _resolv_cache_lookup( unsigned netid,
const void* query, const void* query,
int querylen, int querylen,
void* answer, void* answer,
@ -1597,6 +1614,7 @@ _resolv_cache_lookup( struct resolv_cache* cache,
Entry** lookup; Entry** lookup;
Entry* e; Entry* e;
time_t now; time_t now;
Cache* cache;
ResolvCacheStatus result = RESOLV_CACHE_NOTFOUND; ResolvCacheStatus result = RESOLV_CACHE_NOTFOUND;
@ -1609,7 +1627,14 @@ _resolv_cache_lookup( struct resolv_cache* cache,
return RESOLV_CACHE_UNSUPPORTED; return RESOLV_CACHE_UNSUPPORTED;
} }
/* lookup cache */ /* lookup cache */
pthread_mutex_lock( &cache->lock ); pthread_once(&_res_cache_once, _res_cache_init);
pthread_mutex_lock(&_res_cache_list_lock);
cache = _find_named_cache_locked(netid);
if (cache == NULL) {
result = RESOLV_CACHE_UNSUPPORTED;
goto Exit;
}
/* see the description of _lookup_p to understand this. /* see the description of _lookup_p to understand this.
* the function always return a non-NULL pointer. * the function always return a non-NULL pointer.
@ -1621,7 +1646,7 @@ _resolv_cache_lookup( struct resolv_cache* cache,
XLOG( "NOT IN CACHE"); XLOG( "NOT IN CACHE");
// calling thread will wait if an outstanding request is found // calling thread will wait if an outstanding request is found
// that matching this query // that matching this query
if (!_cache_check_pending_request_locked(cache, key)) { if (!_cache_check_pending_request_locked(&cache, key, netid) || cache == NULL) {
goto Exit; goto Exit;
} else { } else {
lookup = _cache_lookup_p(cache, key); lookup = _cache_lookup_p(cache, key);
@ -1662,13 +1687,13 @@ _resolv_cache_lookup( struct resolv_cache* cache,
result = RESOLV_CACHE_FOUND; result = RESOLV_CACHE_FOUND;
Exit: Exit:
pthread_mutex_unlock( &cache->lock ); pthread_mutex_unlock(&_res_cache_list_lock);
return result; return result;
} }
void void
_resolv_cache_add( struct resolv_cache* cache, _resolv_cache_add( unsigned netid,
const void* query, const void* query,
int querylen, int querylen,
const void* answer, const void* answer,
@ -1678,6 +1703,7 @@ _resolv_cache_add( struct resolv_cache* cache,
Entry* e; Entry* e;
Entry** lookup; Entry** lookup;
u_long ttl; u_long ttl;
Cache* cache = NULL;
/* don't assume that the query has already been cached /* don't assume that the query has already been cached
*/ */
@ -1686,7 +1712,12 @@ _resolv_cache_add( struct resolv_cache* cache,
return; return;
} }
pthread_mutex_lock( &cache->lock ); pthread_mutex_lock(&_res_cache_list_lock);
cache = _find_named_cache_locked(netid);
if (cache == NULL) {
goto Exit;
}
XLOG( "%s: query:", __FUNCTION__ ); XLOG( "%s: query:", __FUNCTION__ );
XLOG_QUERY(query,querylen); XLOG_QUERY(query,querylen);
@ -1732,8 +1763,10 @@ _resolv_cache_add( struct resolv_cache* cache,
_cache_dump_mru(cache); _cache_dump_mru(cache);
#endif #endif
Exit: Exit:
_cache_notify_waiting_tid_locked(cache, key); if (cache != NULL) {
pthread_mutex_unlock( &cache->lock ); _cache_notify_waiting_tid_locked(cache, key);
}
pthread_mutex_unlock(&_res_cache_list_lock);
} }
/****************************************************************************/ /****************************************************************************/
@ -1744,20 +1777,13 @@ Exit:
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
static pthread_once_t _res_cache_once = PTHREAD_ONCE_INIT;
// Head of the list of caches. Protected by _res_cache_list_lock. // Head of the list of caches. Protected by _res_cache_list_lock.
static struct resolv_cache_info _res_cache_list; static struct resolv_cache_info _res_cache_list;
// lock protecting everything in the _resolve_cache_info structs (next ptr, etc)
static pthread_mutex_t _res_cache_list_lock;
/* insert resolv_cache_info into the list of resolv_cache_infos */ /* insert resolv_cache_info into the list of resolv_cache_infos */
static void _insert_cache_info_locked(struct resolv_cache_info* cache_info); static void _insert_cache_info_locked(struct resolv_cache_info* cache_info);
/* creates a resolv_cache_info */ /* creates a resolv_cache_info */
static struct resolv_cache_info* _create_cache_info( void ); static struct resolv_cache_info* _create_cache_info( void );
/* gets cache associated with a network, or NULL if none exists */
static struct resolv_cache* _find_named_cache_locked(unsigned netid);
/* gets a resolv_cache_info associated with a network, or NULL if not found */ /* gets a resolv_cache_info associated with a network, or NULL if not found */
static struct resolv_cache_info* _find_cache_info_locked(unsigned netid); static struct resolv_cache_info* _find_cache_info_locked(unsigned netid);
/* look up the named cache, and creates one if needed */ /* look up the named cache, and creates one if needed */
@ -1785,22 +1811,6 @@ _res_cache_init(void)
pthread_mutex_init(&_res_cache_list_lock, NULL); pthread_mutex_init(&_res_cache_list_lock, NULL);
} }
struct resolv_cache*
__get_res_cache(unsigned netid)
{
struct resolv_cache *cache;
pthread_once(&_res_cache_once, _res_cache_init);
pthread_mutex_lock(&_res_cache_list_lock);
/* Does NOT create a cache if it does not exist. */
cache = _find_named_cache_locked(netid);
pthread_mutex_unlock(&_res_cache_list_lock);
XLOG("%s: netid=%u, cache=%p\n", __FUNCTION__, netid, cache);
return cache;
}
static struct resolv_cache* static struct resolv_cache*
_get_res_cache_for_net_locked(unsigned netid) _get_res_cache_for_net_locked(unsigned netid)
{ {
@ -1837,12 +1847,36 @@ _flush_cache_for_net_locked(unsigned netid)
{ {
struct resolv_cache* cache = _find_named_cache_locked(netid); struct resolv_cache* cache = _find_named_cache_locked(netid);
if (cache) { if (cache) {
pthread_mutex_lock(&cache->lock);
_cache_flush_locked(cache); _cache_flush_locked(cache);
pthread_mutex_unlock(&cache->lock);
} }
} }
void _resolv_delete_cache_for_net(unsigned netid)
{
pthread_once(&_res_cache_once, _res_cache_init);
pthread_mutex_lock(&_res_cache_list_lock);
struct resolv_cache_info* prev_cache_info = &_res_cache_list;
while (prev_cache_info->next) {
struct resolv_cache_info* cache_info = prev_cache_info->next;
if (cache_info->netid == netid) {
prev_cache_info->next = cache_info->next;
_cache_flush_locked(cache_info->cache);
free(cache_info->cache->entries);
free(cache_info->cache);
_free_nameservers_locked(cache_info);
free(cache_info);
break;
}
prev_cache_info = prev_cache_info->next;
}
pthread_mutex_unlock(&_res_cache_list_lock);
}
static struct resolv_cache_info* static struct resolv_cache_info*
_create_cache_info(void) _create_cache_info(void)
{ {

31
libc/dns/resolv/res_send.c
View File

@ -367,7 +367,6 @@ res_nsend(res_state statp,
int gotsomewhere, terrno, try, v_circuit, resplen, ns, n; int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
char abuf[NI_MAXHOST]; char abuf[NI_MAXHOST];
#if USE_RESOLV_CACHE #if USE_RESOLV_CACHE
struct resolv_cache* cache;
ResolvCacheStatus cache_status = RESOLV_CACHE_UNSUPPORTED; ResolvCacheStatus cache_status = RESOLV_CACHE_UNSUPPORTED;
#endif #endif
@ -389,21 +388,17 @@ res_nsend(res_state statp,
terrno = ETIMEDOUT; terrno = ETIMEDOUT;
#if USE_RESOLV_CACHE #if USE_RESOLV_CACHE
// get the cache associated with the network int anslen = 0;
cache = __get_res_cache(statp->netid); cache_status = _resolv_cache_lookup(
if (cache != NULL) { statp->netid, buf, buflen,
int anslen = 0; ans, anssiz, &anslen);
cache_status = _resolv_cache_lookup(
cache, buf, buflen,
ans, anssiz, &anslen);
if (cache_status == RESOLV_CACHE_FOUND) { if (cache_status == RESOLV_CACHE_FOUND) {
return anslen; return anslen;
} else { } else if (cache_status != RESOLV_CACHE_UNSUPPORTED) {
// had a cache miss for a known network, so populate the thread private // had a cache miss for a known network, so populate the thread private
// data so the normal resolve path can do its thing // data so the normal resolve path can do its thing
_resolv_populate_res_for_net(statp); _resolv_populate_res_for_net(statp);
}
} }
if (statp->nscount == 0) { if (statp->nscount == 0) {
@ -602,7 +597,7 @@ res_nsend(res_state statp,
#if USE_RESOLV_CACHE #if USE_RESOLV_CACHE
if (cache_status == RESOLV_CACHE_NOTFOUND) { if (cache_status == RESOLV_CACHE_NOTFOUND) {
_resolv_cache_add(cache, buf, buflen, _resolv_cache_add(statp->netid, buf, buflen,
ans, resplen); ans, resplen);
} }
#endif #endif
@ -658,13 +653,13 @@ res_nsend(res_state statp,
errno = terrno; errno = terrno;
#if USE_RESOLV_CACHE #if USE_RESOLV_CACHE
_resolv_cache_query_failed(cache, buf, buflen); _resolv_cache_query_failed(statp->netid, buf, buflen);
#endif #endif
return (-1); return (-1);
fail: fail:
#if USE_RESOLV_CACHE #if USE_RESOLV_CACHE
_resolv_cache_query_failed(cache, buf, buflen); _resolv_cache_query_failed(statp->netid, buf, buflen);
#endif #endif
res_nclose(statp); res_nclose(statp);
return (-1); return (-1);