iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: mesh: use hlist for rmc cache

Browse Source 
The RMC cache has 256 list heads plus a u32, which puts it at the
unfortunate size of 4104 bytes with padding.  kmalloc() will then
round this up to the next power-of-two, so we wind up actually
using two pages here where most of the second is wasted.

Switch to hlist heads here to reduce the structure size down to
fit within a page.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Bob Copeland 2016-03-18 22:11:29 -04:00 committed by Johannes Berg
parent 0aa7fabbd5
commit 47a0489ce1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/mac80211/mesh.c
View File

@ -174,22 +174,23 @@ int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
return -ENOMEM; return -ENOMEM;
sdata->u.mesh.rmc->idx_mask = RMC_BUCKETS - 1; sdata->u.mesh.rmc->idx_mask = RMC_BUCKETS - 1;
for (i = 0; i < RMC_BUCKETS; i++) for (i = 0; i < RMC_BUCKETS; i++)
INIT_LIST_HEAD(&sdata->u.mesh.rmc->bucket[i]); INIT_HLIST_HEAD(&sdata->u.mesh.rmc->bucket[i]);
return 0; return 0;
} }
void mesh_rmc_free(struct ieee80211_sub_if_data *sdata) void mesh_rmc_free(struct ieee80211_sub_if_data *sdata)
{ {
struct mesh_rmc *rmc = sdata->u.mesh.rmc; struct mesh_rmc *rmc = sdata->u.mesh.rmc;
struct rmc_entry *p, *n; struct rmc_entry *p;
struct hlist_node *n;
int i; int i;
if (!sdata->u.mesh.rmc) if (!sdata->u.mesh.rmc)
return; return;
for (i = 0; i < RMC_BUCKETS; i++) { for (i = 0; i < RMC_BUCKETS; i++) {
list_for_each_entry_safe(p, n, &rmc->bucket[i], list) { hlist_for_each_entry_safe(p, n, &rmc->bucket[i], list) {
list_del(&p->list); hlist_del(&p->list);
kmem_cache_free(rm_cache, p); kmem_cache_free(rm_cache, p);
} }
} }
@ -218,7 +219,8 @@ int mesh_rmc_check(struct ieee80211_sub_if_data *sdata,
u32 seqnum = 0; u32 seqnum = 0;
int entries = 0; int entries = 0;
u8 idx; u8 idx;
struct rmc_entry *p, *n; struct rmc_entry *p;
struct hlist_node *n;
if (!rmc) if (!rmc)
return -1; return -1;
@ -226,11 +228,11 @@ int mesh_rmc_check(struct ieee80211_sub_if_data *sdata,
/* Don't care about endianness since only match matters */ /* Don't care about endianness since only match matters */
memcpy(&seqnum, &mesh_hdr->seqnum, sizeof(mesh_hdr->seqnum)); memcpy(&seqnum, &mesh_hdr->seqnum, sizeof(mesh_hdr->seqnum));
idx = le32_to_cpu(mesh_hdr->seqnum) & rmc->idx_mask; idx = le32_to_cpu(mesh_hdr->seqnum) & rmc->idx_mask;
list_for_each_entry_safe(p, n, &rmc->bucket[idx], list) { hlist_for_each_entry_safe(p, n, &rmc->bucket[idx], list) {
++entries; ++entries;
if (time_after(jiffies, p->exp_time) || if (time_after(jiffies, p->exp_time) ||
entries == RMC_QUEUE_MAX_LEN) { entries == RMC_QUEUE_MAX_LEN) {
list_del(&p->list); hlist_del(&p->list);
kmem_cache_free(rm_cache, p); kmem_cache_free(rm_cache, p);
--entries; --entries;
} else if ((seqnum == p->seqnum) && ether_addr_equal(sa, p->sa)) } else if ((seqnum == p->seqnum) && ether_addr_equal(sa, p->sa))
@ -244,7 +246,7 @@ int mesh_rmc_check(struct ieee80211_sub_if_data *sdata,
p->seqnum = seqnum; p->seqnum = seqnum;
p->exp_time = jiffies + RMC_TIMEOUT; p->exp_time = jiffies + RMC_TIMEOUT;
memcpy(p->sa, sa, ETH_ALEN); memcpy(p->sa, sa, ETH_ALEN);
list_add(&p->list, &rmc->bucket[idx]); hlist_add_head(&p->list, &rmc->bucket[idx]);
return 0; return 0;
} }

4
net/mac80211/mesh.h
View File

@ -158,14 +158,14 @@ struct mesh_table {
* that are found in the cache. * that are found in the cache.
*/ */
struct rmc_entry { struct rmc_entry {
struct list_head list; struct hlist_node list;
u32 seqnum; u32 seqnum;
unsigned long exp_time; unsigned long exp_time;
u8 sa[ETH_ALEN]; u8 sa[ETH_ALEN];
}; };
struct mesh_rmc { struct mesh_rmc {
struct list_head bucket[RMC_BUCKETS]; struct hlist_head bucket[RMC_BUCKETS];
u32 idx_mask; u32 idx_mask;
}; };