From nobody Wed Nov 27 08:39:27 2024 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 1A28A1C1F08; Tue, 19 Nov 2024 10:19:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732011564; cv=none; b=OicW28SjpxsiM+0GgwS+MpU93Pk5nQ2ukYc4Os6sDGDkh1gxZw876zazsTNc2tYaFXYOy5whTOq2WBGZPN2snxy0KXOxegsGZk4cGTSGh8IkAScQS5BkKkFSWpyJcTePt7p2cD8uwTzrSeo9I4M4UsdkNhAjyAvKfOBsna4zTwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732011564; c=relaxed/simple; bh=9z7HmZ9CNEJAudwjNyb1ZSYmkdB/Xiw+2DDVHpucNKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oJaSfNM2F5w9hOkjB+BJplq9SDd+ITBFBvz28lM63fQaLtqCiGTFEF3JQjiE8nTe7MadGJ95/+VMB6fUI1JDS7nqwOuies4QaoZhJ7YsaY2R07noxgBhnEROYZJH49r5T+7XanrU75KlJkKj+jjXmV0TmL8bUXtsNg9htXkKuCk= 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=HwVPooDX; arc=none smtp.client-ip=209.85.208.175 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="HwVPooDX" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2fb4af0b6beso42479991fa.3; Tue, 19 Nov 2024 02:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732011560; x=1732616360; 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=s2v4wvRWn+02yrqYzk8I6pei4Ps2LL08kCWalGaFo8k=; b=HwVPooDXskUfmm5uS6mJAccEntCayZOrXLkGCzV6lxMD+nRCsjnoQhjmGpzmxAJ/Ri GqjhLBbg6DKj98UEw5SGewchZb6Tb0Y2lE1+u6W9GTBgezrYGGR7COPTiavSUzkbbiMN N4wTR3/7AnuhznumldXtjfhGTICnX4WKTpiwecAH/n/ALg+W7a4VNNyBNvbb3HNmaDG6 RLYSk0sPvQx8RRHZGjKU2V06X8QTfQxfUn0rFwcZaQuVdQVOiD6ljJ//sxhVWWNbD87n d01W50yxM8TuCIFRI5yx0Y5hLaK/RbULujxbNuPRHOkUlcKd0W4oQf+4c5+/iaTeRUcK R9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732011560; x=1732616360; 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=s2v4wvRWn+02yrqYzk8I6pei4Ps2LL08kCWalGaFo8k=; b=LX5agv7ZU7/Vtfe5WlOk/NM1ufvQdYw7QEOkliiTPTu0AiA6YU8vSzhcaKIO+PYOmQ w7JxbEmM9IVT3fOfwzy57UDuNKHszeGt4lhL8U+QTVs4glqyTEubJU+2ue2MMmARhAPN vt2G9GKmBwxWyTJuuQcokzDPiwSB+1ly46ILDwVU75Bxy0hKMjo7aFg1qoCtdPqnsWIS CLV5oKzAskk6B+EeigIiAttFISbuHc4SyvKVqkRe9grLm8Tp9SS2rrfn1taHUT4RJy7G Dt6RqUeu7HXgpnmdzQkk1Hv+5yi2TouvvEZgnKQLAdjNuQL4KejfMTE3kDE/ePKnScSE HsJQ== X-Forwarded-Encrypted: i=1; AJvYcCWUdwUw040Szr5nHjA241kRwhkLxyYxUcuxhp4+MwgDABbO1Q8r8lA+8cYPZtNqvlxvgfa3vQJKBBvMav2pRvSg@vger.kernel.org, AJvYcCX7eGqkEEgbbIwNzogi8ercfuyUUo24swvQkJrbEvXjUVQqglp5w7tPnB6smqwTPNuNmDwdlFUtNAsFA8s=@vger.kernel.org X-Gm-Message-State: AOJu0Yxkk2hNeQ3GPWY4gVvQz5+/E3gE78dH/LhOkok9rDxYSngN4tYg fkOoKdvL2GuS8IxbWIWSoKEKutO7Gogyi6pyoSkBeGhOvW7YTFcO X-Google-Smtp-Source: AGHT+IGcc52t0JYl62z5La9vrUnqdLe/7x1g/27aiQFVRTEFc3y9IAb/0I8BdS4CAvP5pPR+qlUj7A== X-Received: by 2002:a2e:a592:0:b0:2fb:4f8e:efd with SMTP id 38308e7fff4ca-2ff606db22emr127527371fa.32.1732011559809; Tue, 19 Nov 2024 02:19:19 -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-aa20e081574sm634875566b.179.2024.11.19.02.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 02:19:19 -0800 (PST) From: Eric Woudstra To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , David Ahern , Sebastian Andrzej Siewior , Lorenzo Bianconi , Joe Damato , 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, Eric Woudstra Subject: [PATCH RFC v2 net-next 01/14] netfilter: nf_flow_table_offload: Add nf_flow_encap_push() for xmit direct Date: Tue, 19 Nov 2024 11:18:53 +0100 Message-ID: <20241119101906.862680-2-ericwouds@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241119101906.862680-1-ericwouds@gmail.com> References: <20241119101906.862680-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 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 98edcaa37b38..290d8e10d85b 100644 --- a/net/netfilter/nf_flow_table_ip.c +++ b/net/netfilter/nf_flow_table_ip.c @@ -302,6 +302,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) { @@ -331,6 +417,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; @@ -339,6 +426,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); @@ -458,7 +548,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; @@ -753,7 +844,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 7b84d8d3469c..cdf1771906b8 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.45.2