From nobody Sun Dec 14 21:31:43 2025 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 B9685207E07; Wed, 5 Mar 2025 10:30:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741170610; cv=none; b=TWmoHlJg+hdKeEKbNjExYzZ7wyawVIJkYqLBv8YOZuOTrQirnPUGKjXjAqc6cuG1BhSBhzcS4XXgdcbxWt0xgMB85LHqWDwRtQBx16oRZyb0LRPnYatqyh1Fkh0cs7FrMnkAzlr596Rrovu2YWfxGbV3kyR9FazqGzgXsmp+nu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741170610; c=relaxed/simple; bh=wMUZpUs1MP0v4aGWSuV5DzAXHNdRlbpPAoNl+5GV7TA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VKbyAKxsQrkhFuWVb8sYLQiwf/As66nqXD53HTwC3wRk5OIAShHs6MhoeNzLTEvY4RjIEnrpQgG4EHbEbum06hoYE3JZW40WGZN7Ah7ep17LsVfTJZdhbUpOeJ0St5yrK83I8+JW54xT8UBysW6HEEwZKNIy4lvhwTL6JwKtpDc= 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=YHNx/iit; arc=none smtp.client-ip=209.85.208.46 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="YHNx/iit" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e0373c7f55so10236497a12.0; Wed, 05 Mar 2025 02:30:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741170606; x=1741775406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VGr0DGFtdF9vUQZNuQxbjKzErqMA9pCa8F2vVWAZr6U=; b=YHNx/iit5N+ABn69tPwh5Mb4w7Z7j3sF9l3PUxToKwTzXTwr3OrrWm+N1Q8fbrU9KZ tMLS9qJWCFCliCWyCvBjIHQZDZaIFGllFzWvF1ELWPXzrnlK1zlHzgIidYbkVu8CZ8oX p/Bh8gZZFIsea4BATPonEJu4VJi9J2SKC+ki/EN+npD1YKD2nEPxhYBAEfqZ8JeyWfIZ tQybpdKKWORzZ/3q/5nf9ahnvAs0pxImJBae8xe5jcRHAk2KRUmSOvUo2qGXADO49cmH rWKpcoS7Nr/3k/e6c1bA4MvQzpamWx1SWjXgUrBErs5ocXogGsH+zCejT4pQMAhM37yU YAqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741170606; x=1741775406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VGr0DGFtdF9vUQZNuQxbjKzErqMA9pCa8F2vVWAZr6U=; b=HKX34gEVMouvcou/fqmMR82pHyDOkKXnAV/8ubB8ZaFPrfCiJ5hJL8z1rqSkLYe8Zc K4NTb8X/K/oMBvbLdc8/Yfb1NVBOangRntIENu7zj19z4SK9Qf5ASK3EABs/zDel+Px0 uJ3/3zVQzEbZTBeQk7OXri59Y5QIwTtLnZ3vSuJi0NcrpE5+sfJQv613pUtM1wMjsPlJ i7sVBqU9RucuuKs2VX/2ggw53HTi2kqiH4ezmcMVOQqAMzZRjoMzCVpg0r2P6yZK6r9Y YJw2pb7yommm445p6A6j1Ky6SC+QZ6btL2mTfUEtAiLwJuFzLmh1HagsY3CbX5NR4+VX e1/g== X-Forwarded-Encrypted: i=1; AJvYcCWHa0a5bNOqmTdqvi/Ymj953cCs7dYdSyyESzx7mbKb0tUduMo37paiMJUU3bcVJTgyyMVhlda3D0bu4kF8hngG@vger.kernel.org, AJvYcCWO2Rlh/VO9v9f/cDN7xgl4Iyu7lkksxhFVArO314HuqEiaQo5AF27Bunjt4CaJPTVWmWsHycNaon6HLU6j@vger.kernel.org, AJvYcCXPUSct3JAOKLRMdBKszHrJvZiboid4IYLJ/jtehiWdoaduUXyrnsXo75y6aXk3cSCq4NlUns5acWwOfFEp1yo=@vger.kernel.org X-Gm-Message-State: AOJu0YwsVBlbb6KoZDjMpIGm7Fj9dxfz9/ORdaQqH2ntPR2CcVDhCglq 2ouPXEgyigFq4KfjSrmAcxDleaRCFvIJDer7PmNiRUdHdEEQzQxa X-Gm-Gg: ASbGncucPTrvllLxU81bTEW5bx0g+Q1+KZlBOUDl2XzNwE0DhNy5aSXOt7WJGcCYQwu hnGl49KYRJ0sBVCJEfvpVbXr4q9vzpTM/JFM7bqXZkODb6ZMk30pf0o25F+F0dxK2QhhHBXzuRM ns4+F+5LfU7a+/VI7JNjfecMCBCBplS3gUioRYKFcyDzDpri6FPooIQJnQnuMpd5boSoDle3rBo x8juKDsNOgwVsVZ0rYlpE5/c6ITm2RRsCWjy5yFagg5Eu99v4/FRDWcINum2tKAEzAB9Fj8MQ5n zClc13mkxiQluszWSRImHZBCuZVVZpPWjCFyrs0B4Ds5eDLFO/epd3OGRo0vR4MD3CZwYimoFBI KuJwqzMA8iciD0awID8Ch/EyULY7g6FlJiBYJMTSJ+UHr7fpcULO1vZqzsyn1pQ== X-Google-Smtp-Source: AGHT+IHy767DUvvq2GdNzFTZgEtw2mmlhPb8tvwjOW0NV0rTz/8fH6TDIbFvmbmwfZNkQ6dAvscC7w== X-Received: by 2002:a17:907:7e8b:b0:ac1:ea5c:8711 with SMTP id a640c23a62f3a-ac20d97e6cfmr241289466b.1.1741170605663; Wed, 05 Mar 2025 02:30:05 -0800 (PST) Received: from corebook.localdomain (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 a640c23a62f3a-ac1f7161a4esm247154266b.161.2025.03.05.02.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 02:30:04 -0800 (PST) From: Eric Woudstra To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , Kuniyuki Iwashima , Sebastian Andrzej Siewior , Ahmed Zaki , Alexander Lobakin , Vladimir Oltean , "Frank Wunderlich" , Daniel Golle Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hardening@vger.kernel.org, Kees Cook , "Gustavo A. R. Silva" , Eric Woudstra Subject: [PATCH v9 nf 02/15] netfilter: nf_flow_table_offload: Add nf_flow_encap_push() for xmit direct Date: Wed, 5 Mar 2025 11:29:36 +0100 Message-ID: <20250305102949.16370-3-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305102949.16370-1-ericwouds@gmail.com> References: <20250305102949.16370-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Loosely based on wenxu's patches: "nf_flow_table_offload: offload the vlan/PPPoE encap in the flowtable". Fixed double vlan and pppoe packets, almost entirely rewriting the patch. After this patch, it is possible to transmit packets in the fastpath with outgoing encaps, without using vlan- and/or pppoe-devices. This makes it possible to use more different kinds of network setups. For example, when bridge tagging is used to egress vlan tagged packets using the forward fastpath. Another example is passing 802.1q tagged packets through a bridge using the bridge fastpath. This also makes the software fastpath process more similar to the hardware offloaded fastpath process, where encaps are also pushed. After applying this patch, always info->outdev =3D info->hw_outdev, so the netfilter code can be further cleaned up by removing: * hw_outdev from struct nft_forward_info * out.hw_ifindex from struct nf_flow_route * out.hw_ifidx from struct flow_offload_tuple Reviewed-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/netfilter/nf_flow_table_ip.c | 96 +++++++++++++++++++++++++++++++- net/netfilter/nft_flow_offload.c | 6 +- 2 files changed, 96 insertions(+), 6 deletions(-) diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table= _ip.c index 8cd4cf7ae211..d0c3c459c4d2 100644 --- a/net/netfilter/nf_flow_table_ip.c +++ b/net/netfilter/nf_flow_table_ip.c @@ -306,6 +306,92 @@ static bool nf_flow_skb_encap_protocol(struct sk_buff = *skb, __be16 proto, return false; } =20 +static int nf_flow_vlan_inner_push(struct sk_buff *skb, __be16 proto, u16 = id) +{ + struct vlan_hdr *vhdr; + + if (skb_cow_head(skb, VLAN_HLEN)) + return -1; + + __skb_push(skb, VLAN_HLEN); + skb_reset_network_header(skb); + + vhdr =3D (struct vlan_hdr *)(skb->data); + vhdr->h_vlan_TCI =3D htons(id); + vhdr->h_vlan_encapsulated_proto =3D skb->protocol; + skb->protocol =3D proto; + + return 0; +} + +static int nf_flow_ppoe_push(struct sk_buff *skb, u16 id) +{ + struct ppp_hdr { + struct pppoe_hdr hdr; + __be16 proto; + } *ph; + int data_len =3D skb->len + 2; + __be16 proto; + + if (skb_cow_head(skb, PPPOE_SES_HLEN)) + return -1; + + if (skb->protocol =3D=3D htons(ETH_P_IP)) + proto =3D htons(PPP_IP); + else if (skb->protocol =3D=3D htons(ETH_P_IPV6)) + proto =3D htons(PPP_IPV6); + else + return -1; + + __skb_push(skb, PPPOE_SES_HLEN); + skb_reset_network_header(skb); + + ph =3D (struct ppp_hdr *)(skb->data); + ph->hdr.ver =3D 1; + ph->hdr.type =3D 1; + ph->hdr.code =3D 0; + ph->hdr.sid =3D htons(id); + ph->hdr.length =3D htons(data_len); + ph->proto =3D proto; + skb->protocol =3D htons(ETH_P_PPP_SES); + + return 0; +} + +static int nf_flow_encap_push(struct sk_buff *skb, + struct flow_offload_tuple_rhash *tuplehash, + unsigned short *type) +{ + int i =3D 0, ret =3D 0; + + if (!tuplehash->tuple.encap_num) + return 0; + + if (tuplehash->tuple.encap[i].proto =3D=3D htons(ETH_P_8021Q) || + tuplehash->tuple.encap[i].proto =3D=3D htons(ETH_P_8021AD)) { + __vlan_hwaccel_put_tag(skb, tuplehash->tuple.encap[i].proto, + tuplehash->tuple.encap[i].id); + i++; + if (i >=3D tuplehash->tuple.encap_num) + return 0; + } + + switch (tuplehash->tuple.encap[i].proto) { + case htons(ETH_P_8021Q): + *type =3D ETH_P_8021Q; + ret =3D nf_flow_vlan_inner_push(skb, + tuplehash->tuple.encap[i].proto, + tuplehash->tuple.encap[i].id); + break; + case htons(ETH_P_PPP_SES): + *type =3D ETH_P_PPP_SES; + ret =3D nf_flow_ppoe_push(skb, + tuplehash->tuple.encap[i].id); + break; + } + return ret; +} + static void nf_flow_encap_pop(struct sk_buff *skb, struct flow_offload_tuple_rhash *tuplehash) { @@ -335,6 +421,7 @@ static void nf_flow_encap_pop(struct sk_buff *skb, =20 static unsigned int nf_flow_queue_xmit(struct net *net, struct sk_buff *sk= b, const struct flow_offload_tuple_rhash *tuplehash, + struct flow_offload_tuple_rhash *other_tuplehash, unsigned short type) { struct net_device *outdev; @@ -343,6 +430,9 @@ static unsigned int nf_flow_queue_xmit(struct net *net,= struct sk_buff *skb, if (!outdev) return NF_DROP; =20 + if (nf_flow_encap_push(skb, other_tuplehash, &type) < 0) + return NF_DROP; + skb->dev =3D outdev; dev_hard_header(skb, skb->dev, type, tuplehash->tuple.out.h_dest, tuplehash->tuple.out.h_source, skb->len); @@ -462,7 +552,8 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, ret =3D NF_STOLEN; break; case FLOW_OFFLOAD_XMIT_DIRECT: - ret =3D nf_flow_queue_xmit(state->net, skb, tuplehash, ETH_P_IP); + ret =3D nf_flow_queue_xmit(state->net, skb, tuplehash, + &flow->tuplehash[!dir], ETH_P_IP); if (ret =3D=3D NF_DROP) flow_offload_teardown(flow); break; @@ -757,7 +848,8 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *s= kb, ret =3D NF_STOLEN; break; case FLOW_OFFLOAD_XMIT_DIRECT: - ret =3D nf_flow_queue_xmit(state->net, skb, tuplehash, ETH_P_IPV6); + ret =3D nf_flow_queue_xmit(state->net, skb, tuplehash, + &flow->tuplehash[!dir], ETH_P_IPV6); if (ret =3D=3D NF_DROP) flow_offload_teardown(flow); break; diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offl= oad.c index 46a6d280b09c..b4baee519e18 100644 --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c @@ -124,13 +124,12 @@ static void nft_dev_path_info(const struct net_device= _path_stack *stack, info->indev =3D NULL; break; } - if (!info->outdev) - info->outdev =3D path->dev; info->encap[info->num_encaps].id =3D path->encap.id; info->encap[info->num_encaps].proto =3D path->encap.proto; info->num_encaps++; if (path->type =3D=3D DEV_PATH_PPPOE) memcpy(info->h_dest, path->encap.h_dest, ETH_ALEN); + info->xmit_type =3D FLOW_OFFLOAD_XMIT_DIRECT; break; case DEV_PATH_BRIDGE: if (is_zero_ether_addr(info->h_source)) @@ -158,8 +157,7 @@ static void nft_dev_path_info(const struct net_device_p= ath_stack *stack, break; } } - if (!info->outdev) - info->outdev =3D info->indev; + info->outdev =3D info->indev; =20 info->hw_outdev =3D info->indev; =20 --=20 2.47.1