| Message ID | 20201102201243.287486-1-vlad@buslov.dev |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,v2] net: sched: implement action-specific terse dump | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/cover_letter | success | Link |
| jkicinski/fixes_present | success | Link |
| jkicinski/patch_count | success | Link |
| jkicinski/tree_selection | success | Clearly marked for net-next |
| jkicinski/subject_prefix | success | Link |
| jkicinski/source_inline | success | Was 0 now: 0 |
| jkicinski/verify_signedoff | success | Link |
| jkicinski/module_param | success | Was 0 now: 0 |
| jkicinski/build_32bit | success | Errors and warnings before: 6707 this patch: 6707 |
| jkicinski/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/verify_fixes | success | Link |
| jkicinski/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 117 lines checked |
| jkicinski/build_allmodconfig_warn | success | Errors and warnings before: 7070 this patch: 7070 |
| jkicinski/header_inline | success | Link |
| jkicinski/stable | success | Stable not CCed |
On Mon, 2 Nov 2020 22:12:43 +0200 Vlad Buslov wrote: > Allow user to request action terse dump with new flag value > TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, > stats, index and cookie, if set by the user when creating the action). This > is different from filter terse dump where index is excluded (filter can be > identified by its own handle). > > Move tcf_action_dump_terse() function to the beginning of source file in > order to call it from tcf_dump_walker(). > > Signed-off-by: Vlad Buslov <vlad@buslov.dev> > Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> Jiri, Cong, can I get an ack? The previous terse dump made sense because it fulfilled the need of an important user (OvS). IDK if this is as clear-cut, and I haven't followed the iproute2 thread closely enough, so please weigh in.
On Wed, Nov 4, 2020 at 4:39 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Mon, 2 Nov 2020 22:12:43 +0200 Vlad Buslov wrote: > > Allow user to request action terse dump with new flag value > > TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, > > stats, index and cookie, if set by the user when creating the action). This > > is different from filter terse dump where index is excluded (filter can be > > identified by its own handle). > > > > Move tcf_action_dump_terse() function to the beginning of source file in > > order to call it from tcf_dump_walker(). > > > > Signed-off-by: Vlad Buslov <vlad@buslov.dev> > > Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> > > Jiri, Cong, can I get an ack? > > The previous terse dump made sense because it fulfilled the need of > an important user (OvS). IDK if this is as clear-cut, and I haven't > followed the iproute2 thread closely enough, so please weigh in. Like I said in the previous discussion, I am not a fan of terse dump, but before we have a better solution here, using this flag is probably the best we have on the table, so at least for a temporary solution: Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Thanks.
On 2020-11-04 7:39 p.m., Jakub Kicinski wrote: > On Mon, 2 Nov 2020 22:12:43 +0200 Vlad Buslov wrote: >> Allow user to request action terse dump with new flag value >> TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, >> stats, index and cookie, if set by the user when creating the action). This >> is different from filter terse dump where index is excluded (filter can be >> identified by its own handle). >> >> Move tcf_action_dump_terse() function to the beginning of source file in >> order to call it from tcf_dump_walker(). >> >> Signed-off-by: Vlad Buslov <vlad@buslov.dev> >> Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> > > Jiri, Cong, can I get an ack? > > The previous terse dump made sense because it fulfilled the need of > an important user (OvS). The requirement is to save on how much data crosses between user space and the kernel. If you are polling the kernel every second for stats and you can shave say 32B per rule - it is not a big deal if you have a few rules. If you have 1M rules thats 32MB/s removed. So how do you get the stats? You can poll the rules (which have actions that embed the stats). That approach is taken by Ovs and some others. Or you can poll the actions instead (approach we have taken to cut further on data crossing). Polling the actions has also got a lot of other features built in for this precise purpose (example time-of-use filtering). Terse is useful in both cases because it cuts the amount of data further. Hope that clarifies. cheers, jamal
On Wed, 4 Nov 2020 22:34:27 -0800 Cong Wang wrote: > On Wed, Nov 4, 2020 at 4:39 PM Jakub Kicinski <kuba@kernel.org> wrote: > > > > On Mon, 2 Nov 2020 22:12:43 +0200 Vlad Buslov wrote: > > > Allow user to request action terse dump with new flag value > > > TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, > > > stats, index and cookie, if set by the user when creating the action). This > > > is different from filter terse dump where index is excluded (filter can be > > > identified by its own handle). > > > > > > Move tcf_action_dump_terse() function to the beginning of source file in > > > order to call it from tcf_dump_walker(). > > > > > > Signed-off-by: Vlad Buslov <vlad@buslov.dev> > > > Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> > > > > Jiri, Cong, can I get an ack? > > > > The previous terse dump made sense because it fulfilled the need of > > an important user (OvS). IDK if this is as clear-cut, and I haven't > > followed the iproute2 thread closely enough, so please weigh in. > > Like I said in the previous discussion, I am not a fan of terse dump, > but before we have a better solution here, using this flag is probably > the best we have on the table, so at least for a temporary solution: > > Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Applied, thanks!
On Thu, 5 Nov 2020 06:48:48 -0500 Jamal Hadi Salim wrote: > On 2020-11-04 7:39 p.m., Jakub Kicinski wrote: > > On Mon, 2 Nov 2020 22:12:43 +0200 Vlad Buslov wrote: > >> Allow user to request action terse dump with new flag value > >> TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, > >> stats, index and cookie, if set by the user when creating the action). This > >> is different from filter terse dump where index is excluded (filter can be > >> identified by its own handle). > >> > >> Move tcf_action_dump_terse() function to the beginning of source file in > >> order to call it from tcf_dump_walker(). > >> > >> Signed-off-by: Vlad Buslov <vlad@buslov.dev> > >> Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> > > > > Jiri, Cong, can I get an ack? > > > > The previous terse dump made sense because it fulfilled the need of > > an important user (OvS). > > The requirement is to save on how much data crosses between user > space and the kernel. If you are polling the kernel every second > for stats and you can shave say 32B per rule - it is not a big > deal if you have a few rules. If you have 1M rules thats 32MB/s > removed. > So how do you get the stats? You can poll the rules (which have actions > that embed the stats). That approach is taken by Ovs and some others. > Or you can poll the actions instead (approach we have taken to cut > further on data crossing). Polling the actions has also got a lot of > other features built in for this precise purpose (example time-of-use > filtering). > Terse is useful in both cases because it cuts the amount of data > further. Ack.
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index fdd408f6a5d2..d1325ffb0060 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -770,8 +770,12 @@ enum { * 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 + * includes essential action info (kind, index, etc.) + * */ #define TCA_FLAG_LARGE_DUMP_ON (1 << 0) +#define TCA_FLAG_TERSE_DUMP (1 << 1) /* New extended info filters for IFLA_EXT_MASK */ #define RTEXT_FILTER_VF (1 << 0) diff --git a/net/sched/act_api.c b/net/sched/act_api.c index f66417d5d2c3..1341c59c2f40 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -215,6 +215,36 @@ static size_t tcf_action_fill_size(const struct tc_action *act) return sz; } +static int +tcf_action_dump_terse(struct sk_buff *skb, struct tc_action *a, bool from_act) +{ + unsigned char *b = skb_tail_pointer(skb); + struct tc_cookie *cookie; + + if (nla_put_string(skb, TCA_KIND, a->ops->kind)) + goto nla_put_failure; + if (tcf_action_copy_stats(skb, a, 0)) + goto nla_put_failure; + if (from_act && nla_put_u32(skb, TCA_ACT_INDEX, a->tcfa_index)) + goto nla_put_failure; + + rcu_read_lock(); + cookie = rcu_dereference(a->act_cookie); + if (cookie) { + if (nla_put(skb, TCA_ACT_COOKIE, cookie->len, cookie->data)) { + rcu_read_unlock(); + goto nla_put_failure; + } + } + rcu_read_unlock(); + + return 0; + +nla_put_failure: + nlmsg_trim(skb, b); + return -1; +} + static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb, struct netlink_callback *cb) { @@ -248,7 +278,9 @@ static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb, index--; goto nla_put_failure; } - err = tcf_action_dump_1(skb, p, 0, 0); + err = (act_flags & TCA_FLAG_TERSE_DUMP) ? + tcf_action_dump_terse(skb, p, true) : + tcf_action_dump_1(skb, p, 0, 0); if (err < 0) { index--; nlmsg_trim(skb, nest); @@ -752,34 +784,6 @@ tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int bind, int ref) return a->ops->dump(skb, a, bind, ref); } -static int -tcf_action_dump_terse(struct sk_buff *skb, struct tc_action *a) -{ - unsigned char *b = skb_tail_pointer(skb); - struct tc_cookie *cookie; - - if (nla_put_string(skb, TCA_KIND, a->ops->kind)) - goto nla_put_failure; - if (tcf_action_copy_stats(skb, a, 0)) - goto nla_put_failure; - - rcu_read_lock(); - cookie = rcu_dereference(a->act_cookie); - if (cookie) { - if (nla_put(skb, TCA_ACT_COOKIE, cookie->len, cookie->data)) { - rcu_read_unlock(); - goto nla_put_failure; - } - } - rcu_read_unlock(); - - return 0; - -nla_put_failure: - nlmsg_trim(skb, b); - return -1; -} - int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) { @@ -787,7 +791,7 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) unsigned char *b = skb_tail_pointer(skb); struct nlattr *nest; - if (tcf_action_dump_terse(skb, a)) + if (tcf_action_dump_terse(skb, a, false)) goto nla_put_failure; if (a->hw_stats != TCA_ACT_HW_STATS_ANY && @@ -832,7 +836,7 @@ int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[], nest = nla_nest_start_noflag(skb, i + 1); if (nest == NULL) goto nla_put_failure; - err = terse ? tcf_action_dump_terse(skb, a) : + err = terse ? tcf_action_dump_terse(skb, a, false) : tcf_action_dump_1(skb, a, bind, ref); if (err < 0) goto errout; @@ -1469,7 +1473,8 @@ static int tcf_action_add(struct net *net, struct nlattr *nla, } static const struct nla_policy tcaa_policy[TCA_ROOT_MAX + 1] = { - [TCA_ROOT_FLAGS] = NLA_POLICY_BITFIELD32(TCA_FLAG_LARGE_DUMP_ON), + [TCA_ROOT_FLAGS] = NLA_POLICY_BITFIELD32(TCA_FLAG_LARGE_DUMP_ON | + TCA_FLAG_TERSE_DUMP), [TCA_ROOT_TIME_DELTA] = { .type = NLA_U32 }, };
Allow user to request action terse dump with new flag value TCA_FLAG_TERSE_DUMP. Only output essential action info in terse dump (kind, stats, index and cookie, if set by the user when creating the action). This is different from filter terse dump where index is excluded (filter can be identified by its own handle). Move tcf_action_dump_terse() function to the beginning of source file in order to call it from tcf_dump_walker(). Signed-off-by: Vlad Buslov <vlad@buslov.dev> Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com> --- Notes: Changes V1 -> V2: - Include cookie in action terse dump. include/uapi/linux/rtnetlink.h | 4 ++ net/sched/act_api.c | 69 ++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 32 deletions(-)