From patchwork Fri Oct 16 14:42:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Buslov X-Patchwork-Id: 11841833 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E288C433E7 for ; Fri, 16 Oct 2020 14:42:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0884C20708 for ; Fri, 16 Oct 2020 14:42:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409101AbgJPOmt (ORCPT ); Fri, 16 Oct 2020 10:42:49 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:45221 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2405806AbgJPOmo (ORCPT ); Fri, 16 Oct 2020 10:42:44 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from vladbu@nvidia.com) with SMTP; 16 Oct 2020 17:42:38 +0300 Received: from reg-r-vrt-018-180.mtr.labs.mlnx. (reg-r-vrt-018-180.mtr.labs.mlnx [10.215.1.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09GEgcnR020163; Fri, 16 Oct 2020 17:42:38 +0300 From: Vlad Buslov To: dsahern@gmail.com, stephen@networkplumber.org Cc: netdev@vger.kernel.org, davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, ivecera@redhat.com, vlad@buslov.dev, Vlad Buslov , Jiri Pirko Subject: [PATCH iproute2-next v3 1/2] tc: skip actions that don't have options attribute when printing Date: Fri, 16 Oct 2020 17:42:04 +0300 Message-Id: <20201016144205.21787-2-vladbu@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201016144205.21787-1-vladbu@nvidia.com> References: <20201016144205.21787-1-vladbu@nvidia.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vlad Buslov 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). This is necessary to support terse dump mode in following patch in the series. Signed-off-by: Vlad Buslov Reviewed-by: Jiri Pirko Acked-by: Jamal Hadi Salim --- tc/m_bpf.c | 2 +- tc/m_connmark.c | 2 +- tc/m_csum.c | 2 +- tc/m_ct.c | 2 +- tc/m_ctinfo.c | 2 +- tc/m_gact.c | 2 +- tc/m_ife.c | 2 +- tc/m_ipt.c | 2 +- tc/m_mirred.c | 2 +- tc/m_mpls.c | 2 +- tc/m_nat.c | 2 +- tc/m_pedit.c | 2 +- tc/m_sample.c | 2 +- tc/m_simple.c | 2 +- tc/m_skbedit.c | 2 +- tc/m_skbmod.c | 2 +- tc/m_tunnel_key.c | 2 +- tc/m_vlan.c | 2 +- tc/m_xt.c | 2 +- tc/m_xt_old.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tc/m_bpf.c b/tc/m_bpf.c index e8d704b557f9..6b231cb3d7b0 100644 --- a/tc/m_bpf.c +++ b/tc/m_bpf.c @@ -162,7 +162,7 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg) int d_ok = 0; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_ACT_BPF_MAX, arg); diff --git a/tc/m_connmark.c b/tc/m_connmark.c index 4b2dc4e25ef8..38546c75b30c 100644 --- a/tc/m_connmark.c +++ b/tc/m_connmark.c @@ -111,7 +111,7 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_connmark *ci; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_CONNMARK_MAX, arg); if (tb[TCA_CONNMARK_PARMS] == NULL) { diff --git a/tc/m_csum.c b/tc/m_csum.c index afbee9c8de0f..347e5e90e967 100644 --- a/tc/m_csum.c +++ b/tc/m_csum.c @@ -167,7 +167,7 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg) int uflag_count = 0; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_CSUM_MAX, arg); diff --git a/tc/m_ct.c b/tc/m_ct.c index 70d186e859f4..20cc9c8a3102 100644 --- a/tc/m_ct.c +++ b/tc/m_ct.c @@ -444,7 +444,7 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg) int ct_action = 0; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_CT_MAX, arg); if (tb[TCA_CT_PARMS] == NULL) { diff --git a/tc/m_ctinfo.c b/tc/m_ctinfo.c index e5c1b43642a7..5475fe4d43da 100644 --- a/tc/m_ctinfo.c +++ b/tc/m_ctinfo.c @@ -189,7 +189,7 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_ctinfo *ci; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_CTINFO_MAX, arg); if (!tb[TCA_CTINFO_ACT]) { diff --git a/tc/m_gact.c b/tc/m_gact.c index 33f326f823d1..2722e9b805f7 100644 --- a/tc/m_gact.c +++ b/tc/m_gact.c @@ -172,7 +172,7 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg) struct rtattr *tb[TCA_GACT_MAX + 1]; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_GACT_MAX, arg); diff --git a/tc/m_ife.c b/tc/m_ife.c index 6a85e087ede1..2491ddb861c2 100644 --- a/tc/m_ife.c +++ b/tc/m_ife.c @@ -228,7 +228,7 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg) SPRINT_BUF(b2); if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_IFE_MAX, arg); diff --git a/tc/m_ipt.c b/tc/m_ipt.c index cc95eab7fefb..046b310e64ab 100644 --- a/tc/m_ipt.c +++ b/tc/m_ipt.c @@ -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) diff --git a/tc/m_mirred.c b/tc/m_mirred.c index d2bdf4074a73..7c6351865788 100644 --- a/tc/m_mirred.c +++ b/tc/m_mirred.c @@ -282,7 +282,7 @@ print_mirred(struct action_util *au, FILE *f, struct rtattr *arg) const char *dev; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_MIRRED_MAX, arg); diff --git a/tc/m_mpls.c b/tc/m_mpls.c index 3d5d9b25fbf6..1a3bfdda104b 100644 --- a/tc/m_mpls.c +++ b/tc/m_mpls.c @@ -198,7 +198,7 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg) __u32 val; if (!arg) - return -1; + return 0; parse_rtattr_nested(tb, TCA_MPLS_MAX, arg); diff --git a/tc/m_nat.c b/tc/m_nat.c index 56e8f47cdefd..63de71014efd 100644 --- a/tc/m_nat.c +++ b/tc/m_nat.c @@ -147,7 +147,7 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg) int len; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_NAT_MAX, arg); diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 51dcf10930e8..ec71fcf9922e 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -746,7 +746,7 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) int err; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_PEDIT_MAX, arg); diff --git a/tc/m_sample.c b/tc/m_sample.c index 4a30513a6247..e2467a93444a 100644 --- a/tc/m_sample.c +++ b/tc/m_sample.c @@ -144,7 +144,7 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_sample *p; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_SAMPLE_MAX, arg); diff --git a/tc/m_simple.c b/tc/m_simple.c index 70897d6b7c13..bc86be27cbcc 100644 --- a/tc/m_simple.c +++ b/tc/m_simple.c @@ -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); diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c index 9afe2f0c049d..37625c5ab067 100644 --- a/tc/m_skbedit.c +++ b/tc/m_skbedit.c @@ -199,7 +199,7 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_skbedit *p; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_SKBEDIT_MAX, arg); diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c index d38a5c1921e7..e13d3f16bfcb 100644 --- a/tc/m_skbmod.c +++ b/tc/m_skbmod.c @@ -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); diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c index bfec90724d72..f700f6d86c82 100644 --- a/tc/m_tunnel_key.c +++ b/tc/m_tunnel_key.c @@ -671,7 +671,7 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_tunnel_key *parm; if (!arg) - return -1; + return 0; parse_rtattr_nested(tb, TCA_TUNNEL_KEY_MAX, arg); diff --git a/tc/m_vlan.c b/tc/m_vlan.c index 1096ba0fbf12..afc9b475ae0a 100644 --- a/tc/m_vlan.c +++ b/tc/m_vlan.c @@ -183,7 +183,7 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg) struct tc_vlan *parm; if (arg == NULL) - return -1; + return 0; parse_rtattr_nested(tb, TCA_VLAN_MAX, arg); diff --git a/tc/m_xt.c b/tc/m_xt.c index 487ba25ad391..deaf96a26f75 100644 --- a/tc/m_xt.c +++ b/tc/m_xt.c @@ -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; diff --git a/tc/m_xt_old.c b/tc/m_xt_old.c index 6a4509a9982f..db014898590d 100644 --- a/tc/m_xt_old.c +++ b/tc/m_xt_old.c @@ -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(); From patchwork Fri Oct 16 14:42:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Buslov X-Patchwork-Id: 11841829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4440FC433DF for ; Fri, 16 Oct 2020 14:42:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE6A320866 for ; Fri, 16 Oct 2020 14:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406164AbgJPOmn (ORCPT ); Fri, 16 Oct 2020 10:42:43 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:45220 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2405559AbgJPOmn (ORCPT ); Fri, 16 Oct 2020 10:42:43 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from vladbu@nvidia.com) with SMTP; 16 Oct 2020 17:42:38 +0300 Received: from reg-r-vrt-018-180.mtr.labs.mlnx. (reg-r-vrt-018-180.mtr.labs.mlnx [10.215.1.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09GEgcnS020163; Fri, 16 Oct 2020 17:42:38 +0300 From: Vlad Buslov To: dsahern@gmail.com, stephen@networkplumber.org Cc: netdev@vger.kernel.org, davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, ivecera@redhat.com, vlad@buslov.dev, Vlad Buslov Subject: [PATCH iproute2-next v3 2/2] tc: implement support for terse dump Date: Fri, 16 Oct 2020 17:42:05 +0300 Message-Id: <20201016144205.21787-3-vladbu@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201016144205.21787-1-vladbu@nvidia.com> References: <20201016144205.21787-1-vladbu@nvidia.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vlad Buslov 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 -brief filter show dev ens1f0 ingress filter protocol all pref 49151 flower chain 0 filter protocol all pref 49151 flower chain 0 handle 0x1 not_in_hw action order 1: Action statistics: Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 filter protocol all pref 49152 flower chain 0 filter protocol all pref 49152 flower chain 0 handle 0x1 not_in_hw action order 1: 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. Signed-off-by: Vlad Buslov Acked-by: Jamal Hadi Salim --- Notes: 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(-) diff --git a/man/man8/tc.8 b/man/man8/tc.8 index 7e9019f561ea..e8622053df65 100644 --- a/man/man8/tc.8 +++ b/man/man8/tc.8 @@ -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 diff --git a/tc/tc.c b/tc/tc.c index 5d57054b45fb..bdd5d4faf886 100644 --- a/tc/tc.c +++ b/tc/tc.c @@ -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", diff --git a/tc/tc_filter.c b/tc/tc_filter.c index c591a19f3123..71be2e8119c9 100644 --- a/tc/tc_filter.c +++ b/tc/tc_filter.c @@ -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;