netfilter: Make xt_cgroup independent from net_cls
Subsystems (4)
Michal Koutný
maintainerv3 cover netfilter: Make xt_cgroup independent from net_cls
Changes from v2 (https://lore.kernel.org/r/[email protected]):
- don't accept zero classid neither (Pablo N. A.)
- eliminate code that might rely on comparison against zero with !CONFIG_CGROUP_NET_CLASSID
Michal Koutný (3):
netfilter: Make xt_cgroup independent from net_cls
cgroup: Guard users of sock_cgroup_classid()
cgroup: Drop sock_cgroup_classid() dummy implementation
include/linux/cgroup-defs.h | 10 ++++------ net/ipv4/inet_diag.c | 2 +- net/netfilter/Kconfig | 2 +- net/netfilter/xt_cgroup.c | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 8 deletions(-)
base-commit: dd83757f6e686a2188997cb58b5975f744bb7786
Signature · 1 line
2.48.1
Michal Koutný
maintainerPATCH v3 1/3 netfilter: Make xt_cgroup independent from net_cls
The xt_group matching supports the default hierarchy since commit c38c4597e4bf3 ("netfilter: implement xt_cgroup cgroup2 path match"). The cgroup v1 matching (based on clsid) and cgroup v2 matching (based on path) are rather independent. Downgrade the Kconfig dependency to mere CONFIG_SOCK_GROUP_DATA so that xt_group can be built even without CONFIG_NET_CLS_CGROUP for path matching.
Also add a message for users when they attempt to specify any clsid.
--- net/netfilter/Kconfig | 2 +- net/netfilter/xt_cgroup.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
net/netfilter/Kconfig +1 -1
@@ -1180,7 +1180,7 @@ config NETFILTER_XT_MATCH_CGROUP tristate '"control group" match support' depends on NETFILTER_ADVANCED depends on CGROUPS - select CGROUP_NET_CLASSID + select SOCK_CGROUP_DATA help Socket/process control group matching allows you to match locally generated packets based on which net_cls control group processes
net/netfilter/xt_cgroup.c +17 -0
@@ -23,6 +23,8 @@ MODULE_DESCRIPTION("Xtables: process control group matching");MODULE_ALIAS ("ipt_cgroup" );MODULE_ALIAS ("ip6t_cgroup" ); +#define NET_CLS_CLASSID_INVALID_MSG "xt_cgroup: classid invalid without net_cls cgroups\n" +static int cgroup_mt_check_v0 (const struct xt_mtchk_param *par) {struct xt_cgroup_info_v0 *info = par->matchinfo;
@@ -30,6 +32,11 @@ static int cgroup_mt_check_v0(const struct xt_mtchk_param *par)if (info->invert & ~1 )return -EINVAL ; +if (!IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } +return 0 ; }
@@ -51,6 +58,11 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par)return -EINVAL ; } +if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } + info->priv =NULL ;if (info->has_path) { cgrp =cgroup_get_from_path (info->path);
@@ -83,6 +95,11 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par)return -EINVAL ; } +if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { +pr_info (NET_CLS_CLASSID_INVALID_MSG ); +return -EINVAL ; + } + info->priv =NULL ;if (info->has_path) { cgrp =cgroup_get_from_path (info->path);
Signature · 1 line
2.48.1
Michal Koutný
maintainerPATCH v3 2/3 cgroup: Guard users of sock_cgroup_classid()
In reply to Michal KoutnýExclude code that relies on sock_cgroup_classid() as preparation of removal of the function.
--- net/ipv4/inet_diag.c | 2 +- net/netfilter/xt_cgroup.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
net/ipv4/inet_diag.c +1 -1
@@ -160,7 +160,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, ext & (1 << (INET_DIAG_TCLASS - 1))) {u32 classid =0 ; -#ifdef CONFIG_SOCK_CGROUP_DATA +#ifdef CONFIG_CGROUP_NET_CLASSID classid =sock_cgroup_classid (&sk->sk_cgrp_data);#endif /* Fallback to socket priority if class id isn't set.
net/netfilter/xt_cgroup.c +9 -0
@@ -117,6 +117,7 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par)static bool cgroup_mt_v0 (const struct sk_buff *skb,struct xt_action_param *par) { +#ifdef CONFIG_CGROUP_NET_CLASSID const struct xt_cgroup_info_v0 *info = par->matchinfo;struct sock *sk = skb->sk;
@@ -125,6 +126,8 @@ cgroup_mt_v0(const struct sk_buff *skb, struct xt_action_param *par)return (info->id ==sock_cgroup_classid (&skb->sk->sk_cgrp_data)) ^ info->invert; +#endif +return false; }static bool cgroup_mt_v1 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -140,9 +143,12 @@ static bool cgroup_mt_v1(const struct sk_buff *skb, struct xt_action_param *par)if (ancestor)return cgroup_is_descendant (sock_cgroup_ptr (skcd), ancestor) ^ info->invert_path; +#ifdef CONFIG_CGROUP_NET_CLASSID else return (info->classid == sock_cgroup_classid(skcd)) ^ info->invert_classid; +#endif +return false; }static bool cgroup_mt_v2 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -158,9 +164,12 @@ static bool cgroup_mt_v2(const struct sk_buff *skb, struct xt_action_param *par)if (ancestor)return cgroup_is_descendant (sock_cgroup_ptr (skcd), ancestor) ^ info->invert_path; +#ifdef CONFIG_CGROUP_NET_CLASSID else return (info->classid == sock_cgroup_classid(skcd)) ^ info->invert_classid; +#endif +return false; }static void cgroup_mt_destroy_v1 (const struct xt_mtdtor_param *par)
Signature · 1 line
2.48.1
Michal Koutný
maintainerPATCH v3 3/3 cgroup: Drop sock_cgroup_classid() dummy implementation
In reply to Michal KoutnýThe semantic of returning 0 is unclear when !CONFIG_CGROUP_NET_CLASSID. Since there are no callers of sock_cgroup_classid() with that config anymore we can undefine the helper at all and enforce all (future) callers to handle cases when !CONFIG_CGROUP_NET_CLASSID.
--- include/linux/cgroup-defs.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
include/linux/cgroup-defs.h +4 -6
@@ -866,14 +866,12 @@ static inline u16 sock_cgroup_prioidx(const struct sock_cgroup_data *skcd)#endif } +#ifdef CONFIG_CGROUP_NET_CLASSID static inline u32 sock_cgroup_classid (const struct sock_cgroup_data *skcd) { -#ifdef CONFIG_CGROUP_NET_CLASSID return READ_ONCE (skcd->classid); -#else -return 0 ; -#endif } +#endif static inline void sock_cgroup_set_prioidx (struct sock_cgroup_data *skcd,u16 prioidx)
@@ -883,13 +881,13 @@ static inline void sock_cgroup_set_prioidx(struct sock_cgroup_data *skcd,#endif } +#ifdef CONFIG_CGROUP_NET_CLASSID static inline void sock_cgroup_set_classid (struct sock_cgroup_data *skcd,u32 classid) { -#ifdef CONFIG_CGROUP_NET_CLASSID WRITE_ONCE (skcd->classid, classid); -#endif } +#endif #else /* CONFIG_SOCK_CGROUP_DATA */
Signature · 1 line
2.48.1
Quoted 9 lines · Michal Koutný
Changes from v2 (https://lore.kernel.org/r/[email protected]):
- don't accept zero classid neither (Pablo N. A.)
- eliminate code that might rely on comparison against zero with !CONFIG_CGROUP_NET_CLASSIDMichal Koutný (3):
netfilter: Makext_cgroupindependent fromnet_cls
cgroup: Guard users ofsock_cgroup_classid()
cgroup: Dropsock_cgroup_classid()dummy implementation
From cgroup POV:
Once folks are happy, please let me know how the patches should be routed.
Thanks.
Signature · 1 line
tejun
Michal Koutný
maintainerQuoted 4 lines · Michal Koutný
Changes from v2 (https://lore.kernel.org/r/[email protected]):
- don't accept zero classid neither (Pablo N. A.)
- eliminate code that might rely on comparison against zero with !CONFIG_CGROUP_NET_CLASSID
Pablo, just to break possible dilemma with Tejun's routing [1], it makes sense to me to route this series together via net(filter) git(s).
Also, let me (anyone) know should there be further remarks to this form.
Thanks,
Michal
Pablo Neira Ayuso
maintainerQuoted 10 lines · Michal Koutný
Quoted 4 lines · Michal Koutný
Changes from v2 (https://lore.kernel.org/r/[email protected]):
- don't accept zero classid neither (Pablo N. A.)
- eliminate code that might rely on comparison against zero with !CONFIG_CGROUP_NET_CLASSIDPablo, just to break possible dilemma with Tejun's routing [1], it makes sense to me to route this series together via net(filter) git(s).
Also, let me (anyone) know should there be further remarks to this form.
I am going to apply 1/3 and 2/3 to nf-next.git
I suggest, then, you follow up to cgroups tree to submit 3/3.
3/3 does not show up in my patchwork for some reason.
Michal Koutný
maintainerQuoted 1 line · Pablo Neira Ayuso
I am going to apply 1/3 and 2/3 to nf-next.git
Thanks.
Quoted 1 line
I suggest, then, you follow up to cgroups tree to submit 3/3.
OK.
Quoted 1 line
3/3 does not show up in my patchwork for some reason.
The reason is -- my invocation of get_maintainer.pl on the 3rd patch excluded anything netdev. Sorry.
Michal