From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net-next,v2 7/9] netfilter: flowtable: add direct xmit path
Date: Thu, 15 Oct 2020 18:30:36 +0200 [thread overview]
Message-ID: <20201015163038.26992-8-pablo@netfilter.org> (raw)
In-Reply-To: <20201015163038.26992-1-pablo@netfilter.org>
Add FLOW_OFFLOAD_XMIT_DIRECT to turn on the direct dev_queue_xmit() path
to transmit ethernet frames. Cache the source and destination hardware
address for flow to use dev_queue_xmit() to transfer packets.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
v2: no changes.
include/net/netfilter/nf_flow_table.h | 5 +++++
net/netfilter/nf_flow_table_core.c | 2 ++
net/netfilter/nf_flow_table_ip.c | 24 ++++++++++++++++++++++++
net/netfilter/nft_flow_offload.c | 16 +++++++++++-----
4 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index fe225e881cc7..1b57d1d1270d 100644
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -92,6 +92,7 @@ enum flow_offload_tuple_dir {
enum flow_offload_xmit_type {
FLOW_OFFLOAD_XMIT_NEIGH = 0,
FLOW_OFFLOAD_XMIT_XFRM,
+ FLOW_OFFLOAD_XMIT_DIRECT,
};
struct flow_offload_tuple {
@@ -119,6 +120,8 @@ struct flow_offload_tuple {
u16 mtu;
u32 oifidx;
+ u8 h_source[ETH_ALEN];
+ u8 h_dest[ETH_ALEN];
struct dst_entry *dst_cache;
};
@@ -167,6 +170,8 @@ struct nf_flow_route {
} in;
struct {
u32 ifindex;
+ u8 h_source[ETH_ALEN];
+ u8 h_dest[ETH_ALEN];
} out;
struct dst_entry *dst;
} tuple[FLOW_OFFLOAD_DIR_MAX];
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 99f01f08c550..725366339b85 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -94,6 +94,8 @@ static int flow_offload_fill_route(struct flow_offload *flow,
}
flow_tuple->iifidx = route->tuple[dir].in.ifindex;
+ memcpy(flow_tuple->h_dest, route->tuple[dir].out.h_dest, ETH_ALEN);
+ memcpy(flow_tuple->h_source, route->tuple[dir].out.h_source, ETH_ALEN);
flow_tuple->oifidx = route->tuple[dir].out.ifindex;
if (dst_xfrm(dst))
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 92f444db8d9f..1fa5c67cd914 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -247,6 +247,24 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,
return NF_STOLEN;
}
+static unsigned int nf_flow_queue_xmit(struct sk_buff *skb,
+ struct net_device *outdev,
+ const struct flow_offload_tuple *tuple)
+{
+ struct ethhdr *eth;
+
+ skb->dev = outdev;
+ skb_push(skb, skb->mac_len);
+ skb_reset_mac_header(skb);
+
+ eth = eth_hdr(skb);
+ memcpy(eth->h_source, tuple->h_source, ETH_ALEN);
+ memcpy(eth->h_dest, tuple->h_dest, ETH_ALEN);
+ dev_queue_xmit(skb);
+
+ return NF_STOLEN;
+}
+
unsigned int
nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state)
@@ -325,6 +343,9 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
IPCB(skb)->flags = IPSKB_FORWARDED;
ret = nf_flow_xmit_xfrm(skb, state, &rt->dst);
break;
+ case FLOW_OFFLOAD_XMIT_DIRECT:
+ ret = nf_flow_queue_xmit(skb, outdev, &tuplehash->tuple);
+ break;
default:
WARN_ON_ONCE(1);
ret = NF_DROP;
@@ -581,6 +602,9 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,
IP6CB(skb)->flags = IP6SKB_FORWARDED;
ret = nf_flow_xmit_xfrm(skb, state, &rt->dst);
break;
+ case FLOW_OFFLOAD_XMIT_DIRECT:
+ ret = nf_flow_queue_xmit(skb, outdev, &tuplehash->tuple);
+ break;
default:
WARN_ON_ONCE(1);
ret = NF_DROP;
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index 6a6633e2ceeb..d440e436cb16 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -21,12 +21,11 @@ struct nft_flow_offload {
static int nft_dev_fill_forward_path(const struct nf_flow_route *route,
const struct nf_conn *ct,
- enum ip_conntrack_dir dir,
+ enum ip_conntrack_dir dir, u8 *dst,
struct net_device_path_stack *stack)
{
const struct dst_entry *dst_cache = route->tuple[dir].dst;
const void *daddr = &ct->tuplehash[!dir].tuple.src.u3;
- unsigned char ha[ETH_ALEN];
struct net_device *dev;
struct neighbour *n;
struct rtable *rt;
@@ -41,18 +40,20 @@ static int nft_dev_fill_forward_path(const struct nf_flow_route *route,
read_lock_bh(&n->lock);
nud_state = n->nud_state;
- ether_addr_copy(ha, n->ha);
+ ether_addr_copy(dst, n->ha);
read_unlock_bh(&n->lock);
neigh_release(n);
if (!(nud_state & NUD_VALID))
return -1;
- return dev_fill_forward_path(dev, ha, stack);
+ return dev_fill_forward_path(dev, dst, stack);
}
struct nft_forward_info {
u32 iifindex;
+ u8 h_source[ETH_ALEN];
+ u8 h_dest[ETH_ALEN];
};
static int nft_dev_forward_path(struct nf_flow_route *route,
@@ -62,11 +63,12 @@ static int nft_dev_forward_path(struct nf_flow_route *route,
struct net_device_path_stack stack = {};
struct nft_forward_info info = {};
struct net_device_path *path;
+ unsigned char dst[ETH_ALEN];
int i, ret;
memset(&stack, 0, sizeof(stack));
- ret = nft_dev_fill_forward_path(route, ct, dir, &stack);
+ ret = nft_dev_fill_forward_path(route, ct, dir, dst, &stack);
if (ret < 0)
return -1;
@@ -74,6 +76,8 @@ static int nft_dev_forward_path(struct nf_flow_route *route,
path = &stack.path[i];
switch (path->type) {
case DEV_PATH_ETHERNET:
+ memcpy(info.h_dest, path->dev->dev_addr, ETH_ALEN);
+ memcpy(info.h_source, dst, ETH_ALEN);
info.iifindex = path->dev->ifindex;
break;
case DEV_PATH_VLAN:
@@ -84,6 +88,8 @@ static int nft_dev_forward_path(struct nf_flow_route *route,
}
route->tuple[!dir].in.ifindex = info.iifindex;
+ memcpy(route->tuple[dir].out.h_dest, info.h_source, ETH_ALEN);
+ memcpy(route->tuple[dir].out.h_source, info.h_dest, ETH_ALEN);
route->tuple[dir].out.ifindex = info.iifindex;
return 0;
--
2.20.1
next prev parent reply other threads:[~2020-10-15 16:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 16:30 [PATCH net-next,v2 0/9] netfilter: flowtable bridge and vlan enhancements Pablo Neira Ayuso
2020-10-15 16:30 ` [PATCH net-next,v2 1/9] netfilter: flowtable: add xmit path types Pablo Neira Ayuso
2020-10-15 16:30 ` [PATCH net-next,v2 2/9] net: resolve forwarding path from virtual netdevice and HW destination address Pablo Neira Ayuso
2020-10-15 16:30 ` [PATCH net-next,v2 3/9] net: 8021q: resolve forwarding path for vlan devices Pablo Neira Ayuso
2020-10-15 16:30 ` [PATCH net-next,v2 4/9] bridge: resolve forwarding path for bridge devices Pablo Neira Ayuso
2020-10-22 10:24 ` Nikolay Aleksandrov
2020-10-15 16:30 ` [PATCH net-next,v2 5/9] netfilter: flowtable: use dev_fill_forward_path() to obtain ingress device Pablo Neira Ayuso
2020-10-15 16:30 ` [PATCH net-next,v2 6/9] netfilter: flowtable: use dev_fill_forward_path() to obtain egress device Pablo Neira Ayuso
2020-10-19 9:32 ` Jeremy Sowden
2020-10-15 16:30 ` Pablo Neira Ayuso [this message]
2020-10-15 16:30 ` [PATCH net-next,v2 8/9] netfilter: flowtable: bridge port support Pablo Neira Ayuso
2020-10-19 9:32 ` Jeremy Sowden
2020-10-15 16:30 ` [PATCH net-next,v2 9/9] netfilter: flowtable: add vlan support Pablo Neira Ayuso
2020-10-15 19:47 ` [PATCH net-next,v2 0/9] netfilter: flowtable bridge and vlan enhancements Jakub Kicinski
2020-10-15 23:04 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015163038.26992-8-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).