Implement action terse dump
Subsystems (2)
cover Implement action terse dump
Refactor action flags according to recommended kernel upstream naming using TCA_ACT_ prefix. Implement support for new action terse dump flag.
Vlad Buslov (2):
tc: use TCA_ACT_ prefix for action flags
tc: implement support for action terse dump
include/uapi/linux/rtnetlink.h | 12 +++++++----- man/man8/tc.8 | 2 +- tc/m_action.c | 13 +++++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-)
Signature · 1 line
2.29.2
PATCH 2/2 tc: implement support for action terse dump
Implement support for action terse dump using new TCA_ACT_FLAG_TERSE_DUMP value of TCA_ROOT_FLAGS tlv. Set the flag when user requested it with following example CLI (-br for 'brief'):
$ tc -s -br actions ls action tunnel_key total acts 2
action order 0: tunnel_key index 1
Action statistics:
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0
action order 1: tunnel_key index 2
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 action (kind, index) and stats, if requested by the user.
--- man/man8/tc.8 | 2 +- tc/m_action.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
man/man8/tc.8 +1 -1
@@ -858,7 +858,7 @@ alias. .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. +.BR "tc filter show " and " tc actions ls " commands. .SH "EXAMPLES" .PP
tc/m_action.c +9 -0
@@ -374,6 +374,11 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)if (err <0 )return err; +if (brief && tb[TCA_ACT_INDEX ]) { +print_uint (PRINT_ANY ,"index" ,"\t index %u" , +rta_getattr_u32 (tb[TCA_ACT_INDEX ])); +print_nl (); + }if (show_stats && tb[TCA_ACT_STATS ]) {print_string (PRINT_FP ,NULL ,"\tAction statistics:" ,NULL );print_nl ();
@@ -737,6 +742,10 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event) tail3 =NLMSG_TAIL (&req.n); flag_select.value |=TCA_ACT_FLAG_LARGE_DUMP_ON ; flag_select.selector |=TCA_ACT_FLAG_LARGE_DUMP_ON ; +if (brief) { + flag_select.value |=TCA_ACT_FLAG_TERSE_DUMP ; + flag_select.selector |=TCA_ACT_FLAG_TERSE_DUMP ; + }addattr_l (&req.n,MAX_MSG ,TCA_ROOT_FLAGS , &flag_select,sizeof (struct nla_bitfield32 )); tail3->rta_len = (void *)NLMSG_TAIL (&req.n) - (void *) tail3;
Signature · 1 line
2.29.2
PATCH 1/2 tc: use TCA_ACT_ prefix for action flags
In reply to Vlad BuslovUse TCA_ACT_FLAG_LARGE_DUMP_ON alias according to new preferred naming for action flags.
--- include/uapi/linux/rtnetlink.h | 12 +++++++----- tc/m_action.c | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-)
include/uapi/linux/rtnetlink.h +7 -5
@@ -766,16 +766,18 @@ enum {#define TA_PAYLOAD (n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))/* tcamsg flags stored in attribute TCA_ROOT_FLAGS * -* TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than TCA_ACT_MAX_PRIO -* actions in a dump. All dump responses will contain the number of actions -* being dumped stored in for user app's consumption in TCA_ROOT_COUNT +* TCA_ACT_FLAG_LARGE_DUMP_ON user->kernel to request for larger than +* TCA_ACT_MAX_PRIO actions in a dump. All dump responses will contain the +* number of actions being dumped stored in for user app's consumption in +* TCA_ROOT_COUNT * -* TCA_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only +* TCA_ACT_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only * includes essential action info (kind, index, etc.) * */ #define TCA_FLAG_LARGE_DUMP_ON (1 << 0) -#define TCA_FLAG_TERSE_DUMP (1 << 1) +#define TCA_ACT_FLAG_LARGE_DUMP_ON TCA_FLAG_LARGE_DUMP_ON +#define TCA_ACT_FLAG_TERSE_DUMP (1 << 1)/* New extended info filters for IFLA_EXT_MASK */ #define RTEXT_FILTER_VF (1 << 0)
tc/m_action.c +2 -2
@@ -735,8 +735,8 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event)addattr_nest_end (&req.n, tail); tail3 =NLMSG_TAIL (&req.n); - flag_select.value |=TCA_FLAG_LARGE_DUMP_ON ; - flag_select.selector |=TCA_FLAG_LARGE_DUMP_ON ; + flag_select.value |=TCA_ACT_FLAG_LARGE_DUMP_ON ; + flag_select.selector |=TCA_ACT_FLAG_LARGE_DUMP_ON ;addattr_l (&req.n,MAX_MSG ,TCA_ROOT_FLAGS , &flag_select,sizeof (struct nla_bitfield32 )); tail3->rta_len = (void *)NLMSG_TAIL (&req.n) - (void *) tail3;
Signature · 1 line
2.29.2
David Ahern
AppliedQuoted 12 lines · Vlad Buslov
Refactor action flags according to recommended kernel upstream naming using
TCA_ACT_prefix. Implement support for new action terse dump flag.Vlad Buslov (2):
tc: useTCA_ACT_prefix for action flags
tc: implement support for action terse dumpinclude/uapi/linux/rtnetlink.h | 12 +++++++----- man/man8/tc.8 | 2 +- tc/m_action.c | 13 +++++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-)
applied to iproute2-next. Thanks,