flower match support for masked ports
Subsystems (2)
cover flower match support for masked ports
Hi,
This series is for adding support for flower match on masked src/dst ports.
First commits are preparations and fixing tos and ttl output. Last 3 commits add support for masked src/dst port.
Thanks,
Roi
Eli Britstein (8):
tc_util: introduce a function to print JSON/non-JSON masked numbers
tc_util: add an option to print masked numbers with/without a newline
tc: flower: fix newline prints for ct-mark and ct-zone
tc_util: fix JSON prints for ct-mark and ct-zone
tc: flower: fix output for ip tos and ttl
tc: flower: add u16 big endian parse option
tc_util: add functions for big endian masked numbers
tc: flower: support masked port destination and source match
man/man8/tc-flower.8 | 13 ++++---- tc/f_flower.c | 92 +++++++++++++++++++++++++++++++++------------------- tc/m_ct.c | 4 +-- tc/tc_util.c | 88 ++++++++++++++++++++++++++++++++++--------------- tc/tc_util.h | 8 +++-- 5 files changed, 136 insertions(+), 69 deletions(-)
Signature · 1 line
2.8.4
PATCH 1/8 tc_util: introduce a function to print JSON/non-JSON masked numbers
From: Eli Britstein <[email protected]>
Introduce a function to print masked number with a different output for JSON or non-JSON methods, as a pre-step towards printing numbers using this common function.
--- tc/tc_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tc/tc_util.h | 2 ++ 2 files changed, 50 insertions(+)
tc/tc_util.c +48 -0
@@ -915,6 +915,42 @@ compat_xstats: *xstats = tb[TCA_XSTATS ]; } +static void print_masked_type (__u32 type_max, +__u32 (*rta_getattr_type)(const struct rtattr *), +const char *name,struct rtattr *attr, +struct rtattr *mask_attr) +{ +SPRINT_BUF (namefrm); +__u32 value, mask; +SPRINT_BUF (out); +size_t done; + +if (attr) { + value =rta_getattr_type (attr); + mask = mask_attr ?rta_getattr_type (mask_attr) : type_max; + +if (is_json_context ()) { +sprintf (namefrm,"\n %s %%u" , name); +print_hu (PRINT_ANY , name, namefrm, +rta_getattr_type (attr)); +if (mask != type_max) { +char mask_name[SPRINT_BSIZE -6 ]; + +sprintf (mask_name,"%s_mask" , name); +sprintf (namefrm,"\n %s %%u" , mask_name); +print_hu (PRINT_ANY , mask_name, namefrm, mask); + } + }else { + done =sprintf (out,"%u" , value); +if (mask != type_max) +sprintf (out + done,"/0x%x" , mask); + +sprintf (namefrm,"\n %s %%s" , name); +print_string (PRINT_ANY , name, namefrm, out); + } + } +} +void print_masked_u32 (const char *name,struct rtattr *attr,struct rtattr *mask_attr) {
@@ -958,3 +994,15 @@ void print_masked_u16(const char *name, struct rtattr *attr,sprintf (namefrm," %s %%s" , name);print_string (PRINT_ANY , name, namefrm, out); } + +static __u32 __rta_getattr_u8_u32 (const struct rtattr *attr) +{ +return rta_getattr_u8 (attr); +} + +void print_masked_u8 (const char *name,struct rtattr *attr, +struct rtattr *mask_attr) +{ +print_masked_type (UINT8_MAX , __rta_getattr_u8_u32, name, attr, + mask_attr); +}
tc/tc_util.h +2 -0
@@ -131,4 +131,6 @@ void print_masked_u32(const char *name, struct rtattr *attr, struct rtattr *mask_attr);void print_masked_u16 (const char *name,struct rtattr *attr,struct rtattr *mask_attr); +void print_masked_u8 (const char *name,struct rtattr *attr, +struct rtattr *mask_attr);#endif
Signature · 1 line
2.8.4
PATCH 2/8 tc_util: add an option to print masked numbers with/without a newline
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Add an option to print masked numbers with or without a newline, as a pre-step towards using a common function.
--- tc/f_flower.c | 4 ++-- tc/m_ct.c | 4 ++-- tc/tc_util.c | 17 +++++++++-------- tc/tc_util.h | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-)
tc/f_flower.c +2 -2
@@ -1847,13 +1847,13 @@ static void flower_print_ct_label(struct rtattr *attr,static void flower_print_ct_zone (struct rtattr *attr,struct rtattr *mask_attr) { -print_masked_u16 ("ct_zone" , attr, mask_attr); +print_masked_u16 ("ct_zone" , attr, mask_attr, false); }static void flower_print_ct_mark (struct rtattr *attr,struct rtattr *mask_attr) { -print_masked_u32 ("ct_mark" , attr, mask_attr); +print_masked_u32 ("ct_mark" , attr, mask_attr, false); }static void flower_print_key_id (const char *name,struct rtattr *attr)
tc/m_ct.c +2 -2
@@ -466,8 +466,8 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)print_string (PRINT_ANY ,"action" ," %s" ,"clear" ); } -print_masked_u32 ("mark" , tb[TCA_CT_MARK ], tb[TCA_CT_MARK_MASK ]); -print_masked_u16 ("zone" , tb[TCA_CT_ZONE ],NULL ); +print_masked_u32 ("mark" , tb[TCA_CT_MARK ], tb[TCA_CT_MARK_MASK ], false); +print_masked_u16 ("zone" , tb[TCA_CT_ZONE ],NULL , false);ct_print_labels (tb[TCA_CT_LABELS ], tb[TCA_CT_LABELS_MASK ]);ct_print_nat (ct_action, tb);
tc/tc_util.c +9 -8
@@ -918,7 +918,7 @@ compat_xstats:static void print_masked_type (__u32 type_max,__u32 (*rta_getattr_type)(const struct rtattr *),const char *name,struct rtattr *attr, -struct rtattr *mask_attr) +struct rtattr *mask_attr,bool newline) {SPRINT_BUF (namefrm);__u32 value, mask;
@@ -945,14 +945,15 @@ static void print_masked_type(__u32 type_max,if (mask != type_max)sprintf (out + done,"/0x%x" , mask); -sprintf (namefrm,"\n %s %%s" , name); +sprintf (namefrm,"%s %s %%s" , newline ?"\n " :"" , + name);print_string (PRINT_ANY , name, namefrm, out); } } }void print_masked_u32 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr) +struct rtattr *mask_attr,bool newline) {__u32 value, mask;SPRINT_BUF (namefrm);
@@ -969,12 +970,12 @@ void print_masked_u32(const char *name, struct rtattr *attr,if (mask !=UINT32_MAX )sprintf (out + done,"/0x%x" , mask); -sprintf (namefrm," %s %%s" , name); +sprintf (namefrm,"%s %s %%s" , newline ?"\n " :"" , name);print_string (PRINT_ANY , name, namefrm, out); }void print_masked_u16 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr) +struct rtattr *mask_attr,bool newline) {__u16 value, mask;SPRINT_BUF (namefrm);
@@ -991,7 +992,7 @@ void print_masked_u16(const char *name, struct rtattr *attr,if (mask !=UINT16_MAX )sprintf (out + done,"/0x%x" , mask); -sprintf (namefrm," %s %%s" , name); +sprintf (namefrm,"%s %s %%s" , newline ?"\n " :"" , name);print_string (PRINT_ANY , name, namefrm, out); }
@@ -1001,8 +1002,8 @@ static __u32 __rta_getattr_u8_u32(const struct rtattr *attr) }void print_masked_u8 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr) +struct rtattr *mask_attr,bool newline) {print_masked_type (UINT8_MAX , __rta_getattr_u8_u32, name, attr, - mask_attr); + mask_attr, newline); }
tc/tc_util.h +3 -3
@@ -128,9 +128,9 @@ int action_a2n(char *arg, int *result, bool allow_num);bool tc_qdisc_block_exists (__u32 block_index);void print_masked_u32 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr); +struct rtattr *mask_attr,bool newline);void print_masked_u16 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr); +struct rtattr *mask_attr,bool newline);void print_masked_u8 (const char *name,struct rtattr *attr, -struct rtattr *mask_attr); +struct rtattr *mask_attr,bool newline);#endif
Signature · 1 line
2.8.4
PATCH 3/8 tc: flower: fix newline prints for ct-mark and ct-zone
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Matches of ct-mark and ct-zone were printed all in the same line. Fix that so each ct match is printed in a separate line.
Example:
$ tc qdisc add dev eth0 ingress
$ tc filter add dev eth0 protocol ip parent ffff: prio 1 flower skip_hw \
ct_zone 5 ct_mark 6/0xf action ct commit zone 7 mark 8/0xf dropBefore:
$ tc -s filter show dev eth0 parent ffff:
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4 ct_zone 5 ct_mark 6/0xf
skip_hw
not_in_hw
action order 1: ct commit mark 8/0xf zone 7 drop
index 1 ref 1 bind 1 installed 31 sec used 31 sec
Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0After:
$ tc -s filter show dev eth0 parent ffff:
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4
ct_zone 5
ct_mark 6/0xf
skip_hw
not_in_hw
action order 1: ct commit mark 8/0xf zone 7 drop
index 1 ref 1 bind 1 installed 108 sec used 108 sec
Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0--- tc/f_flower.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tc/f_flower.c +2 -2
@@ -1847,13 +1847,13 @@ static void flower_print_ct_label(struct rtattr *attr,static void flower_print_ct_zone (struct rtattr *attr,struct rtattr *mask_attr) { -print_masked_u16 ("ct_zone" , attr, mask_attr, false); +print_masked_u16 ("ct_zone" , attr, mask_attr, true); }static void flower_print_ct_mark (struct rtattr *attr,struct rtattr *mask_attr) { -print_masked_u32 ("ct_mark" , attr, mask_attr, false); +print_masked_u32 ("ct_mark" , attr, mask_attr, true); }static void flower_print_key_id (const char *name,struct rtattr *attr)
Signature · 1 line
2.8.4
PATCH 4/8 tc_util: fix JSON prints for ct-mark and ct-zone
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Fix the output of ct-mark and ct-zone (both for matches and actions) to be different in JSON/non-JSON mode.
Example:
$ tc qdisc add dev eth0 ingress
$ tc filter add dev eth0 protocol ip parent ffff: prio 1 flower skip_hw \
ct_zone 5 ct_mark 6/0xf action ct commit zone 7 mark 8/0xf dropNon JSON format remains the same:
$ tc filter show dev eth0 parent ffff:
$ tc -s filter show dev ens1f0_0 parent ffff:
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4
ct_zone 5
ct_mark 6/0xf
skip_hw
not_in_hw
action order 1: ct commit mark 8/0xf zone 7 drop
index 1 ref 1 bind 1 installed 108 sec used 108 sec
Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0JSON format is changed (partial output):
$ tc -p -j filter show dev eth0 parent ffff:
Before:
"options": {
"keys": {
"ct_zone": "5",
"ct_mark": "6/0xf"
...
"actions": [ {
"order": 1,
"kind": "ct",
"action": "commit",
"mark": "8/0xf",
"zone": "7",
...
After:
"options": {
"keys": {
"ct_zone": 5,
"ct_mark": 6,
"ct_mark_mask": 15
...
"actions": [ {
"order": 1,
"kind": "ct",
"action": "commit",
"mark": 8,
"mark_mask": 15,
"zone": 7,
...--- tc/tc_util.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-)
tc/tc_util.c +8 -33
@@ -955,45 +955,20 @@ static void print_masked_type(__u32 type_max,void print_masked_u32 (const char *name,struct rtattr *attr,struct rtattr *mask_attr,bool newline) { -__u32 value, mask; -SPRINT_BUF (namefrm); -SPRINT_BUF (out); -size_t done; - -if (!attr) -return ; - - value =rta_getattr_u32 (attr); - mask = mask_attr ?rta_getattr_u32 (mask_attr) :UINT32_MAX ; - - done =sprintf (out,"%u" , value); -if (mask !=UINT32_MAX ) -sprintf (out + done,"/0x%x" , mask); +print_masked_type (UINT32_MAX , rta_getattr_u32, name, attr, mask_attr, + newline); +} -sprintf (namefrm,"%s %s %%s" , newline ?"\n " :"" , name); -print_string (PRINT_ANY , name, namefrm, out); +static __u32 __rta_getattr_u16_u32 (const struct rtattr *attr) +{ +return rta_getattr_u16 (attr); }void print_masked_u16 (const char *name,struct rtattr *attr,struct rtattr *mask_attr,bool newline) { -__u16 value, mask; -SPRINT_BUF (namefrm); -SPRINT_BUF (out); -size_t done; - -if (!attr) -return ; - - value =rta_getattr_u16 (attr); - mask = mask_attr ?rta_getattr_u16 (mask_attr) :UINT16_MAX ; - - done =sprintf (out,"%u" , value); -if (mask !=UINT16_MAX ) -sprintf (out + done,"/0x%x" , mask); - -sprintf (namefrm,"%s %s %%s" , newline ?"\n " :"" , name); -print_string (PRINT_ANY , name, namefrm, out); +print_masked_type (UINT16_MAX , __rta_getattr_u16_u32, name, attr, + mask_attr, newline); }static __u32 __rta_getattr_u8_u32 (const struct rtattr *attr)
Signature · 1 line
2.8.4
PATCH 5/8 tc: flower: fix output for ip tos and ttl
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Fix the output for ip tos and ttl to be numbers in JSON format.
Example:
$ tc qdisc add dev eth0 ingress
$ tc filter add dev eth0 protocol ip parent ffff: prio 1 flower skip_hw \
ip_tos 5/0xf action dropNon JSON format remains the same:
$ tc filter show dev eth0 parent ffff:
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4
ip_tos 5/0xf
skip_hw
not_in_hw
action order 1: gact action drop
random type none pass val 0
index 1 ref 1 bind 1JSON format is changed (partial output):
$ tc -p -j filter show dev eth0 parent ffff:
Before:
"options": {
"keys": {
"ip_tos": "0x5/f",
...
After:
"options": {
"keys": {
"ip_tos": 5,
"ip_tos_mask": 15,
...--- tc/f_flower.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
tc/f_flower.c +1 -14
@@ -1617,20 +1617,7 @@ static void flower_print_ip_proto(__u8 *p_ip_proto,static void flower_print_ip_attr (const char *name,struct rtattr *key_attr,struct rtattr *mask_attr) { -SPRINT_BUF (namefrm); -SPRINT_BUF (out); -size_t done; - -if (!key_attr) -return ; - - done =sprintf (out,"0x%x" ,rta_getattr_u8 (key_attr)); -if (mask_attr) -sprintf (out + done,"/%x" ,rta_getattr_u8 (mask_attr)); - -print_string (PRINT_FP ,NULL ,"%s " , _SL_); -sprintf (namefrm,"%s %%s" , name); -print_string (PRINT_ANY , name, namefrm, out); +print_masked_u8 (name, key_attr, mask_attr, true); } static void flower_print_matching_flags(char *name,
Signature · 1 line
2.8.4
PATCH 6/8 tc: flower: add u16 big endian parse option
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Add u16 big endian parse option as a pre-step towards TCP/UDP/SCTP ports usage.
--- tc/f_flower.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tc/f_flower.c +7 -2
@@ -220,7 +220,7 @@ static int flower_parse_matching_flags(char *str, }static int flower_parse_u16 (char *str,int value_type,int mask_type, -struct nlmsghdr *n) +struct nlmsghdr *n,bool be) {__u16 value, mask;char *slash;
@@ -239,6 +239,10 @@ static int flower_parse_u16(char *str, int value_type, int mask_type, mask =UINT16_MAX ; } +if (be) { + value =htons (value); + mask =htons (mask); + }addattr16 (n,MAX_MSG , value_type, value);addattr16 (n,MAX_MSG , mask_type, mask);
@@ -284,7 +288,8 @@ static int flower_parse_ct_zone(char *str, struct nlmsghdr *n)return flower_parse_u16 (str,TCA_FLOWER_KEY_CT_ZONE ,TCA_FLOWER_KEY_CT_ZONE_MASK , - n); + n, + false); }static int flower_parse_ct_labels (char *str,struct nlmsghdr *n)
Signature · 1 line
2.8.4
PATCH 7/8 tc_util: add functions for big endian masked numbers
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Add functions for big endian masked numbers as a pre-step towards masked port numbers.
--- tc/tc_util.c | 12 ++++++++++++ tc/tc_util.h | 2 ++ 2 files changed, 14 insertions(+)
tc/tc_util.c +12 -0
@@ -982,3 +982,15 @@ void print_masked_u8(const char *name, struct rtattr *attr,print_masked_type (UINT8_MAX , __rta_getattr_u8_u32, name, attr, mask_attr, newline); } + +static __u32 __rta_getattr_be16_u32 (const struct rtattr *attr) +{ +return rta_getattr_be16 (attr); +} + +void print_masked_be16 (const char *name,struct rtattr *attr, +struct rtattr *mask_attr,bool newline) +{ +print_masked_type (UINT16_MAX , __rta_getattr_be16_u32, name, attr, + mask_attr, newline); +}
tc/tc_util.h +2 -0
@@ -133,4 +133,6 @@ void print_masked_u16(const char *name, struct rtattr *attr, struct rtattr *mask_attr, bool newline);void print_masked_u8 (const char *name,struct rtattr *attr,struct rtattr *mask_attr,bool newline); +void print_masked_be16 (const char *name,struct rtattr *attr, +struct rtattr *mask_attr,bool newline);#endif
Signature · 1 line
2.8.4
PATCH 8/8 tc: flower: support masked port destination and source match
In reply to Roi DayanFrom: Eli Britstein <[email protected]>
Extend destination and source port match to support masks, accepting both decimal and hexadecimal formats.
Also add missing documentation to synopsis in manpage.
$ tc qdisc add dev eth0 ingress
$ tc filter add dev eth0 protocol ip parent ffff: prio 1 flower skip_hw \
ip_proto tcp dst_port 1234/0xff00 action drop$ tc -s filter show dev eth0 parent ffff:
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
eth_type ipv4
ip_proto tcp
dst_port 1234/0xff00
skip_hw
not_in_hw
action order 1: gact action drop
random type none pass val 0
index 1 ref 1 bind 1 installed 26 sec used 26 sec
Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0$ tc -p -j filter show dev eth0 parent ffff:
"options": {
"keys": {
"dst_port": 1234,
"dst_port_mask": 65280
...--- man/man8/tc-flower.8 | 13 ++++++----- tc/f_flower.c | 64 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 56 insertions(+), 21 deletions(-)
man/man8/tc-flower.8 +7 -6
@@ -57,7 +57,7 @@ flower \- flow based traffic control filter .BR dst_ip " | " src_ip " } " .IR PREFIX " | { " .BR dst_port " | " src_port " } { " -.IR port_number " | " +.IR MASKED_NUMBER " | " .IR min_port_number-max_port_number " } | " .B tcp_flags .IR MASKED_TCP_FLAGS " | "
@@ -221,12 +221,13 @@ must be a valid IPv4 or IPv6 address, depending on the \fBprotocol\fR option to tc filter, optionally followed by a slash and the prefix length. If the prefix is missing, \fBtc\fR assumes a full-length host match. .TP -.IR \fBdst_port " { " NUMBER " | " " MIN_VALUE-MAX_VALUE " } +.IR \fBdst_port " { " MASKED_NUMBER " | " " MIN_VALUE-MAX_VALUE " } .TQ -.IR \fBsrc_port " { " NUMBER " | " " MIN_VALUE-MAX_VALUE " } -Match on layer 4 protocol source or destination port number. Alternatively, the -mininum and maximum values can be specified to match on a range of layer 4 -protocol source or destination port numbers. Only available for +.IR \fBsrc_port " { " MASKED_NUMBER " | " " MIN_VALUE-MAX_VALUE " } +Match on layer 4 protocol source or destination port number, with an +optional mask. Alternatively, the mininum and maximum values can be +specified to match on a range of layer 4 protocol source or destination +port numbers. Only available for .BR ip_proto " values " udp ", " tcp " and " sctp which have to be specified in beforehand. .TP
tc/f_flower.c +49 -15
114 lines not on this page · raw message
Signature · 1 line
2.8.4
Quoted 7 lines · Roi Dayan
Hi,
This series is for adding support for flower match on masked src/dst ports.
First commits are preparations and fixing tos and ttl output. Last 3 commits add support for masked src/dst port.
Seems like the bug fixes patches should go to master.
Send those separately, once committed I can merge master to next and then you can re-send the remaining patches.
Quoted 6 lines · David Ahern
Quoted 5 lines · Roi Dayan
Hi,
This series is for adding support for flower match on masked src/dst ports.
Quoted 8 lines
Quoted 2 lines
First commits are preparations and fixing tos and ttl output. Last 3 commits add support for masked src/dst port.
Seems like the bug fixes patches should go to master.
Send those separately, once committed I can merge master to next and then you can re-send the remaining patches.
ok thanks