Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipv6: sr: static percpu allocation for hmac_ring

Browse Source 
Current allocations are not NUMA aware, and lack proper
cleanup in case of error.

It is perfectly fine to use static per cpu allocations for 256 bytes
per cpu.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: David Lebrun <david.lebrun@uclouvain.be>
Acked-by: David Lebrun <david.lebrun@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2017-01-12 08:50:10 -08:00 committed by David S. Miller
parent 8fb472c09b
commit 717ac5ce13
1 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/ipv6/seg6_hmac.c
View File

@ -45,7 +45,7 @@
#include <net/seg6_hmac.h>
#include <linux/random.h>
static char * __percpu *hmac_ring;
static DEFINE_PER_CPU(char [SEG6_HMAC_RING_SIZE], hmac_ring);
static int seg6_hmac_cmpfn(struct rhashtable_compare_arg *arg, const void *obj)
{
@ -192,7 +192,7 @@ int seg6_hmac_compute(struct seg6_hmac_info *hinfo, struct ipv6_sr_hdr *hdr,
*/
local_bh_disable();
ring = *this_cpu_ptr(hmac_ring);
ring = this_cpu_ptr(hmac_ring);
off = ring;
/* source address */
@ -353,27 +353,6 @@ int seg6_push_hmac(struct net *net, struct in6_addr *saddr,
}
EXPORT_SYMBOL(seg6_push_hmac);
static int seg6_hmac_init_ring(void)
{
int i;
hmac_ring = alloc_percpu(char *);
if (!hmac_ring)
return -ENOMEM;
for_each_possible_cpu(i) {
char *ring = kzalloc(SEG6_HMAC_RING_SIZE, GFP_KERNEL);
if (!ring)
return -ENOMEM;
*per_cpu_ptr(hmac_ring, i) = ring;
}
return 0;
}
static int seg6_hmac_init_algo(void)
{
struct seg6_hmac_algo *algo;
@ -422,16 +401,7 @@ static int seg6_hmac_init_algo(void)
int __init seg6_hmac_init(void)
{
int ret;
ret = seg6_hmac_init_ring();
if (ret < 0)
goto out;
ret = seg6_hmac_init_algo();
out:
return ret;
return seg6_hmac_init_algo();
}
EXPORT_SYMBOL(seg6_hmac_init);
@ -450,13 +420,6 @@ void seg6_hmac_exit(void)
struct seg6_hmac_algo *algo = NULL;
int i, alg_count, cpu;
for_each_possible_cpu(i) {
char *ring = *per_cpu_ptr(hmac_ring, i);
kfree(ring);
}
free_percpu(hmac_ring);
alg_count = sizeof(hmac_algos) / sizeof(struct seg6_hmac_algo);
for (i = 0; i < alg_count; i++) {
algo = &hmac_algos[i];