> On Mon, Aug 18, 2025 at 11:07:33AM +0200, Lorenzo Bianconi wrote: Hi Pablo,
sorry for the long delay.
[...]
>
> I found this patch in one of my trees (see attachment) to explore
> tunnel integration of the tx path, there has been similar patches
> floating on the mailing list for layer 2 encapsulation (eg. pppoe and
> vlan), IIRC for pppoe I remember they claim to accelerate tx.
ack, thx. I will look into it for v7.
>
> Another aspect of this series is that I think it would be good to
> explore integration of other layer 3 tunnel protocols, rather than
> following an incremental approach.
ack.
>
> More comments below.
>
> > - TCP stream received from the IPIP tunnel:
> > - net-next: ~35Gbps
> > - net-next + IPIP flowtbale support: ~49Gbps
> >
[...]
> > + path->encap.id = __ipv4_addr_hash(tiph->saddr, ntohl(tiph->daddr));
>
> This hash approach sounds reasonable, but I feel a bit uncomfortable
> with the idea that the flowtable bypasses _entirely_ the existing
> firewall policy and that this does not provide a perfect match. The
> idea is that only initial packets of a flow goes through the policy,
> then once flow is added in the flowtabled such firewall policy
> validation is circumvented.
ack, I will implement a perfect match for tuple lookup in v7.
>
> To achieve a perfect match, this means more memory consumption to
> store the two IPs in the tuple.
>
> struct {
> u16 id;
> __be16 proto;
> } encap[NF_FLOW_TABLE_ENCAP_MAX];
>
> And possibility more information will need to be stored for other
> layer 3 tunnel protocols.
>
> While this hash trick looks like an interesting approach, I am
> ambivalent.
>
> And one nitpick (typo) below...
ack, I will fix it in v7.
Regards,
Lorenzo
>
> > + ctx->dev = rt->dst.dev;
> > + ip_rt_put(rt);
> > +
> > + return 0;
> > +}
> > +
>
> [...]
> > +static void nf_flow_ip4_ecanp_pop(struct sk_buff *skb)
>
> _encap_pop ?
> commit 4c635431740ecaa011c732bce954086266f07218
> Author: Pablo Neira Ayuso <[email protected]>
> Date: Wed Jul 6 12:52:02 2022 +0200
>
> netfilter: flowtable: tunnel tx support
>
> diff --git a/include/net/netfilter/nf_flow_table.h
> b/include/net/netfilter/nf_flow_table.h
> index d21da5b57eeb..d4ecb57a8bfc 100644
> --- a/include/net/netfilter/nf_flow_table.h
> +++ b/include/net/netfilter/nf_flow_table.h
> @@ -139,6 +139,27 @@ struct flow_offload_tuple {
> struct {
> struct dst_entry *dst_cache;
> u32 dst_cookie;
> + u8 tunnel_num;
> + struct {
> + u8 l3proto;
> + u8 l4proto;
> + u8 tos;
> + u8 ttl;
> + __be16 df;
> +
> + union {
> + struct in_addr src_v4;
> + struct in6_addr src_v6;
> + };
> + union {
> + struct in_addr dst_v4;
> + struct in6_addr dst_v6;
> + };
> + struct {
> + __be16 src_port;
> + __be16 dst_port;
> + };
> + } tunnel;
> };
> struct {
> u32 ifidx;
> @@ -223,6 +244,17 @@ struct nf_flow_route {
> u32 hw_ifindex;
> u8 h_source[ETH_ALEN];
> u8 h_dest[ETH_ALEN];
> +
> + int num_tunnels;
> + struct {
> + int ifindex;
> + u8 l3proto;
> + u8 l4proto;
> + struct {
> + __be32 saddr;
> + __be32 daddr;
> + } ip;
> + } tun;
> } out;
> enum flow_offload_xmit_type xmit_type;
> } tuple[FLOW_OFFLOAD_DIR_MAX];
> diff --git a/net/netfilter/nf_flow_table_core.c
> b/net/netfilter/nf_flow_table_core.c
> index ab7df5c54eba..9244168c8cc8 100644
> --- a/net/netfilter/nf_flow_table_core.c
> +++ b/net/netfilter/nf_flow_table_core.c
> @@ -177,6 +177,24 @@ static int flow_offload_fill_route(struct flow_offload
> *flow,
> flow_tuple->tun.inner = flow->inner_tuple;
> }
>
> + if (route->tuple[dir].out.num_tunnels) {
> + flow_tuple->tunnel_num++;
> +
> + switch (route->tuple[dir].out.tun.l3proto) {
> + case NFPROTO_IPV4:
> + flow_tuple->tunnel.src_v4.s_addr =
> route->tuple[dir].out.tun.ip.saddr;
> + flow_tuple->tunnel.dst_v4.s_addr =
> route->tuple[dir].out.tun.ip.daddr;
> + break;
> + case NFPROTO_IPV6:
> + break;
> + }
> +
> + flow_tuple->tunnel.l3proto = route->tuple[dir].out.tun.l3proto;
> + flow_tuple->tunnel.l4proto = route->tuple[dir].out.tun.l4proto;
> + flow_tuple->tunnel.src_port = 0;
> + flow_tuple->tunnel.dst_port = 0;
> + }
> +
> return 0;
> }
>
> diff --git a/net/netfilter/nf_flow_table_ip.c
> b/net/netfilter/nf_flow_table_ip.c
> index c1156d4ce865..1b96309210b8 100644
> --- a/net/netfilter/nf_flow_table_ip.c
> +++ b/net/netfilter/nf_flow_table_ip.c
> @@ -349,6 +349,58 @@ static unsigned int nf_flow_queue_xmit(struct net *net,
> struct sk_buff *skb,
> return NF_STOLEN;
> }
>
> +/* extract from ip_tunnel_xmit(). */
> +static unsigned int nf_flow_tunnel_add(struct net *net, struct sk_buff *skb,
> + struct flow_offload *flow, int dir,
> + const struct rtable *rt,
> + struct iphdr *inner_iph)
> +{
> + u32 headroom = sizeof(struct iphdr);
> + struct iphdr *iph;
> + u8 tos, ttl;
> + __be16 df;
> +
> + if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP4))
> + return -1;
> +
> + skb_set_inner_ipproto(skb, IPPROTO_IPIP);
> +
> + headroom += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len;
> +
> + if (skb_cow_head(skb, headroom))
> + return -1;
> +
> + skb_scrub_packet(skb, true);
> + skb_clear_hash_if_not_l4(skb);
> + memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
> +
> + /* Push down and install the IP header. */
> + skb_push(skb, sizeof(struct iphdr));
> + skb_reset_network_header(skb);
> +
> + df = flow->tuple[dir]->tunnel.df;
> + tos = ip_tunnel_ecn_encap(flow->tuple[dir]->tunnel.tos, inner_iph, skb);
> + ttl = flow->tuple[dir]->tunnel.ttl;
> + if (ttl == 0)
> + ttl = inner_iph->ttl;
> +
> + iph = ip_hdr(skb);
> +
> + iph->version = 4;
> + iph->ihl = sizeof(struct iphdr) >> 2;
> + iph->frag_off = ip_mtu_locked(&rt->dst) ? 0 : df;
> + iph->protocol = flow->tuple[dir]->tunnel.l4proto;
> + iph->tos = flow->tuple[dir]->tunnel.tos;
> + iph->daddr = flow->tuple[dir]->tunnel.dst_v4.s_addr;
> + iph->saddr = flow->tuple[dir]->tunnel.src_v4.s_addr;
> + iph->ttl = ttl;
> + iph->tot_len = htons(skb->len);
> + __ip_select_ident(net, iph, skb_shinfo(skb)->gso_segs ?: 1);
> + ip_send_check(iph);
> +
> + return 0;
> +}
> +
> unsigned int
> nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
> const struct nf_hook_state *state)
> @@ -430,9 +482,19 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
> switch (flow->tuple[dir]->xmit_type) {
> case FLOW_OFFLOAD_XMIT_NEIGH:
> rt = (struct rtable *)flow->tuple[dir]->dst_cache;
> + if (flow->tuple[dir]->tunnel_num) {
> + ret = nf_flow_tunnel_add(state->net, skb, flow, dir,
> rt, iph);
> + if (ret < 0) {
> + ret = NF_DROP;
> + flow_offload_teardown(flow);
> + break;
> + }
> + nexthop = rt_nexthop(rt,
> flow->tuple[dir]->tunnel.dst_v4.s_addr);
> + } else {
> + nexthop = rt_nexthop(rt,
> flow->tuple[!dir]->src_v4.s_addr);
> + }
> outdev = rt->dst.dev;
> skb->dev = outdev;
> - nexthop = rt_nexthop(rt, flow->tuple[!dir]->src_v4.s_addr);
> skb_dst_set_noref(skb, &rt->dst);
> neigh_xmit(NEIGH_ARP_TABLE, outdev, &nexthop, skb);
> ret = NF_STOLEN;
> diff --git a/net/netfilter/nft_flow_offload.c
> b/net/netfilter/nft_flow_offload.c
> index ea403b95326c..1d672310ac6a 100644
> --- a/net/netfilter/nft_flow_offload.c
> +++ b/net/netfilter/nft_flow_offload.c
> @@ -159,7 +159,13 @@ static void nft_dev_path_info(const struct
> net_device_path_stack *stack,
> route->tuple[!dir].in.tun.ip.saddr = path->tun.ip.daddr;
> route->tuple[!dir].in.tun.ip.daddr = path->tun.ip.saddr;
> route->tuple[!dir].in.tun.l4proto = path->tun.l4proto;
> - dst_release(path->tun.dst);
> +
> + route->tuple[dir].out.num_tunnels++;
> + route->tuple[dir].out.tun.l3proto = path->tun.l3proto;
> + route->tuple[dir].out.tun.ip.saddr = path->tun.ip.saddr;
> + route->tuple[dir].out.tun.ip.daddr = path->tun.ip.daddr;
> + route->tuple[dir].out.tun.l4proto = path->tun.l4proto;
> + route->tuple[dir].dst = path->tun.dst;
> break;
> default:
> info->indev = NULL;
signature.asc
Description: PGP signature
