net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
Introduce sock->sk_cgrp_data which is a struct sock_cgroup_data. ->sk_cgroup_prioidx and ->sk_classid are moved into it. The struct and its accessors are defined in cgroup-defs.h. This is to prepare for overloading the fields with a cgroup pointer. This patch mostly performs equivalent conversions but the followings are noteworthy. * Equality test before updating classid is removed from sock_update_classid(). This shouldn't make any noticeable difference and a similar test will be implemented on the helper side later. * sock_update_netprioidx() now takes struct sock_cgroup_data and can be moved to netprio_cgroup.h without causing include dependency loop. Moved. * The dummy version of sock_update_netprioidx() converted to a static inline function while at it. Signed-off-by:Tejun Heo <tj@kernel.org> Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/cgroup-defs.h 36 additions, 0 deletionsinclude/linux/cgroup-defs.h
- include/net/cls_cgroup.h 5 additions, 6 deletionsinclude/net/cls_cgroup.h
- include/net/netprio_cgroup.h 13 additions, 3 deletionsinclude/net/netprio_cgroup.h
- include/net/sock.h 3 additions, 8 deletionsinclude/net/sock.h
- net/Kconfig 6 additions, 0 deletionsnet/Kconfig
- net/core/dev.c 2 additions, 1 deletionnet/core/dev.c
- net/core/netclassid_cgroup.c 2 additions, 2 deletionsnet/core/netclassid_cgroup.c
- net/core/netprio_cgroup.c 2 additions, 1 deletionnet/core/netprio_cgroup.c
- net/core/scm.c 2 additions, 2 deletionsnet/core/scm.c
- net/core/sock.c 2 additions, 13 deletionsnet/core/sock.c
- net/netfilter/nft_meta.c 1 addition, 1 deletionnet/netfilter/nft_meta.c
- net/netfilter/xt_cgroup.c 2 additions, 1 deletionnet/netfilter/xt_cgroup.c
Loading
Please register or sign in to comment