| Message ID | 1574330056-5377-5-git-send-email-wenxu@ucloud.cn |
|---|---|
| State | Superseded |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | netfilter: nf_flow_table_offload: support tunnel offload | expand |
Hi paul, encap in this patch. 在 2019/11/21 17:54, wenxu@ucloud.cn 写道: > From: wenxu <wenxu@ucloud.cn> > > This patch add tunnel encap decap action offload in the flowtable > offload. > > Signed-off-by: wenxu <wenxu@ucloud.cn> > --- > v2: put encap/decap action before redirect action > > net/netfilter/nf_flow_table_offload.c | 47 +++++++++++++++++++++++++++++++++++ > 1 file changed, 47 insertions(+) > > diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c > index 656095c..36a5103 100644 > --- a/net/netfilter/nf_flow_table_offload.c > +++ b/net/netfilter/nf_flow_table_offload.c > @@ -469,6 +469,45 @@ static void flow_offload_redirect(const struct flow_offload *flow, > dev_hold(rt->dst.dev); > } > > +static void flow_offload_encap_tunnel(const struct flow_offload *flow, > + enum flow_offload_tuple_dir dir, > + struct nf_flow_rule *flow_rule) > +{ > + struct flow_action_entry *entry; > + struct dst_entry *dst; > + > + dst = flow->tuplehash[dir].tuple.dst_cache; > + if (dst->lwtstate) { > + struct ip_tunnel_info *tun_info; > + > + tun_info = lwt_tun_info(dst->lwtstate); > + if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX)) { > + entry = flow_action_entry_next(flow_rule); > + entry->id = FLOW_ACTION_TUNNEL_ENCAP; > + entry->tunnel = tun_info; > + } > + } > +} > + > +static void flow_offload_decap_tunnel(const struct flow_offload *flow, > + enum flow_offload_tuple_dir dir, > + struct nf_flow_rule *flow_rule) > +{ > + struct flow_action_entry *entry; > + struct dst_entry *dst; > + > + dst = flow->tuplehash[!dir].tuple.dst_cache; > + if (dst->lwtstate) { > + struct ip_tunnel_info *tun_info; > + > + tun_info = lwt_tun_info(dst->lwtstate); > + if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX)) { > + entry = flow_action_entry_next(flow_rule); > + entry->id = FLOW_ACTION_TUNNEL_DECAP; > + } > + } > +} > + > int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, > enum flow_offload_tuple_dir dir, > struct nf_flow_rule *flow_rule) > @@ -489,6 +528,10 @@ int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, > flow->flags & FLOW_OFFLOAD_DNAT) > flow_offload_ipv4_checksum(net, flow, flow_rule); > > + flow_offload_encap_tunnel(flow, dir, flow_rule); > + > + flow_offload_decap_tunnel(flow, dir, flow_rule); > + > flow_offload_redirect(flow, dir, flow_rule); > > return 0; > @@ -512,6 +555,10 @@ int nf_flow_rule_route_ipv6(struct net *net, const struct flow_offload *flow, > flow_offload_port_dnat(net, flow, dir, flow_rule); > } > > + flow_offload_encap_tunnel(flow, dir, flow_rule); > + > + flow_offload_decap_tunnel(flow, dir, flow_rule); > + > flow_offload_redirect(flow, dir, flow_rule); > > return 0;
diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c index 656095c..36a5103 100644 --- a/net/netfilter/nf_flow_table_offload.c +++ b/net/netfilter/nf_flow_table_offload.c @@ -469,6 +469,45 @@ static void flow_offload_redirect(const struct flow_offload *flow, dev_hold(rt->dst.dev); } +static void flow_offload_encap_tunnel(const struct flow_offload *flow, + enum flow_offload_tuple_dir dir, + struct nf_flow_rule *flow_rule) +{ + struct flow_action_entry *entry; + struct dst_entry *dst; + + dst = flow->tuplehash[dir].tuple.dst_cache; + if (dst->lwtstate) { + struct ip_tunnel_info *tun_info; + + tun_info = lwt_tun_info(dst->lwtstate); + if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX)) { + entry = flow_action_entry_next(flow_rule); + entry->id = FLOW_ACTION_TUNNEL_ENCAP; + entry->tunnel = tun_info; + } + } +} + +static void flow_offload_decap_tunnel(const struct flow_offload *flow, + enum flow_offload_tuple_dir dir, + struct nf_flow_rule *flow_rule) +{ + struct flow_action_entry *entry; + struct dst_entry *dst; + + dst = flow->tuplehash[!dir].tuple.dst_cache; + if (dst->lwtstate) { + struct ip_tunnel_info *tun_info; + + tun_info = lwt_tun_info(dst->lwtstate); + if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX)) { + entry = flow_action_entry_next(flow_rule); + entry->id = FLOW_ACTION_TUNNEL_DECAP; + } + } +} + int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, enum flow_offload_tuple_dir dir, struct nf_flow_rule *flow_rule) @@ -489,6 +528,10 @@ int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, flow->flags & FLOW_OFFLOAD_DNAT) flow_offload_ipv4_checksum(net, flow, flow_rule); + flow_offload_encap_tunnel(flow, dir, flow_rule); + + flow_offload_decap_tunnel(flow, dir, flow_rule); + flow_offload_redirect(flow, dir, flow_rule); return 0; @@ -512,6 +555,10 @@ int nf_flow_rule_route_ipv6(struct net *net, const struct flow_offload *flow, flow_offload_port_dnat(net, flow, dir, flow_rule); } + flow_offload_encap_tunnel(flow, dir, flow_rule); + + flow_offload_decap_tunnel(flow, dir, flow_rule); + flow_offload_redirect(flow, dir, flow_rule); return 0;