netfilter: connlabels: get rid of variable-size support
Subsystems (3)
Florian Westphal
maintainerAs discussed earlier, lets make the current 128bit upper size the fixed standard size.
It allows to get rid of a few run-time tests and also reduces needed extension size with both openvswitch and nftables.
While at it, also move a helper that is only needed by the xt_connlabel match there. Originally I kept this in the core because it wasn't yet clear if nft would needed it later.
include/net/netfilter/nf_conntrack_labels.h | 18 +++-------------- net/netfilter/nf_conntrack_labels.c | 28 +-------------------------- net/netfilter/nf_conntrack_netlink.c | 10 ++++----- net/netfilter/nft_ct.c | 13 ++---------- net/netfilter/xt_connlabel.c | 29 +++++++++++++++------------- net/openvswitch/conntrack.c | 4 +-- 6 files changed, 32 insertions(+), 70 deletions(-)
Florian Westphal
maintainerPATCH 1/2 netfilter: conntrack: support a fixed size of 128 distinct labels
The conntrack label extension is currently variable-sized, e.g. if only 2 labels are used by iptables rules then the labels->bits[] array will only contain one element.
We track size of each label storage area in the 'words' member.
But in nftables and openvswitch we always have to ask for worst-case since we don't know what bit will be used at configuration time.
As most arches are 64bit we need to allocate 24 bytes in this case:
struct nf_conn_labels {
u8 words; /* 0 1 */
/* XXX 7 bytes hole, try to pack */
long unsigned bits[2]; /* 8 24 */Make bits a fixed size and drop the words member, it simplifies the code and only increases memory requirements on x86 when less than 64bit labels are required.
We still only allocate the extension if its needed.
--- include/net/netfilter/nf_conntrack_labels.h | 16 ++++------------ net/netfilter/nf_conntrack_labels.c | 13 +++---------- net/netfilter/nf_conntrack_netlink.c | 10 +++++----- net/netfilter/nft_ct.c | 13 +++---------- net/netfilter/xt_connlabel.c | 2 +- net/openvswitch/conntrack.c | 4 ++-- 6 files changed, 18 insertions(+), 40 deletions(-)
include/net/netfilter/nf_conntrack_labels.h +4 -12
@@ -10,8 +10,7 @@#define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE)struct nf_conn_labels { -u8 words; -unsigned long bits[]; +unsigned long bits[NF_CT_LABELS_MAX_SIZE /sizeof (long )]; };static inline struct nf_conn_labels *nf_ct_labels_find (const struct nf_conn *ct)
@@ -26,20 +25,13 @@ static inline struct nf_conn_labels *nf_ct_labels_find(const struct nf_conn *ct)static inline struct nf_conn_labels *nf_ct_labels_ext_add (struct nf_conn *ct) {#ifdef CONFIG_NF_CONNTRACK_LABELS -struct nf_conn_labels *cl_ext;struct net *net =nf_ct_net (ct); -u8 words; - words =ACCESS_ONCE (net->ct.label_words); -if (words ==0 ) +if (net->ct.labels_used ==0 )return NULL ; - cl_ext =nf_ct_ext_add_length (ct,NF_CT_EXT_LABELS , - words *sizeof (long ),GFP_ATOMIC ); -if (cl_ext !=NULL ) - cl_ext->words = words; - -return cl_ext; +return nf_ct_ext_add_length (ct,NF_CT_EXT_LABELS , +sizeof (struct nf_conn_labels ),GFP_ATOMIC );#else return NULL ;#endif
net/netfilter/nf_conntrack_labels.c +3 -10
@@ -20,7 +20,7 @@ int nf_connlabel_set(struct nf_conn *ct, u16 bit) {struct nf_conn_labels *labels =nf_ct_labels_find (ct); -if (!labels ||BIT_WORD (bit) >= labels->words) +if (!labels)return -ENOSPC ;if (test_bit (bit, labels->bits))
@@ -60,7 +60,7 @@ int nf_connlabels_replace(struct nf_conn *ct,if (!labels)return -ENOSPC ; - size = labels->words *sizeof (long ); + size =sizeof (labels->bits);if (size < (words32 *sizeof (u32))) words32 = size /sizeof (u32);
@@ -80,16 +80,11 @@ EXPORT_SYMBOL_GPL(nf_connlabels_replace);int nf_connlabels_get (struct net *net,unsigned int bits) { -size_t words; - - words =BIT_WORD (bits) +1 ; -if (words >NF_CT_LABELS_MAX_SIZE /sizeof (long )) +if (BIT_WORD (bits) >=NF_CT_LABELS_MAX_SIZE /sizeof (long ))return -ERANGE ;spin_lock (&nf_connlabels_lock); net->ct.labels_used++; -if (words > net->ct.label_words) - net->ct.label_words = words;spin_unlock (&nf_connlabels_lock);return 0 ;
@@ -100,8 +95,6 @@ void nf_connlabels_put(struct net *net) {spin_lock (&nf_connlabels_lock); net->ct.labels_used--; -if (net->ct.labels_used ==0 ) - net->ct.label_words =0 ;spin_unlock (&nf_connlabels_lock); }EXPORT_SYMBOL_GPL (nf_connlabels_put);
net/netfilter/nf_conntrack_netlink.c +5 -5
@@ -346,25 +346,25 @@ static inline int ctnetlink_label_size(const struct nf_conn *ct)if (!labels)return 0 ; -return nla_total_size (labels->words *sizeof (long )); +return nla_total_size (sizeof (labels->bits)); }static int ctnetlink_dump_labels (struct sk_buff *skb,const struct nf_conn *ct) {struct nf_conn_labels *labels =nf_ct_labels_find (ct); -unsigned int len, i; +unsigned int i;if (!labels)return 0 ; - len = labels->words *sizeof (long ); i =0 ;do {if (labels->bits[i] !=0 ) -return nla_put (skb,CTA_LABELS , len, labels->bits); +return nla_put (skb,CTA_LABELS ,sizeof (labels->bits), + labels->bits); i++; - }while (i < labels->words); + }while (i <ARRAY_SIZE (labels->bits));return 0 ; }
net/netfilter/nft_ct.c +3 -10
@@ -113,18 +113,11 @@ static void nft_ct_get_eval(const struct nft_expr *expr,#ifdef CONFIG_NF_CONNTRACK_LABELS case NFT_CT_LABELS : {struct nf_conn_labels *labels =nf_ct_labels_find (ct); -unsigned int size; -if (!labels) { +if (labels) +memcpy (dest, labels->bits,NF_CT_LABELS_MAX_SIZE ); +else memset (dest,0 ,NF_CT_LABELS_MAX_SIZE ); -return ; - } - - size = labels->words *sizeof (long ); -memcpy (dest, labels->bits, size); -if (size <NF_CT_LABELS_MAX_SIZE ) -memset (((char *) dest) + size,0 , -NF_CT_LABELS_MAX_SIZE - size);return ; }#endif
net/netfilter/xt_connlabel.c +1 -1
@@ -25,7 +25,7 @@ static bool connlabel_match(const struct nf_conn *ct, u16 bit)if (!labels)return false; -return BIT_WORD (bit) < labels->words &&test_bit (bit, labels->bits); +return test_bit (bit, labels->bits); } static bool
net/openvswitch/conntrack.c +2 -2
@@ -135,7 +135,7 @@ static void ovs_ct_get_labels(const struct nf_conn *ct,struct nf_conn_labels *cl = ct ?nf_ct_labels_find (ct) :NULL ;if (cl) { -size_t len = cl->words *sizeof (long ); +size_t len =sizeof (cl->bits);if (len >OVS_CT_LABELS_LEN ) len =OVS_CT_LABELS_LEN ;
@@ -274,7 +274,7 @@ static int ovs_ct_set_labels(struct sk_buff *skb, struct sw_flow_key *key,nf_ct_labels_ext_add (ct); cl =nf_ct_labels_find (ct); } -if (!cl || cl->words *sizeof (long ) <OVS_CT_LABELS_LEN ) +if (!cl ||sizeof (cl->bits) <OVS_CT_LABELS_LEN )return -ENOSPC ; err = nf_connlabels_replace(ct, (u32 *)labels, (u32 *)mask,
Signature · 1 line
2.7.3
Re: [PATCH 1/2] netfilter: conntrack: support a fixed size of 128 distinct labels
Quoted 16 lines · Florian Westphal
The conntrack label extension is currently variable-sized, e.g. if only 2 labels are used by iptables rules then the labels->bits[] array will only contain one element.
We track size of each label storage area in the 'words' member.
But in nftables and openvswitch we always have to ask for worst-case since we don't know what bit will be used at configuration time.
As most arches are 64bit we need to allocate 24 bytes in this case:
struct nf_conn_labels { u8 words; /* 0 1 */ /* XXX 7 bytes hole, try to pack */ long unsigned bits[2]; /* 8 24 */
Quoted 5 lines
Make bits a fixed size and drop the words member, it simplifies the code and only increases memory requirements on x86 when less than 64bit labels are required.
We still only allocate the extension if its needed.
Applied, thanks.
Florian Westphal
maintainerPATCH 2/2 netfilter: connlabels: move set helper to xt_connlabel
In reply to Florian Westphalxt_connlabel is the only user so move it.
--- include/net/netfilter/nf_conntrack_labels.h | 2 -- net/netfilter/nf_conntrack_labels.c | 17 ----------------- net/netfilter/xt_connlabel.c | 29 ++++++++++++++++------------- 3 files changed, 16 insertions(+), 32 deletions(-)
include/net/netfilter/nf_conntrack_labels.h +0 -2
@@ -37,8 +37,6 @@ static inline struct nf_conn_labels *nf_ct_labels_ext_add(struct nf_conn *ct)#endif } -int nf_connlabel_set (struct nf_conn *ct,u16 bit); -int nf_connlabels_replace (struct nf_conn *ct,const u32 *data,const u32 *mask,unsigned int words);
net/netfilter/nf_conntrack_labels.c +0 -17
@@ -16,23 +16,6 @@static spinlock_t nf_connlabels_lock; -int nf_connlabel_set (struct nf_conn *ct,u16 bit) -{ -struct nf_conn_labels *labels =nf_ct_labels_find (ct); - -if (!labels) -return -ENOSPC ; - -if (test_bit (bit, labels->bits)) -return 0 ; - -if (!test_and_set_bit (bit, labels->bits)) -nf_conntrack_event_cache (IPCT_LABEL , ct); - -return 0 ; -} -EXPORT_SYMBOL_GPL (nf_connlabel_set); -static int replace_u32 (u32 *address,u32 mask,u32 new) {u32 old, tmp;
net/netfilter/xt_connlabel.c +16 -13
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/skbuff.h> #include <net/netfilter/nf_conntrack.h> +#include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_labels.h> #include <linux/netfilter/x_tables.h>
@@ -18,21 +19,12 @@ MODULE_DESCRIPTION("Xtables: add/match connection trackling labels");MODULE_ALIAS ("ipt_connlabel" );MODULE_ALIAS ("ip6t_connlabel" ); -static bool connlabel_match (const struct nf_conn *ct,u16 bit) -{ -struct nf_conn_labels *labels =nf_ct_labels_find (ct); - -if (!labels) -return false; - -return test_bit (bit, labels->bits); -} -static bool connlabel_mt (const struct sk_buff *skb,struct xt_action_param *par) {const struct xt_connlabel_mtinfo *info = par->matchinfo;enum ip_conntrack_info ctinfo; +struct nf_conn_labels *labels;struct nf_conn *ct;bool invert = info->options &XT_CONNLABEL_OP_INVERT ;
@@ -40,10 +32,21 @@ connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par)if (ct ==NULL ||nf_ct_is_untracked (ct))return invert; -if (info->options &XT_CONNLABEL_OP_SET ) -return (nf_connlabel_set (ct, info->bit) ==0 ) ^ invert; + labels =nf_ct_labels_find (ct); +if (!labels) +return invert; + +if (test_bit (info->bit, labels->bits)) +return !invert; + +if (info->options &XT_CONNLABEL_OP_SET ) { +if (!test_and_set_bit (info->bit, labels->bits)) +nf_conntrack_event_cache (IPCT_LABEL , ct); + +return !invert; + } -return connlabel_match (ct, info->bit) ^ invert; +return invert; }static int connlabel_mt_check (const struct xt_mtchk_param *par)
Signature · 1 line
2.7.3
Pablo Neira Ayuso
maintainerRe: [PATCH 2/2] netfilter: connlabels: move set helper to xt_connlabel
Quoted 9 lines · Florian Westphal
xt_connlabelis the only user so move it.Signed-off-by Florian Westphal <[email protected]>--- include/net/netfilter/nf_conntrack_labels.h | 2 -- net/netfilter/nf_conntrack_labels.c | 17 ----------------- net/netfilter/xt_connlabel.c | 29 ++++++++++++++++------------- 3 files changed, 16 insertions(+), 32 deletions(-)
[...]
Quoted 9 lines
net/netfilter/xt_connlabel.c +3
-2@@ -40,10 +32,21 @@ connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par)if (ct ==NULL ||nf_ct_is_untracked (ct))return invert; -if (info->options &XT_CONNLABEL_OP_SET ) -return (nf_connlabel_set (ct, info->bit) ==0 ) ^ invert; + labels =nf_ct_labels_find (ct); +if (!labels) +return invert;
net/netfilter/xt_connlabel.c connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par) · line 47
Quoted 10 lines
net/netfilter/xt_connlabel.c +10
-0+ +if (test_bit (info->bit, labels->bits)) +return !invert; + +if (info->options &XT_CONNLABEL_OP_SET ) { +if (!test_and_set_bit (info->bit, labels->bits)) +nf_conntrack_event_cache (IPCT_LABEL , ct); + +return !invert; + }
This patch inverts the existing logic, right? So this is first testing for the bit, then setting it.
Before this patch, I remember because of what we discussed wrt. the translation to nftables, was actually the opposite.
Florian Westphal
maintainerRe: [PATCH 2/2] netfilter: connlabels: move set helper to xt_connlabel
Quoted 25 lines · Pablo Neira Ayuso
Quoted 9 lines · Florian Westphal
xt_connlabelis the only user so move it.Signed-off-by Florian Westphal <[email protected]>--- include/net/netfilter/nf_conntrack_labels.h | 2 -- net/netfilter/nf_conntrack_labels.c | 17 ----------------- net/netfilter/xt_connlabel.c | 29 ++++++++++++++++------------- 3 files changed, 16 insertions(+), 32 deletions(-)[...]
Quoted 14 lines
net/netfilter/xt_connlabel.c +8
-2@@ -40,10 +32,21 @@ connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par)if (ct ==NULL ||nf_ct_is_untracked (ct))return invert; -if (info->options &XT_CONNLABEL_OP_SET ) -return (nf_connlabel_set (ct, info->bit) ==0 ) ^ invert; + labels =nf_ct_labels_find (ct); +if (!labels) +return invert; + +if (test_bit (info->bit, labels->bits)) +return !invert; + +if (info->options &XT_CONNLABEL_OP_SET ) {
Quoted 8 lines
net/netfilter/xt_connlabel.c connlabel_mt(const struct sk_buff *skb, struct xt_action_param *par) · line 47
Quoted 5 lines
net/netfilter/xt_connlabel.c +5
-0+if (!test_and_set_bit (info->bit, labels->bits)) +nf_conntrack_event_cache (IPCT_LABEL , ct); + +return !invert; + }This patch inverts the existing logic, right? So this is first testing for the bit, then setting it.
No, this should have no user-visible change (if it does thats a bug); nf_connlabel_set() also had a test_bit().
The only change after the patches are applied is that if we have a valid conntrack with the extension present then a set op will always succeed (before we had to test if the label->bit[] area was large enough).
Pablo Neira Ayuso
maintainerRe: [PATCH 2/2] netfilter: connlabels: move set helper to xt_connlabel
In reply to Florian WestphalQuoted 1 line · Florian Westphal
xt_connlabelis the only user so move it.
Also applied, thanks.