evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: vmalloc_node cleanup

Browse source 
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>
This commit is contained in:
Eric Dumazet 2010-06-04 13:31:29 +02:00 • committed by Patrick McHardy
parent fabf3a85ab
commit e12f8e29a8
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ipv4/netfilter/arp_tables.c
View file

@ -758,7 +758,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
* about). * about).
*/ */
countersize = sizeof(struct xt_counters) * private->number; countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id()); counters = vmalloc(countersize);
if (counters == NULL) if (counters == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -1005,8 +1005,7 @@ static int __do_replace(struct net *net, const char *name,
struct arpt_entry *iter; struct arpt_entry *iter;
ret = 0; ret = 0;
counters = vmalloc_node(num_counters * sizeof(struct xt_counters), counters = vmalloc(num_counters * sizeof(struct xt_counters));
numa_node_id());
if (!counters) { if (!counters) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -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)) if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL; return -EINVAL;
paddc = vmalloc_node(len - size, numa_node_id()); paddc = vmalloc(len - size);
if (!paddc) if (!paddc)
return -ENOMEM; return -ENOMEM;

4
net/ipv4/netfilter/ip_tables.c
View file

@ -928,7 +928,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
(other than comefrom, which userspace doesn't care (other than comefrom, which userspace doesn't care
about). */ about). */
countersize = sizeof(struct xt_counters) * private->number; countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id()); counters = vmalloc(countersize);
if (counters == NULL) if (counters == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -1352,7 +1352,7 @@ do_add_counters(struct net *net, const void __user *user,
if (len != size + num_counters * sizeof(struct xt_counters)) if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL; return -EINVAL;
paddc = vmalloc_node(len - size, numa_node_id()); paddc = vmalloc(len - size);
if (!paddc) if (!paddc)
return -ENOMEM; return -ENOMEM;

7
net/ipv6/netfilter/ip6_tables.c
View file

@ -943,7 +943,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
(other than comefrom, which userspace doesn't care (other than comefrom, which userspace doesn't care
about). */ about). */
countersize = sizeof(struct xt_counters) * private->number; countersize = sizeof(struct xt_counters) * private->number;
counters = vmalloc_node(countersize, numa_node_id()); counters = vmalloc(countersize);
if (counters == NULL) if (counters == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -1213,8 +1213,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
struct ip6t_entry *iter; struct ip6t_entry *iter;
ret = 0; ret = 0;
counters = vmalloc_node(num_counters * sizeof(struct xt_counters), counters = vmalloc(num_counters * sizeof(struct xt_counters));
numa_node_id());
if (!counters) { if (!counters) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -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)) if (len != size + num_counters * sizeof(struct xt_counters))
return -EINVAL; return -EINVAL;
paddc = vmalloc_node(len - size, numa_node_id()); paddc = vmalloc(len - size);
if (!paddc) if (!paddc)
return -ENOMEM; return -ENOMEM;