Skip to content

Commit

Permalink
netfilter: vmalloc_node cleanup
Browse files Browse the repository at this point in the history 
Using vmalloc_node(size, numa_node_id()) for temporary storage is not
needed. vmalloc(size) is more respectful of user NUMA policy.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
  • Loading branch information
Eric Dumazet authored and Patrick McHardy committed Jun 4, 2010
1 parent fabf3a8 commit e12f8e2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions net/ipv4/netfilter/arp_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
* about).
*/
countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id());
counters = vmalloc(countersize);

if (counters == NULL)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -1005,8 +1005,7 @@ static int __do_replace(struct net *net, const char *name,
struct arpt_entry *iter;

ret = 0;
counters = vmalloc_node(num_counters * sizeof(struct xt_counters),
numa_node_id());
counters = vmalloc(num_counters * sizeof(struct xt_counters));
if (!counters) {
ret = -ENOMEM;
goto out;
Expand Down Expand Up @@ -1159,7 +1158,7 @@ static int do_add_counters(struct net *net, const void __user *user,
if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL;

paddc = vmalloc_node(len - size, numa_node_id());
paddc = vmalloc(len - size);
if (!paddc)
return -ENOMEM;

Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/netfilter/ip_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
(other than comefrom, which userspace doesn't care
about). */
countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id());
counters = vmalloc(countersize);

if (counters == NULL)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -1352,7 +1352,7 @@ do_add_counters(struct net *net, const void __user *user,
if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL;

paddc = vmalloc_node(len - size, numa_node_id());
paddc = vmalloc(len - size);
if (!paddc)
return -ENOMEM;

Expand Down
7 changes: 3 additions & 4 deletions net/ipv6/netfilter/ip6_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
(other than comefrom, which userspace doesn't care
about). */
countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id());
counters = vmalloc(countersize);

if (counters == NULL)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -1213,8 +1213,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
struct ip6t_entry *iter;

ret = 0;
counters = vmalloc_node(num_counters * sizeof(struct xt_counters),
numa_node_id());
counters = vmalloc(num_counters * sizeof(struct xt_counters));
if (!counters) {
ret = -ENOMEM;
goto out;
Expand Down Expand Up @@ -1368,7 +1367,7 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len,
if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL;

paddc = vmalloc_node(len - size, numa_node_id());
paddc = vmalloc(len - size);
if (!paddc)
return -ENOMEM;

Expand Down

0 comments on commit e12f8e2

Please sign in to comment.