bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 2/3] tools: Update bpf header
Date: Tue, 29 Jun 2021 11:55:36 -0700	[thread overview]
Message-ID: <20210629185537.78008-3-rumen.telbizov@menlosecurity.com> (raw)
In-Reply-To: <20210629185537.78008-1-rumen.telbizov@menlosecurity.com>

From: David Ahern <dsahern@kernel.org>

Update bpf header under tools to bring in the bpf_fib_lookup
struct changes.

Signed-off-by: Rumen Telbizov <rumen.telbizov@menlosecurity.com>
---
 tools/include/uapi/linux/bpf.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index ec6d85a81744..6c78cc9c3c75 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/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 {
-- 
2.30.1 (Apple Git-130)


  parent reply	other threads:[~2021-06-29 18:56 UTC|newest]

Thread overview: 8+ 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 ` [PATCH 1/3] bpf: Add support for mark with bpf_fib_lookup Rumen Telbizov
2021-06-30  5:35   ` Greg KH
2021-06-30 14:26     ` David Ahern
2021-06-29 18:55 ` Rumen Telbizov [this message]
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 2/3] tools: Update bpf header 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-3-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).