From: Rumen Telbizov <rumen.telbizov@menlosecurity.com>
To: bpf@vger.kernel.org
Cc: dsahern@gmail.com, David Ahern <dsahern@kernel.org>,
Rumen Telbizov <rumen.telbizov@menlosecurity.com>
Subject: [PATCH 1/3] bpf: Add support for mark with bpf_fib_lookup
Date: Tue, 29 Jun 2021 11:55:35 -0700 [thread overview]
Message-ID: <20210629185537.78008-2-rumen.telbizov@menlosecurity.com> (raw)
In-Reply-To: <20210629185537.78008-1-rumen.telbizov@menlosecurity.com>
From: David Ahern <dsahern@kernel.org>
Add support for policy routing via marks to the bpf_fib_lookup
helper. The bpf_fib_lookup struct is constrained to 64B for
performance. Since the smac and dmac entries are used only for
output, put them in an anonymous struct and then add a union
around a second struct that contains the mark to use in the FIB
lookup.
Signed-off-by: Rumen Telbizov <rumen.telbizov@menlosecurity.com>
---
include/uapi/linux/bpf.h | 16 ++++++++++++++--
net/core/filter.c | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index ec6d85a81744..6c78cc9c3c75 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -5925,8 +5925,20 @@ struct bpf_fib_lookup {
/* output */
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
- __u8 smac[6]; /* ETH_ALEN */
- __u8 dmac[6]; /* ETH_ALEN */
+
+ union {
+ /* input */
+ struct {
+ __u32 mark; /* fwmark for policy routing */
+ /* 2 4-byte holes for input */
+ };
+
+ /* output: source and dest mac */
+ struct {
+ __u8 smac[6]; /* ETH_ALEN */
+ __u8 dmac[6]; /* ETH_ALEN */
+ };
+ };
};
struct bpf_redir_neigh {
diff --git a/net/core/filter.c b/net/core/filter.c
index 65ab4e21c087..2ea997cacf4d 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -5299,6 +5299,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
fl4.saddr = params->ipv4_src;
fl4.fl4_sport = params->sport;
fl4.fl4_dport = params->dport;
+ fl4.flowi4_mark = params->mark;
fl4.flowi4_multipath_hash = 0;
if (flags & BPF_FIB_LOOKUP_DIRECT) {
@@ -5311,7 +5312,6 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
err = fib_table_lookup(tb, &fl4, &res, FIB_LOOKUP_NOREF);
} else {
- fl4.flowi4_mark = 0;
fl4.flowi4_secid = 0;
fl4.flowi4_tun_key.tun_id = 0;
fl4.flowi4_uid = sock_net_uid(net, NULL);
@@ -5425,6 +5425,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
fl6.saddr = *src;
fl6.fl6_sport = params->sport;
fl6.fl6_dport = params->dport;
+ fl6.flowi6_mark = params->mark;
if (flags & BPF_FIB_LOOKUP_DIRECT) {
u32 tbid = l3mdev_fib_table_rcu(dev) ? : RT_TABLE_MAIN;
@@ -5437,7 +5438,6 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
err = ipv6_stub->fib6_table_lookup(net, tb, oif, &fl6, &res,
strict);
} else {
- fl6.flowi6_mark = 0;
fl6.flowi6_secid = 0;
fl6.flowi6_tun_key.tun_id = 0;
fl6.flowi6_uid = sock_net_uid(net, NULL);
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2021-06-29 18:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 18:55 [PATCH 0/3] Add support for fwmark to bpf_fib_lookup Rumen Telbizov
2021-06-29 18:55 ` Rumen Telbizov [this message]
2021-06-30 5:35 ` [PATCH 1/3] bpf: Add support for mark with bpf_fib_lookup Greg KH
2021-06-30 14:26 ` David Ahern
2021-06-29 18:55 ` [PATCH 2/3] tools: Update bpf header Rumen Telbizov
2021-06-29 18:55 ` [PATCH 3/3] selftests: Add selftests for fwmark support in bpf_fib_lookup Rumen Telbizov
2021-06-29 23:08 ` Yonghong Song
-- strict thread matches above, loose matches on Subject: below --
2021-06-29 17:37 [PATCH 1/3] bpf: Add support for mark with bpf_fib_lookup Rumen Telbizov
2021-06-29 17:50 ` Greg KH
2021-06-29 17:50 ` Greg KH
2021-06-29 19:10 ` David Ahern
2021-06-29 17:51 ` Toke Høiland-Jørgensen
2021-06-29 18:06 ` Rumen Telbizov
2021-06-29 18:13 ` Greg KH
2021-06-29 18:22 ` Rumen Telbizov
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=20210629185537.78008-2-rumen.telbizov@menlosecurity.com \
--to=rumen.telbizov@menlosecurity.com \
--cc=bpf@vger.kernel.org \
--cc=dsahern@gmail.com \
--cc=dsahern@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).