From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB1CC3C5DA1 for ; Wed, 8 Jul 2026 19:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783538058; cv=none; b=XF0M2/TuY34dK9dfrOOOL+8BK8bjrMGrkCbzxbes12nwjuAAbhd3TrZfq0sCwlINHyaFSpSmiF9lm6zMn8i7gEZJK4G4GbUetHwDDkBnOumS6/mSrTXQVtj85sdNJP9FSDKSqXmYvnKKJudnkoLmPQefYsXOQcNjJZyW4573m9g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783538058; c=relaxed/simple; bh=ZlefMp0qwwBvdrQmCZdmTlurpVHr17eYlPh5Ql4Sbys=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kqyjFPO3IO9ow8z6XeLfL0OPbCnhBT+7VJYJNFjGC83s5OE5a0Dduo+cYaEuGV/DE1uKo/RwMP2jSSwZVGNtnYr82vKm6U/xSVU2JnQoabPynQ8fLTV/IsZmuNKrvOiNLjzSHCbGQQTO8qfsSfi2UAon53RbgcCzHTlSNtZxzF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XprCJY1/; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XprCJY1/" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-698aa8d4dafso1066999a12.0 for ; Wed, 08 Jul 2026 12:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783538054; x=1784142854; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to:content-type; bh=BKdeyh5qDiS0BQge1087oDJUBrqtE39YPXs8iI8Zre0=; b=XprCJY1/6JRjFlTMaAKscLYOMXrh3fRGQnciWhToff+AQaeqea4fdarITbf6NG0l1T EDe5ma4POsAMHRcXm50CHl/sY30d4Gfofc4bypGQQFka3qNrTVrbVkK3hRE/qqNprlDp gV/DCDna1VNr699vXgZZmRquELrsGqIvJMVauxieKMF1T0LajSuGTbCU/Z6OOmXFWyw5 0ctUR+WjkU5PfncR81Ljz3cLZwObvjkMjAhgfjyCYkglKI8inepVw0JeaXMoa4xH5p7y 3l+eMmyEAw6dxN8TBG+elmkzjFg04ss0LCfZBTXbR63nND/8v1EzFYuJWYAegZDP6s/j k2lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783538054; x=1784142854; h=content-transfer-encoding:content-type:in-reply-to:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BKdeyh5qDiS0BQge1087oDJUBrqtE39YPXs8iI8Zre0=; b=i8KqgSlJhYMUIrvoRwl6PCXQ00x7MdVbOYHkv8yP8JijcMzZo/id8Dqtd9Un5WbDPJ faf2l8jrf3B6fmzg6PoOEK2EULvZPMZeQ8ZdjmfjgfWftss5pCFo1pJXL9WoGn94frpi 402Zq2g1sHd6zTvPGW/OFybucvM0mHfddmaUP8AI+f6ZrFkjwJmnndFW3xXs2v2vQ7Ld lHAMwsuyV5UfGvOuh5zWfPoaElGIHLBO7dhGt9mp9unneImBKI2CKeSDYQdCGwexDdMz FtJumYGw1ntpvXaNSHrNqR655kcXbI9FFaVDLePy7qMVga003xvlOj4yD2uG9gxP46PX jX7A== X-Forwarded-Encrypted: i=1; AHgh+Rr6m5w3duyw8MIzvQfb2MmTnSimqh/rNMfzXPqJuQJ3YhYSYIi5vMESsJGdpNzfGmlVvtKsM6A=@vger.kernel.org X-Gm-Message-State: AOJu0YxLh/EbZXoKLJhYZUOgXG25JzOMgCsX+phddSHo95GgyxnxZI18 XA7VjUAGb1WgeSItPmZM7CI4dsAM3MiXOCe1+pFTi9pFlkP+QkRHzQGo X-Gm-Gg: AfdE7ckpalqek7I7Gsp0qroHdrYk5owa1CrQuXrO9LZm11QG8r/GL/ikNvx0MeeoT6P mgqkWx/EgRRmv/77fsbgtO/3cTash641Rc4a1VcT27hzAmdnApftHFUFJbpQuTzczU1Jm3aMu5R OE/YHP2J46h/VoeFcB5w7tO2xj03rQDmOO9gRlr0zF3UibEA8xJ4kIV/Y2MN8BDWsbHOdM2+BBN Ad87wb+XwUDAkUx8gLpcR7epL3yMUcpo8hqb9X/cHdzFhjxC5axIfXUpyI+elTTJpE2IYvHibY3 jriCg7Mmii5s3ecEIGJCWWtQZbHURLZrEDgES57dH2ZFZOH2Mg5WgxFmNw8Ghst9w7k54svZl22 t7SJbFt2MYmXYLsHg66Wd9RxD4d0garOC522EcIPuzvIucg4zvAsNs9/xcEtu11I+/nV/50Nc02 nEvigz0fr7knnGibwkOANKaw2EKYk3iANEI+yBPuEHkaB59bedr1OQU7SRqjQ1HL7TEQG3PjUNZ XuSozFl+lvbh509P5+iruo4+XCnWFo12KgzFk4LfrdjSQj+tYb1/MTsY3EnDBk8l97VrKhHLpfo k2WM/wIF65eyxCowbyUiNvA= X-Received: by 2002:a05:6402:3207:b0:698:76b8:e552 with SMTP id 4fb4d7f45d1cf-69ab446345cmr1638678a12.2.1783538054086; Wed, 08 Jul 2026 12:14:14 -0700 (PDT) Received: from ?IPV6:2001:1c00:20d:1300:1b1c:4449:176a:89ea? (2001-1c00-020d-1300-1b1c-4449-176a-89ea.cable.dynamic.v6.ziggo.nl. [2001:1c00:20d:1300:1b1c:4449:176a:89ea]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69aa6dba523sm2645976a12.0.2026.07.08.12.14.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Jul 2026 12:14:13 -0700 (PDT) Message-ID: Date: Wed, 8 Jul 2026 21:14:11 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v12 nf-next 7/7] netfilter: nft_flow_offload: Add bridgeflow to nft_flow_offload_eval() To: Pablo Neira Ayuso Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Florian Westphal , Phil Sutter , Nikolay Aleksandrov , Ido Schimmel , Kuniyuki Iwashima , Stanislav Fomichev , Samiullah Khawaja , Hangbin Liu , Krishna Kumar , Martin Karsten , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, bridge@lists.linux.dev References: <20260707091045.967678-1-ericwouds@gmail.com> <20260707091045.967678-8-ericwouds@gmail.com> From: Eric Woudstra Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 7/8/26 11:52 AM, Pablo Neira Ayuso wrote: > Hi, > > On Tue, Jul 07, 2026 at 11:10:45AM +0200, Eric Woudstra wrote: >> Edit nft_flow_offload_eval() to make it possible to handle a flowtable of >> the nft bridge family. >> >> Use nft_flow_offload_bridge_init() to fill the flow tuples. It uses >> nft_dev_fill_bridge_path() in each direction. > > I decided to add a bit more boiler plate in my proposal to detach the > inet and bridge flowtable dataplanes. > > More comments below. > >> Signed-off-by: Eric Woudstra >> --- >> include/net/netfilter/nf_flow_table.h | 5 + >> net/netfilter/nf_flow_table_path.c | 126 ++++++++++++++++++++++++++ >> net/netfilter/nft_flow_offload.c | 20 +++- >> 3 files changed, 146 insertions(+), 5 deletions(-) >> >> diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h >> index 5c6e3b65ae85b..a109eda5250c7 100644 >> --- a/include/net/netfilter/nf_flow_table.h >> +++ b/include/net/netfilter/nf_flow_table.h >> @@ -305,6 +305,11 @@ nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table, >> void flow_offload_route_init(struct flow_offload *flow, >> struct nf_flow_route *route); >> >> +int flow_offload_bridge_init(struct flow_offload *flow, >> + const struct nft_pktinfo *pkt, >> + enum ip_conntrack_dir dir, >> + struct nft_flowtable *ft); >> + >> int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow); >> void flow_offload_refresh(struct nf_flowtable *flow_table, >> struct flow_offload *flow, bool force); >> diff --git a/net/netfilter/nf_flow_table_path.c b/net/netfilter/nf_flow_table_path.c >> index 2b6ebb594a9ee..cdd6a822cb811 100644 >> --- a/net/netfilter/nf_flow_table_path.c >> +++ b/net/netfilter/nf_flow_table_path.c >> @@ -1,6 +1,7 @@ >> // SPDX-License-Identifier: GPL-2.0-only >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -365,3 +366,128 @@ int nft_flow_route(const struct nft_pktinfo *pkt, const struct nf_conn *ct, >> return -ENOENT; >> } >> EXPORT_SYMBOL_GPL(nft_flow_route); >> + >> +static int nft_dev_fill_bridge_path(struct flow_offload *flow, >> + struct nft_flowtable *ft, >> + enum ip_conntrack_dir dir, >> + const struct net_device *src_dev, >> + const struct net_device *dst_dev, >> + unsigned char *src_ha, >> + unsigned char *dst_ha) >> +{ >> + struct flow_offload_tuple_rhash *th = flow->tuplehash; >> + struct net_device_path_ctx ctx = {}; >> + struct net_device_path_stack stack; >> + struct nft_forward_info info = {}; >> + int i, j = 0; >> + >> + for (i = th[dir].tuple.encap_num - 1; i >= 0 ; i--) { >> + if (info.num_encaps >= NF_FLOW_TABLE_ENCAP_MAX) >> + return -1; >> + >> + if (th[dir].tuple.in_vlan_ingress & BIT(i)) >> + continue; >> + >> + info.encap[info.num_encaps].id = th[dir].tuple.encap[i].id; >> + info.encap[info.num_encaps].proto = th[dir].tuple.encap[i].proto; >> + info.num_encaps++; >> + >> + if (th[dir].tuple.encap[i].proto == htons(ETH_P_PPP_SES)) >> + continue; >> + >> + if (ctx.num_vlans >= NET_DEVICE_PATH_VLAN_MAX) >> + return -1; >> + ctx.vlan[ctx.num_vlans].id = th[dir].tuple.encap[i].id; >> + ctx.vlan[ctx.num_vlans].proto = th[dir].tuple.encap[i].proto; >> + ctx.num_vlans++; >> + } > > I am not sure why this is needed, in my approach I simplified this, > but maybe I broke bridge vlan filtering. I am not sure what test > coverage you made. > This part is used for handling packets that are incoming with encaps. Previously I got the encaps from the skb and stored them in th[dir].tuple.encap. I understand you want to do this differently. It is also why I'm starting in the opposite direction as in you patch-set. The code above then reads th[dir].tuple.encap and starts filling info and ctx with encaps. It also handles encaps marked with a in_vlan_ingress bit. Once info and ctx are filled with the encaps from the skb, it can continue with dev_fill_bridge_path(). My selftest script bridge_fastpath.sh tests this code thoroughly in many different scenarios. Incoming vlan, q-in-q, ad, pppoe, pppoe-in-q. Also on a dsa-port with the in_vlan_ingress bit set. >> + ctx.dev = src_dev; >> + ether_addr_copy(ctx.daddr, dst_ha); >> + >> + if (dev_fill_bridge_path(&ctx, &stack) < 0) >> + return -1; >> + >> + nft_dev_path_info(&stack, &info, dst_ha, &ft->data); >> + >> + if (!info.indev || info.indev != dst_dev) >> + return -1; >> + >> + th[!dir].tuple.iifidx = info.indev->ifindex; >> + for (i = info.num_encaps - 1; i >= 0; i--) { >> + th[!dir].tuple.encap[j].id = info.encap[i].id; >> + th[!dir].tuple.encap[j].proto = info.encap[i].proto; >> + if (info.ingress_vlans & BIT(i)) >> + th[!dir].tuple.in_vlan_ingress |= BIT(j); >> + j++; >> + } >> + th[!dir].tuple.encap_num = info.num_encaps; >> + >> + th[dir].tuple.mtu = dst_dev->mtu; >> + ether_addr_copy(th[dir].tuple.out.h_source, src_ha); >> + ether_addr_copy(th[dir].tuple.out.h_dest, dst_ha); >> + th[dir].tuple.out.ifidx = info.outdev->ifindex; >> + th[dir].tuple.xmit_type = FLOW_OFFLOAD_XMIT_DIRECT; >> + >> + return 0; >> +} >> + >> +int flow_offload_bridge_init(struct flow_offload *flow, >> + const struct nft_pktinfo *pkt, >> + enum ip_conntrack_dir dir, >> + struct nft_flowtable *ft) >> +{ >> + const struct net_device *in_dev, *out_dev; >> + struct ethhdr *eth = eth_hdr(pkt->skb); >> + struct flow_offload_tuple *tuple; >> + int err, i = 0; >> + >> + in_dev = nft_in(pkt); >> + if (!in_dev || !nft_flowtable_find_dev(in_dev, ft)) >> + return -1; >> + >> + out_dev = nft_out(pkt); >> + if (!out_dev || !nft_flowtable_find_dev(out_dev, ft)) >> + return -1; >> + >> + tuple = &flow->tuplehash[!dir].tuple; >> + >> + if (skb_vlan_tag_present(pkt->skb)) { >> + tuple->encap[i].id = skb_vlan_tag_get(pkt->skb); >> + tuple->encap[i].proto = pkt->skb->vlan_proto; >> + i++; >> + } >> + >> + switch (eth_hdr(pkt->skb)->h_proto) { >> + case htons(ETH_P_8021Q): { >> + struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb_mac_header(pkt->skb) >> + + sizeof(struct ethhdr)); >> + tuple->encap[i].id = ntohs(vhdr->h_vlan_TCI); >> + tuple->encap[i].proto = htons(ETH_P_8021Q); >> + i++; >> + break; >> + } >> + case htons(ETH_P_PPP_SES): { >> + struct pppoe_hdr *phdr = (struct pppoe_hdr *)(skb_mac_header(pkt->skb) >> + + sizeof(struct ethhdr)); >> + >> + tuple->encap[i].id = ntohs(phdr->sid); >> + tuple->encap[i].proto = htons(ETH_P_PPP_SES); >> + i++; >> + break; >> + } >> + } >> + tuple->encap_num = i; > > I am not sure these lines above can work. The VLAN tag might be > already gone by when the packet is observed from the bridge/forward > hook. I think populating the encap fields of the tuple by using the > observed packet is not good to go. > I have not experienced this, but I understand that this is no guarantee that it does not happen at all. >> + err = nft_dev_fill_bridge_path(flow, ft, !dir, out_dev, in_dev, >> + eth->h_dest, eth->h_source); >> + if (err < 0) >> + return err; >> + >> + err = nft_dev_fill_bridge_path(flow, ft, dir, in_dev, out_dev, >> + eth->h_source, eth->h_dest); >> + if (err < 0) >> + return err; >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(flow_offload_bridge_init); >> diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c >> index 0be62841155b6..d0d63ef7cecd5 100644 >> --- a/net/netfilter/nft_flow_offload.c >> +++ b/net/netfilter/nft_flow_offload.c >> @@ -53,6 +53,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, >> { >> struct nft_flow_offload *priv = nft_expr_priv(expr); >> struct nf_flowtable *flowtable = &priv->flowtable->data; >> + bool routing = flowtable->type->family != NFPROTO_BRIDGE; >> struct tcphdr _tcph, *tcph = NULL; >> struct nf_flow_route route = {}; >> enum ip_conntrack_info ctinfo; >> @@ -109,14 +110,21 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, >> goto out; >> >> dir = CTINFO2DIR(ctinfo); >> - if (nft_flow_route(pkt, ct, &route, dir, priv->flowtable) < 0) >> - goto err_flow_route; >> + if (routing) { >> + if (nft_flow_route(pkt, ct, &route, dir, priv->flowtable) < 0) >> + goto err_flow_route; >> + } > > As said, I am leaning towards adding a bit more boilerplate code to > separate the bridge and inet flowtable datapaths. > >> flow = flow_offload_alloc(ct); >> if (!flow) >> goto err_flow_alloc; >> >> - flow_offload_route_init(flow, &route); >> + if (routing) >> + flow_offload_route_init(flow, &route); >> + else >> + if (flow_offload_bridge_init(flow, pkt, dir, priv->flowtable) < 0) >> + goto err_flow_add; >> + >> if (tcph) >> flow_offload_ct_tcp(ct); >> >> @@ -164,8 +172,10 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, >> err_flow_add: >> flow_offload_free(flow); >> err_flow_alloc: >> - dst_release(route.tuple[dir].dst); >> - dst_release(route.tuple[!dir].dst); >> + if (routing) { >> + dst_release(route.tuple[dir].dst); >> + dst_release(route.tuple[!dir].dst); >> + } >> err_flow_route: >> clear_bit(IPS_OFFLOAD_BIT, &ct->status); >> out: >> -- >> 2.53.0 >>