Skip to content

Commit

Permalink
[IPV4]: Handle large allocations in fib_trie
Browse files Browse the repository at this point in the history
Inflating a node a couple of times makes it exceed the 128k kmalloc limit.
Use __get_free_pages for allocations > PAGE_SIZE, as in fib_hash.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Robert Olsson <Robert.Olsson@data.slu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jul 5, 2005
1 parent 93e266f commit f0e36f8
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,32 @@ static inline void free_leaf_info(struct leaf_info *li)
kfree(li);
}

static struct tnode *tnode_alloc(unsigned int size)
{
if (size <= PAGE_SIZE) {
return kmalloc(size, GFP_KERNEL);
} else {
return (struct tnode *)
__get_free_pages(GFP_KERNEL, get_order(size));
}
}

static void __tnode_free(struct tnode *tn)
{
unsigned int size = sizeof(struct tnode) +
(1<<tn->bits) * sizeof(struct node *);

if (size <= PAGE_SIZE)
kfree(tn);
else
free_pages((unsigned long)tn, get_order(size));
}

static struct tnode* tnode_new(t_key key, int pos, int bits)
{
int nchildren = 1<<bits;
int sz = sizeof(struct tnode) + nchildren * sizeof(struct node *);
struct tnode *tn = kmalloc(sz, GFP_KERNEL);
struct tnode *tn = tnode_alloc(sz);

if(tn) {
memset(tn, 0, sz);
Expand Down Expand Up @@ -390,7 +411,7 @@ static void tnode_free(struct tnode *tn)
printk("FL %p \n", tn);
}
else if(IS_TNODE(tn)) {
kfree(tn);
__tnode_free(tn);
if(trie_debug > 0 )
printk("FT %p \n", tn);
}
Expand Down

0 comments on commit f0e36f8

Please sign in to comment.