Implement filter terse dump mode support
Subsystems (2)
v4 cover Implement filter terse dump mode support
Implement support for terse dump mode which provides only essential classifier/action info (handle, stats, cookie, etc.). Use new TCA_DUMP_FLAGS_TERSE flag to prevent copying of unnecessary data from kernel.
Vlad Buslov (2):
tc: skip actions that don't have options attribute when printing
tc: implement support for terse dump
man/man8/tc.8 | 6 ++++++ tc/m_bpf.c | 4 ++-- tc/m_connmark.c | 4 ++-- tc/m_csum.c | 4 ++-- tc/m_ct.c | 5 ++--- tc/m_ctinfo.c | 4 ++-- tc/m_gact.c | 4 ++-- tc/m_ife.c | 4 ++-- tc/m_ipt.c | 2 +- tc/m_mirred.c | 4 ++-- tc/m_mpls.c | 4 ++-- tc/m_nat.c | 4 ++-- tc/m_pedit.c | 4 ++-- tc/m_sample.c | 4 ++-- tc/m_simple.c | 2 +- tc/m_skbedit.c | 5 ++--- tc/m_skbmod.c | 2 +- tc/m_tunnel_key.c | 5 ++--- tc/m_vlan.c | 4 ++-- tc/m_xt.c | 2 +- tc/m_xt_old.c | 2 +- tc/tc.c | 6 +++++- tc/tc_filter.c | 9 +++++++++ 23 files changed, 55 insertions(+), 39 deletions(-)
Signature · 1 line
2.21.0
PATCH v4 1/2 tc: skip actions that don't have options attribute when printing
From: Vlad Buslov <[email protected]>
Modify implementations that return error from action_until->print_aopt() callback to silently skip actions that don't have their corresponding TCA_ACT_OPTIONS attribute set (some actions already behave like this). Print action kind before returning from action_until->print_aopt() callbacks. This is necessary to support terse dump mode in following patch in the series.
---
Notes:
Changes V3 -> V4:
- Print action kind in brief mode.
tc/m_bpf.c | 4 ++-- tc/m_connmark.c | 4 ++-- tc/m_csum.c | 4 ++-- tc/m_ct.c | 5 ++--- tc/m_ctinfo.c | 4 ++-- tc/m_gact.c | 4 ++-- tc/m_ife.c | 4 ++-- tc/m_ipt.c | 2 +- tc/m_mirred.c | 4 ++-- tc/m_mpls.c | 4 ++-- tc/m_nat.c | 4 ++-- tc/m_pedit.c | 4 ++-- tc/m_sample.c | 4 ++-- tc/m_simple.c | 2 +- tc/m_skbedit.c | 5 ++--- tc/m_skbmod.c | 2 +- tc/m_tunnel_key.c | 5 ++--- tc/m_vlan.c | 4 ++-- tc/m_xt.c | 2 +- tc/m_xt_old.c | 2 +- 20 files changed, 35 insertions(+), 38 deletions(-)
tc/m_bpf.c +2 -2
@@ -161,8 +161,9 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg)struct tc_act_bpf *parm;int d_ok =0 ; +print_string (PRINT_ANY ,"kind" ,"%s " ,"bpf" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_ACT_BPF_MAX , arg);
@@ -172,7 +173,6 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg) } parm =RTA_DATA (tb[TCA_ACT_BPF_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"bpf" );if (tb[TCA_ACT_BPF_NAME ]) print_string(PRINT_ANY, "bpf_name", "%s ",
tc/m_connmark.c +2 -2
@@ -110,8 +110,9 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)struct rtattr *tb[TCA_CONNMARK_MAX +1 ];struct tc_connmark *ci; +print_string (PRINT_ANY ,"kind" ,"%s " ,"connmark" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_CONNMARK_MAX , arg);if (tb[TCA_CONNMARK_PARMS ] ==NULL ) {
@@ -121,7 +122,6 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) ci =RTA_DATA (tb[TCA_CONNMARK_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"connmark" );print_uint (PRINT_ANY ,"zone" ,"zone %u" , ci->zone);print_action_control (f," " , ci->action,"" );
tc/m_csum.c +2 -2
@@ -166,8 +166,9 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg)int uflag_count =0 ; +print_string (PRINT_ANY ,"kind" ,"%s " ,"csum" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_CSUM_MAX , arg);
@@ -199,7 +200,6 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg) uflag_1 ="?empty" ; } -print_string (PRINT_ANY ,"kind" ,"%s " ,"csum" );snprintf (buf,sizeof (buf),"%s%s%s%s%s%s%s" , uflag_1, uflag_2, uflag_3, uflag_4, uflag_5, uflag_6, uflag_7);
tc/m_ct.c +2 -3
@@ -443,8 +443,9 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)struct tc_ct *p;int ct_action =0 ; +print_string (PRINT_ANY ,"kind" ,"%s" ,"ct" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_CT_MAX , arg);if (tb[TCA_CT_PARMS ] ==NULL ) {
@@ -454,8 +455,6 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg) p =RTA_DATA (tb[TCA_CT_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s" ,"ct" ); -if (tb[TCA_CT_ACTION ]) ct_action =rta_getattr_u16 (tb[TCA_CT_ACTION ]);if (ct_action &TCA_CT_ACT_COMMIT ) {
tc/m_ctinfo.c +2 -2
@@ -188,8 +188,9 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg)unsigned short zone =0 ;struct tc_ctinfo *ci; +print_string (PRINT_ANY ,"kind" ,"%s " ,"ctinfo" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_CTINFO_MAX , arg);if (!tb[TCA_CTINFO_ACT ]) {
@@ -234,7 +235,6 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg) sizeof(__u16)) zone =rta_getattr_u16 (tb[TCA_CTINFO_ZONE ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"ctinfo" );print_hu (PRINT_ANY ,"zone" ,"zone %u" , zone);print_action_control (f," " , ci->action,"" );
tc/m_gact.c +2 -2
@@ -171,8 +171,9 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)struct tc_gact *p =NULL ;struct rtattr *tb[TCA_GACT_MAX +1 ]; +print_string (PRINT_ANY ,"kind" ,"%s " ,"gact" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_GACT_MAX , arg);
@@ -182,7 +183,6 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg) } p =RTA_DATA (tb[TCA_GACT_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"gact" );print_action_control (f,"action " , p->action,"" );#ifdef CONFIG_GACT_PROB if (tb[TCA_GACT_PROB ] !=NULL ) {
tc/m_ife.c +2 -2
@@ -227,8 +227,9 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)int has_optional =0 ;SPRINT_BUF (b2); +print_string (PRINT_ANY ,"kind" ,"%s " ,"ife" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_IFE_MAX , arg);
@@ -238,7 +239,6 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg) } p =RTA_DATA (tb[TCA_IFE_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"ife" );print_string (PRINT_ANY ,"mode" ,"%s " , p->flags &IFE_ENCODE ?"encode" :"decode" );print_action_control (f,"action " , p->action," " );
tc/m_ipt.c +1 -1
@@ -433,7 +433,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)__u32 hook;if (arg ==NULL ) -return -1 ; +return 0 ; lib_dir =getenv ("IPTABLES_LIB_DIR" );if (!lib_dir)
tc/m_mirred.c +2 -2
@@ -281,8 +281,9 @@ print_mirred(struct action_util *au, FILE *f, struct rtattr *arg)struct rtattr *tb[TCA_MIRRED_MAX +1 ];const char *dev; +print_string (PRINT_ANY ,"kind" ,"%s " ,"mirred" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_MIRRED_MAX , arg);
@@ -298,7 +299,6 @@ print_mirred(struct action_util *au, FILE *f, struct rtattr *arg)return -1 ; } -print_string (PRINT_ANY ,"kind" ,"%s " ,"mirred" );print_string (PRINT_FP ,NULL ,"(%s" ,mirred_n2a (p->eaction));print_string (PRINT_JSON ,"mirred_action" ,NULL ,mirred_action (p->eaction));
tc/m_mpls.c +2 -2
@@ -213,8 +213,9 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg)SPRINT_BUF (b1);__u32 val; +print_string (PRINT_ANY ,"kind" ,"%s " ,"mpls" );if (!arg) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_MPLS_MAX , arg);
@@ -224,7 +225,6 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg) } parm =RTA_DATA (tb[TCA_MPLS_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"mpls" );print_string (PRINT_ANY ,"mpls_action" ," %s" , action_names[parm->m_action]);
tc/m_nat.c +2 -2
@@ -146,8 +146,9 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)SPRINT_BUF (buf2);int len; +print_string (PRINT_ANY ,"type" ," %s " ,"nat" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_NAT_MAX , arg);
@@ -160,7 +161,6 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg) len =ffs (sel->mask); len = len ?33 - len :0 ; -print_string (PRINT_ANY ,"type" ," %s " ,"nat" );print_string (PRINT_ANY ,"direction" ,"%s" , sel->flags &TCA_NAT_FLAG_EGRESS ?"egress" :"ingress" );
tc/m_pedit.c +2 -2
@@ -745,8 +745,9 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg)struct m_pedit_key_ex *keys_ex =NULL ;int err; +print_string (PRINT_ANY ,"kind" ," %s " ,"pedit" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_PEDIT_MAX , arg);
@@ -783,7 +784,6 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) } } -print_string (PRINT_ANY ,"kind" ," %s " ,"pedit" );print_action_control (f,"action " , sel->action," " );print_uint (PRINT_ANY ,"nkeys" ,"keys %d\n" , sel->nkeys);print_uint (PRINT_ANY ,"index" ," \t index %u" , sel->index);
tc/m_sample.c +2 -2
@@ -143,8 +143,9 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)struct rtattr *tb[TCA_SAMPLE_MAX +1 ];struct tc_sample *p; +print_string (PRINT_ANY ,"kind" ,"%s " ,"sample" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_SAMPLE_MAX , arg);
@@ -155,7 +156,6 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg) } p =RTA_DATA (tb[TCA_SAMPLE_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"sample" );print_uint (PRINT_ANY ,"rate" ,"rate 1/%u " ,rta_getattr_u32 (tb[TCA_SAMPLE_RATE ])); print_uint(PRINT_ANY, "group", "group %u",
tc/m_simple.c +1 -1
@@ -166,7 +166,7 @@ static int print_simple(struct action_util *au, FILE *f, struct rtattr *arg)char *simpdata;if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_DEF_MAX , arg);
tc/m_skbedit.c +2 -3
@@ -198,8 +198,9 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)__u16 ptype;struct tc_skbedit *p; +print_string (PRINT_ANY ,"kind" ,"%s " ,"skbedit" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_SKBEDIT_MAX , arg);
@@ -209,8 +210,6 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) } p =RTA_DATA (tb[TCA_SKBEDIT_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"skbedit" ); -if (tb[TCA_SKBEDIT_QUEUE_MAPPING ] !=NULL ) {print_uint (PRINT_ANY ,"queue_mapping" ,"queue_mapping %u" ,rta_getattr_u16 (tb[TCA_SKBEDIT_QUEUE_MAPPING ]));
tc/m_skbmod.c +1 -1
@@ -169,7 +169,7 @@ static int print_skbmod(struct action_util *au, FILE *f, struct rtattr *arg)SPRINT_BUF (b2);if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_SKBMOD_MAX , arg);
tc/m_tunnel_key.c +2 -3
@@ -670,8 +670,9 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)struct rtattr *tb[TCA_TUNNEL_KEY_MAX +1 ];struct tc_tunnel_key *parm; +print_string (PRINT_ANY ,"kind" ,"%s " ,"tunnel_key" );if (!arg) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_TUNNEL_KEY_MAX , arg);
@@ -681,8 +682,6 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg) } parm =RTA_DATA (tb[TCA_TUNNEL_KEY_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"tunnel_key" ); -switch (parm->t_action) {case TCA_TUNNEL_KEY_ACT_RELEASE :print_string (PRINT_ANY ,"mode" ," %s" ,"unset" );
tc/m_vlan.c +2 -2
@@ -238,8 +238,9 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)__u16 val;struct tc_vlan *parm; +print_string (PRINT_ANY ,"kind" ,"%s " ,"vlan" );if (arg ==NULL ) -return -1 ; +return 0 ;parse_rtattr_nested (tb,TCA_VLAN_MAX , arg);
@@ -249,7 +250,6 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg) } parm =RTA_DATA (tb[TCA_VLAN_PARMS ]); -print_string (PRINT_ANY ,"kind" ,"%s " ,"vlan" );print_string (PRINT_ANY ,"vlan_action" ," %s" , action_names[parm->v_action]);
tc/m_xt.c +1 -1
@@ -320,7 +320,7 @@ print_ipt(struct action_util *au, FILE *f, struct rtattr *arg)__u32 hook;if (arg ==NULL ) -return -1 ; +return 0 ;/* copy tcipt_globals because .opts will be modified by iptables */ struct xtables_globals tmp_tcipt_globals = tcipt_globals;
tc/m_xt_old.c +1 -1
@@ -358,7 +358,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)__u32 hook;if (arg ==NULL ) -return -1 ; +return 0 ;set_lib_dir ();
Signature · 1 line
2.21.0
Re: [PATCH iproute2-next v4 1/2] tc: skip actions that don't have options attribute when printing
Quoted 11 lines · Vlad Buslov
From: Vlad Buslov <[email protected]>
Modify implementations that return error from
action_until->print_aopt()callback to silently skip actions that don't have their correspondingTCA_ACT_OPTIONSattribute set (some actions already behave like this). Print action kind before returning fromaction_until->print_aopt()callbacks. This is necessary to support terse dump mode in following patch in the series.Signed-off-by Vlad Buslov <[email protected]>Suggested-by Jamal Hadi Salim <[email protected]>
cheers,
jamal
PATCH v4 2/2 tc: implement support for terse dump
In reply to Vlad BuslovFrom: Vlad Buslov <[email protected]>
Implement support for classifier/action terse dump using new TCA_DUMP_FLAGS tlv with only available flag value TCA_DUMP_FLAGS_TERSE. Set the flag when user requested it with following example CLI (-br for 'brief'):
$ tc -s -br filter show dev ens1f0 ingress
filter protocol ip pref 49151 flower chain 0
filter protocol ip pref 49151 flower chain 0 handle 0x1
not_in_hw
action order 1: gact Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0filter protocol ip pref 49152 flower chain 0
filter protocol ip pref 49152 flower chain 0 handle 0x1
not_in_hw
action order 1: gact Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0
In terse mode dump only outputs essential data needed to identify the filter and action (handle, cookie, etc.) and stats, if requested by the user. The intention is to significantly improve rule dump rate by omitting all static data that do not change after rule is created.
---
Notes:
Changes V3 -> V4:
- Update example action output according to changes in previous patch.
Changes V2 -> V3:
- Add brief dump output example to commit message.
Changes V1 -> V2:
- Invoke terse dump with tc command '-brief' option instead of filter-specific 'terse' flag.
- Extend tc man and usage string with new option.
man/man8/tc.8 | 6 ++++++ tc/tc.c | 6 +++++- tc/tc_filter.c | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
man/man8/tc.8 +6 -0
@@ -854,6 +854,12 @@ option for creating alias. .RE +.TP +.BR "\-br" , " \-brief" +Print only essential data needed to identify the filter and action (handle, +cookie, etc.) and stats. This option is currently only supported by +.BR "tc filter show " command. + .SH "EXAMPLES" .PP tc -g class show dev eth0
tc/tc.c +5 -1
@@ -44,6 +44,7 @@ bool use_names;int json;int color;int oneline; +int brief;static char *conf_file;
@@ -202,7 +203,8 @@ static void usage(void)" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[aw] |\n" " -o[neline] | -j[son] | -p[retty] | -c[olor]\n" " -b[atch] [filename] | -n[etns] name | -N[umeric] |\n" - " -nm | -nam[es] | { -cf | -conf } path }\n"); +" -nm | -nam[es] | { -cf | -conf } path\n" + " -br[ief] }\n"); }static int do_cmd (int argc,char **argv)
@@ -336,6 +338,8 @@ int main(int argc, char **argv) ++json; }else if (matches (argv[1 ],"-oneline" ) ==0 ) { ++oneline; + }else if (matches (argv[1 ],"-brief" ) ==0 ) { + ++brief; }else { fprintf(stderr, "Option \"%s\" is unknown, try \"tc -help\".\n",
tc/tc_filter.c +9 -0
@@ -721,6 +721,15 @@ static int tc_filter_list(int cmd, int argc, char **argv)if (filter_chain_index_set)addattr32 (&req.n,sizeof (req),TCA_CHAIN , chain_index); +if (brief) { +struct nla_bitfield32 flags = { + .value =TCA_DUMP_FLAGS_TERSE , + .selector =TCA_DUMP_FLAGS_TERSE + }; + +addattr_l (&req.n,MAX_MSG ,TCA_DUMP_FLAGS , &flags,sizeof (flags)); + } +if (rtnl_dump_request_n (&rth, &req.n) <0 ) {perror ("Cannot send dump request" );return 1 ;
Signature · 1 line
2.21.0
David Ahern
AppliedQuoted 9 lines · Vlad Buslov
Implement support for terse dump mode which provides only essential classifier/action info (handle, stats, cookie, etc.). Use new
TCA_DUMP_FLAGS_TERSEflag to prevent copying of unnecessary data from kernel.Vlad Buslov (2):
tc: skip actions that don't have options attribute when printing
tc: implement support for terse dump
applied to iproute2-next.