* [PATCH net-next v3] tc SKB extension for tc Chains/Conntrack hardware offload @ 2019-09-03 13:23 Paul Blakey 2019-09-03 13:23 ` [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index Paul Blakey 0 siblings, 1 reply; 6+ messages in thread From: Paul Blakey @ 2019-09-03 13:23 UTC (permalink / raw) To: Pravin B Shelar, netdev, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov, Paul Blakey Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo The following patch introduces a new SKB extension to support hardware offload of multi chain rules such as by connection tracking scenarios. The patch is required for two use-cases. The first, implemented here, uses the extension for tc -> OvS miss path. A following patch set will reuse this extension to pass information from HW/Driver -> tc miss path. The HW/Driver -> tc miss path: In tc multi chain rules scenarios, some of the rules might be offloaded and some not (e.g skip_hw, unsupported rules by HW, vxlan encapsulation, offload order, etc). Therefore, HW can miss at any point of the processing chain. SW will need to continue processing in correct tc chain where the HW left off, as HW might have modified the packet and updated stats for it. This scenario can reuse this tc SKB extension to restore the tc chain. skb extension was chosen over skb control block, as skb control block acts a scratchpad area for storing temporary information and isn't suppose to be pass around between different layers of processing. HW/Driver -> tc - >OvS are different layers, and not necessarily processing the packet one after another. There can be bridges, tunnel devices, VLAN devices, Netfilter (Conntrack) and a host of other entities processing the packet in between so we can't guarantee the control block integrity between this main processing entities (HW/Driver, Tc, Ovs). So if we'll use the control block, it will restrict such use cases. For example, the napi API which we use, uses the control block and comes right after our driver layer. This will overwrite any usage of CB by us. Thanks, Paul B. Paul Blakey (1): net: openvswitch: Set OvS recirc_id from tc chain index include/linux/skbuff.h | 13 +++++++++++++ include/net/sch_generic.h | 5 ++++- include/uapi/linux/openvswitch.h | 3 +++ net/core/skbuff.c | 6 ++++++ net/openvswitch/datapath.c | 38 +++++++++++++++++++++++++++++++++----- net/openvswitch/datapath.h | 2 ++ net/openvswitch/flow.c | 13 +++++++++++++ net/sched/Kconfig | 13 +++++++++++++ net/sched/act_api.c | 1 + net/sched/cls_api.c | 12 ++++++++++++ 10 files changed, 100 insertions(+), 6 deletions(-) -- 1.8.3.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index 2019-09-03 13:23 [PATCH net-next v3] tc SKB extension for tc Chains/Conntrack hardware offload Paul Blakey @ 2019-09-03 13:23 ` Paul Blakey 2019-09-03 14:56 ` Edward Cree 2019-09-04 9:47 ` Davide Caratti 0 siblings, 2 replies; 6+ messages in thread From: Paul Blakey @ 2019-09-03 13:23 UTC (permalink / raw) To: Pravin B Shelar, netdev, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov, Paul Blakey Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo Offloaded OvS datapath rules are translated one to one to tc rules, for example the following simplified OvS rule: recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2) Will be translated to the following tc rule: $ tc filter add dev dev1 ingress \ prio 1 chain 0 proto ip \ flower tcp ct_state -trk \ action ct pipe \ action goto chain 2 Received packets will first travel though tc, and if they aren't stolen by it, like in the above rule, they will continue to OvS datapath. Since we already did some actions (action ct in this case) which might modify the packets, and updated action stats, we would like to continue the proccessing with the correct recirc_id in OvS (here recirc_id(2)) where we left off. To support this, introduce a new skb extension for tc, which will be used for translating tc chain to ovs recirc_id to handle these miss cases. Last tc chain index will be set by tc goto chain action and read by OvS datapath. Signed-off-by: Paul Blakey <paulb@mellanox.com> Signed-off-by: Vlad Buslov <vladbu@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> --- include/linux/skbuff.h | 13 +++++++++++++ include/net/sch_generic.h | 5 ++++- include/uapi/linux/openvswitch.h | 3 +++ net/core/skbuff.c | 6 ++++++ net/openvswitch/datapath.c | 38 +++++++++++++++++++++++++++++++++----- net/openvswitch/datapath.h | 2 ++ net/openvswitch/flow.c | 13 +++++++++++++ net/sched/Kconfig | 13 +++++++++++++ net/sched/act_api.c | 1 + net/sched/cls_api.c | 12 ++++++++++++ 10 files changed, 100 insertions(+), 6 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 77c6dc88..028e684 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -279,6 +279,16 @@ struct nf_bridge_info { }; #endif +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) +/* Chain in tc_skb_ext will be used to share the tc chain with + * ovs recirc_id. It will be set to the current chain by tc + * and read by ovs to recirc_id. + */ +struct tc_skb_ext { + __u32 chain; +}; +#endif + struct sk_buff_head { /* These two members must be first. */ struct sk_buff *next; @@ -4058,6 +4068,9 @@ enum skb_ext_id { #ifdef CONFIG_XFRM SKB_EXT_SEC_PATH, #endif +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + TC_SKB_EXT, +#endif SKB_EXT_NUM, /* must be last */ }; diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 43f5b7e..2fdc746 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -274,7 +274,10 @@ struct tcf_result { unsigned long class; u32 classid; }; - const struct tcf_proto *goto_tp; + struct { + const struct tcf_proto *goto_tp; + u32 goto_index; + }; /* used in the skb_tc_reinsert function */ struct { diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index f271f1e..1887a45 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -123,6 +123,9 @@ struct ovs_vport_stats { /* Allow datapath to associate multiple Netlink PIDs to each vport */ #define OVS_DP_F_VPORT_PIDS (1 << 1) +/* Allow tc offload recirc sharing */ +#define OVS_DP_F_TC_RECIRC_SHARING (1 << 2) + /* Fixed logical ports. */ #define OVSP_LOCAL ((__u32)0) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ea8e8d3..2b40b5a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4087,6 +4087,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) #ifdef CONFIG_XFRM [SKB_EXT_SEC_PATH] = SKB_EXT_CHUNKSIZEOF(struct sec_path), #endif +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + [TC_SKB_EXT] = SKB_EXT_CHUNKSIZEOF(struct tc_skb_ext), +#endif }; static __always_inline unsigned int skb_ext_total_length(void) @@ -4098,6 +4101,9 @@ static __always_inline unsigned int skb_ext_total_length(void) #ifdef CONFIG_XFRM skb_ext_type_len[SKB_EXT_SEC_PATH] + #endif +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + skb_ext_type_len[TC_SKB_EXT] + +#endif 0; } diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 65122bb..dde9d76 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1545,10 +1545,34 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *in dp->user_features = 0; } -static void ovs_dp_change(struct datapath *dp, struct nlattr *a[]) +DEFINE_STATIC_KEY_FALSE(tc_recirc_sharing_support); + +static int ovs_dp_change(struct datapath *dp, struct nlattr *a[]) { - if (a[OVS_DP_ATTR_USER_FEATURES]) - dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]); + u32 user_features = 0; + + if (a[OVS_DP_ATTR_USER_FEATURES]) { + user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]); + + if (user_features & ~(OVS_DP_F_VPORT_PIDS | + OVS_DP_F_UNALIGNED | + OVS_DP_F_TC_RECIRC_SHARING)) + return -EOPNOTSUPP; + +#if !IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + if (user_features & OVS_DP_F_TC_RECIRC_SHARING) + return -EOPNOTSUPP; +#endif + } + + dp->user_features = user_features; + + if (dp->user_features & OVS_DP_F_TC_RECIRC_SHARING) + static_branch_enable(&tc_recirc_sharing_support); + else + static_branch_disable(&tc_recirc_sharing_support); + + return 0; } static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) @@ -1610,7 +1634,9 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) parms.port_no = OVSP_LOCAL; parms.upcall_portids = a[OVS_DP_ATTR_UPCALL_PID]; - ovs_dp_change(dp, a); + err = ovs_dp_change(dp, a); + if (err) + goto err_destroy_meters; /* So far only local changes have been made, now need the lock. */ ovs_lock(); @@ -1736,7 +1762,9 @@ static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info) if (IS_ERR(dp)) goto err_unlock_free; - ovs_dp_change(dp, info->attrs); + err = ovs_dp_change(dp, info->attrs); + if (err) + goto err_unlock_free; err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid, info->snd_seq, 0, OVS_DP_CMD_SET); diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 751d34a..81e85dd 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -218,6 +218,8 @@ static inline struct datapath *get_dp(struct net *net, int dp_ifindex) extern struct notifier_block ovs_dp_device_notifier; extern struct genl_family dp_vport_genl_family; +DECLARE_STATIC_KEY_FALSE(tc_recirc_sharing_support); + void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key); void ovs_dp_detach_port(struct vport *); int ovs_dp_upcall(struct datapath *, struct sk_buff *, diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index bc89e16..b84929f 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -816,6 +816,9 @@ static int key_extract_mac_proto(struct sk_buff *skb) int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info, struct sk_buff *skb, struct sw_flow_key *key) { +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + struct tc_skb_ext *tc_ext; +#endif int res, err; /* Extract metadata from packet. */ @@ -848,7 +851,17 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info, if (res < 0) return res; key->mac_proto = res; + +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + if (static_branch_unlikely(&tc_recirc_sharing_support)) { + tc_ext = skb_ext_find(skb, TC_SKB_EXT); + key->recirc_id = tc_ext ? tc_ext->chain : 0; + } else { + key->recirc_id = 0; + } +#else key->recirc_id = 0; +#endif err = key_extract(skb, key); if (!err) diff --git a/net/sched/Kconfig b/net/sched/Kconfig index afd2ba1..b3faafe 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -963,6 +963,19 @@ config NET_IFE_SKBTCINDEX tristate "Support to encoding decoding skb tcindex on IFE action" depends on NET_ACT_IFE +config NET_TC_SKB_EXT + bool "TC recirculation support" + depends on NET_CLS_ACT + default y if NET_CLS_ACT + select SKB_EXTENSIONS + + help + Say Y here to allow tc chain misses to continue in OvS datapath in + the correct recirc_id, and hardware chain misses to continue in + the correct chain in tc software datapath. + + Say N here if you won't be using tc<->ovs offload or tc chains offload. + endif # NET_SCHED config NET_SCH_FIFO diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 3397122..c393604 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -27,6 +27,7 @@ static void tcf_action_goto_chain_exec(const struct tc_action *a, { const struct tcf_chain *chain = rcu_dereference_bh(a->goto_chain); + res->goto_index = chain->index; res->goto_tp = rcu_dereference_bh(chain->filter_chain); } diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 671ca90..dd147be 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -1514,6 +1514,18 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, goto reset; } else if (unlikely(TC_ACT_EXT_CMP(err, TC_ACT_GOTO_CHAIN))) { first_tp = res->goto_tp; + +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) + { + struct tc_skb_ext *ext; + + ext = skb_ext_add(skb, TC_SKB_EXT); + if (WARN_ON_ONCE(!ext)) + return TC_ACT_SHOT; + + ext->chain = res->goto_index; + } +#endif goto reset; } #endif -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index 2019-09-03 13:23 ` [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index Paul Blakey @ 2019-09-03 14:56 ` Edward Cree 2019-09-04 7:13 ` Paul Blakey 2019-09-04 9:47 ` Davide Caratti 1 sibling, 1 reply; 6+ messages in thread From: Edward Cree @ 2019-09-03 14:56 UTC (permalink / raw) To: Paul Blakey, Pravin B Shelar, netdev, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo On 03/09/2019 14:23, Paul Blakey wrote: > Offloaded OvS datapath rules are translated one to one to tc rules, > for example the following simplified OvS rule: > > recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2) > > Will be translated to the following tc rule: > > $ tc filter add dev dev1 ingress \ > prio 1 chain 0 proto ip \ > flower tcp ct_state -trk \ > action ct pipe \ > action goto chain 2 > > Received packets will first travel though tc, and if they aren't stolen > by it, like in the above rule, they will continue to OvS datapath. > Since we already did some actions (action ct in this case) which might > modify the packets, and updated action stats, we would like to continue > the proccessing with the correct recirc_id in OvS (here recirc_id(2)) > where we left off. IMHO each offload (OvS -> tc, and tc -> hw) ought only take place for a rule if all sequelae of that rule are also offloaded, or if non-offloaded sequelae can be guaranteed to provide an unmodified packet so that the exception path can start from the beginning. I don't like this idea of doing part of the processing in one place and then resuming the rest later in an entirely different piece of code. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index 2019-09-03 14:56 ` Edward Cree @ 2019-09-04 7:13 ` Paul Blakey 0 siblings, 0 replies; 6+ messages in thread From: Paul Blakey @ 2019-09-04 7:13 UTC (permalink / raw) To: Edward Cree, Pravin B Shelar, netdev@vger.kernel.org, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo On 9/3/2019 5:56 PM, Edward Cree wrote: > On 03/09/2019 14:23, Paul Blakey wrote: >> Offloaded OvS datapath rules are translated one to one to tc rules, >> for example the following simplified OvS rule: >> >> recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2) >> >> Will be translated to the following tc rule: >> >> $ tc filter add dev dev1 ingress \ >> prio 1 chain 0 proto ip \ >> flower tcp ct_state -trk \ >> action ct pipe \ >> action goto chain 2 >> >> Received packets will first travel though tc, and if they aren't stolen >> by it, like in the above rule, they will continue to OvS datapath. >> Since we already did some actions (action ct in this case) which might >> modify the packets, and updated action stats, we would like to continue >> the proccessing with the correct recirc_id in OvS (here recirc_id(2)) >> where we left off. > IMHO each offload (OvS -> tc, and tc -> hw) ought only take place for a rule > if all sequelae of that rule are also offloaded, or if non-offloaded sequelae > can be guaranteed to provide an unmodified packet so that the exception path > can start from the beginning. I don't like this idea of doing part of the > processing in one place and then resuming the rest later in an entirely > different piece of code. We hope to replicate the entire software module to hardware, not just tc. For tc offloading, we currently offload tc rules one by one, including tc chains rules (match on chain, and goto chain action), and the offloaded rules might not catch all packets: tc fiter add dev1 ..... chain 0 ... flower dst_mac aa:bb:cc:dd:ee:ff action pedit munge ex set dst src 12:34:56:78:aa:bb action goto chain 5 tc fiter add dev1 ..... chain 5 ... flower ip_proto UDP action mirred egress redirect dev dev2 If the packet isn't UDP we miss on chain5. Besides this basic case, there can be actions that aren't available currently, and need software assistance, such as encapsulation. if we had the following rule: tc fiter add dev1 ..... chain 5 ... flower ip_proto UDP action tunnel_key set dst_port 4789 vni 98 dst_ip 1.1.1.1 mirred egress redirect dev vxlan_sys_4789 And neighbor for the dst_ip 1.1.1.1 is unreachable, we can't do the encapsulation in hardware currently, and wait for software to resolve the neighbor via arp. Another is the action ct we plan on offloading here, we send packets back to conntrack if needed (before the connection is established, for connection setup) There can also be trap action, to explicitly continue in software, and the user might want the partial processing before it. We currently support up to several millions of such rules, and any update (delete/add) of a continuation of a rule (e.g chain 5 rule), might affect the processing of millions of other rules before it (goto chain 5 rules), with tc priorities, it's even worse and happens more often. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index 2019-09-03 13:23 ` [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index Paul Blakey 2019-09-03 14:56 ` Edward Cree @ 2019-09-04 9:47 ` Davide Caratti 2019-09-04 13:01 ` Paul Blakey 1 sibling, 1 reply; 6+ messages in thread From: Davide Caratti @ 2019-09-04 9:47 UTC (permalink / raw) To: Paul Blakey, Pravin B Shelar, netdev, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo On Tue, 2019-09-03 at 16:23 +0300, Paul Blakey wrote: > Offloaded OvS datapath rules are translated one to one to tc rules, > for example the following simplified OvS rule: > > recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2) > > Will be translated to the following tc rule: > > $ tc filter add dev dev1 ingress \ > prio 1 chain 0 proto ip \ > flower tcp ct_state -trk \ > action ct pipe \ > action goto chain 2 hello Paul! one small question: [... ] > index 43f5b7e..2fdc746 100644 > --- a/include/net/sch_generic.h > +++ b/include/net/sch_generic.h > @@ -274,7 +274,10 @@ struct tcf_result { > unsigned long class; > u32 classid; > }; > - const struct tcf_proto *goto_tp; > + struct { > + const struct tcf_proto *goto_tp; > + u32 goto_index; I don't understand why we need to store another copy of the chain index in 'res.goto_index'. (see below) [...] > index 3397122..c393604 100644 > --- a/net/sched/act_api.c > +++ b/net/sched/act_api.c > @@ -27,6 +27,7 @@ static void tcf_action_goto_chain_exec(const struct tc_action *a, > { > const struct tcf_chain *chain = rcu_dereference_bh(a->goto_chain); > > + res->goto_index = chain->index; I see "a->goto_chain" is used to read the chain index, but I think it's not needed _ because the chain index is encoded together with the "goto chain" control action. > res->goto_tp = rcu_dereference_bh(chain->filter_chain); > } > > diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c > index 671ca90..dd147be 100644 > --- a/net/sched/cls_api.c > +++ b/net/sched/cls_api.c > @@ -1514,6 +1514,18 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, > goto reset; > } else if (unlikely(TC_ACT_EXT_CMP(err, TC_ACT_GOTO_CHAIN))) { > first_tp = res->goto_tp; > + > +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) > + { > + struct tc_skb_ext *ext; > + > + ext = skb_ext_add(skb, TC_SKB_EXT); > + if (WARN_ON_ONCE(!ext)) > + return TC_ACT_SHOT; > + > + ext->chain = res->goto_index; the value of 'res->goto_index' is already encoded in the control action 'err' (masked with TC_ACT_EXT_VAL_MASK), since TC_ACT_GOTO_CHAIN bits are not zero. you can just get rid of res->goto_index, and just do: ext->chain = err & TC_ACT_EXT_VAL_MASK; am I missing something? thanks! -- davide ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index 2019-09-04 9:47 ` Davide Caratti @ 2019-09-04 13:01 ` Paul Blakey 0 siblings, 0 replies; 6+ messages in thread From: Paul Blakey @ 2019-09-04 13:01 UTC (permalink / raw) To: Davide Caratti, Pravin B Shelar, netdev@vger.kernel.org, David S. Miller, Justin Pettit, Simon Horman, Marcelo Ricardo Leitner, Vlad Buslov Cc: Jiri Pirko, Roi Dayan, Yossi Kuperman, Rony Efraim, Oz Shlomo On 9/4/2019 12:47 PM, Davide Caratti wrote: > On Tue, 2019-09-03 at 16:23 +0300, Paul Blakey wrote: >> Offloaded OvS datapath rules are translated one to one to tc rules, >> for example the following simplified OvS rule: >> >> recirc_id(0),in_port(dev1),eth_type(0x0800),ct_state(-trk) actions:ct(),recirc(2) >> >> Will be translated to the following tc rule: >> >> $ tc filter add dev dev1 ingress \ >> prio 1 chain 0 proto ip \ >> flower tcp ct_state -trk \ >> action ct pipe \ >> action goto chain 2 > hello Paul! > > one small question: > > [... ] > >> index 43f5b7e..2fdc746 100644 >> --- a/include/net/sch_generic.h >> +++ b/include/net/sch_generic.h >> @@ -274,7 +274,10 @@ struct tcf_result { >> unsigned long class; >> u32 classid; >> }; >> - const struct tcf_proto *goto_tp; >> + struct { >> + const struct tcf_proto *goto_tp; >> + u32 goto_index; > I don't understand why we need to store another copy of the chain index in > 'res.goto_index'. > (see below) > > [...] > >> index 3397122..c393604 100644 >> --- a/net/sched/act_api.c >> +++ b/net/sched/act_api.c >> @@ -27,6 +27,7 @@ static void tcf_action_goto_chain_exec(const struct tc_action *a, >> { >> const struct tcf_chain *chain = rcu_dereference_bh(a->goto_chain); >> >> + res->goto_index = chain->index; > I see "a->goto_chain" is used to read the chain index, but I think it's > not needed _ because the chain index is encoded together with the "goto > chain" control action. > >> res->goto_tp = rcu_dereference_bh(chain->filter_chain); >> } >> >> diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c >> index 671ca90..dd147be 100644 >> --- a/net/sched/cls_api.c >> +++ b/net/sched/cls_api.c >> @@ -1514,6 +1514,18 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, >> goto reset; >> } else if (unlikely(TC_ACT_EXT_CMP(err, TC_ACT_GOTO_CHAIN))) { >> first_tp = res->goto_tp; >> + >> +#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT) >> + { >> + struct tc_skb_ext *ext; >> + >> + ext = skb_ext_add(skb, TC_SKB_EXT); >> + if (WARN_ON_ONCE(!ext)) >> + return TC_ACT_SHOT; >> + >> + ext->chain = res->goto_index; > the value of 'res->goto_index' is already encoded in the control action > 'err' (masked with TC_ACT_EXT_VAL_MASK), since TC_ACT_GOTO_CHAIN bits are > not zero. > > you can just get rid of res->goto_index, and just do: > > ext->chain = err & TC_ACT_EXT_VAL_MASK; > > am I missing something? > > thanks! No, good catch :) Thanks. tcf_action_set_ctrlact sets the action with the chain index on tc action instance (tcf_action), so yes we can access it just like you say. I'll send a fix. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-09-04 13:01 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-09-03 13:23 [PATCH net-next v3] tc SKB extension for tc Chains/Conntrack hardware offload Paul Blakey 2019-09-03 13:23 ` [PATCH net-next v3] net: openvswitch: Set OvS recirc_id from tc chain index Paul Blakey 2019-09-03 14:56 ` Edward Cree 2019-09-04 7:13 ` Paul Blakey 2019-09-04 9:47 ` Davide Caratti 2019-09-04 13:01 ` Paul Blakey
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox