AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-14 06:46:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

netns: add dummy struct inside "struct net_generic"

Browse Source 
This is precursor to fixing "[id - 1]" bloat inside net_generic().

Name "s" is chosen to complement name "u" often used for dummy unions.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2016-12-02 04:12:58 +03:00 committed by David S. Miller
parent 1a9a059203
commit 9bfc7b9969
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/netns/generic.h
View File

@ -25,8 +25,10 @@
*/
struct net_generic {
unsigned int len;
struct rcu_head rcu;
struct {
unsigned int len;
struct rcu_head rcu;
} s;
void *ptr[0];
};

8
net/core/net_namespace.c
View File

@ -50,7 +50,7 @@ static struct net_generic *net_alloc_generic(void)
ng = kzalloc(generic_size, GFP_KERNEL);
if (ng)
ng->len = max_gen_ptrs;
ng->s.len = max_gen_ptrs;
return ng;
}
@ -64,7 +64,7 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data)
old_ng = rcu_dereference_protected(net->gen,
lockdep_is_held(&net_mutex));
if (old_ng->len >= id) {
if (old_ng->s.len >= id) {
old_ng->ptr[id - 1] = data;
return 0;
}
@ -84,11 +84,11 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data)
* the old copy for kfree after a grace period.
*/
memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
memcpy(&ng->ptr, &old_ng->ptr, old_ng->s.len * sizeof(void*));
ng->ptr[id - 1] = data;
rcu_assign_pointer(net->gen, ng);
kfree_rcu(old_ng, rcu);
kfree_rcu(old_ng, s.rcu);
return 0;
}