2019-06-07 14:15:19

by Iago López Galeiras

[permalink] [raw]
Subject: [PATCH bpf-next v5 2/4] bpf: sync bpf.h to tools/ for bpf_sock_ops->netns*

From: Alban Crequy <[email protected]>

The change in struct bpf_sock_ops is synchronised
from: include/uapi/linux/bpf.h
to: tools/include/uapi/linux/bpf.h

Signed-off-by: Alban Crequy <[email protected]>

---

Changes since v2:
- standalone patch for the sync (requested by Y Song)

Changes since v4:
- add netns_dev comment on uapi header (review from Y Song)
---
tools/include/uapi/linux/bpf.h | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 63e0cf66f01a..41f54ac3db95 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -3261,6 +3261,12 @@ struct bpf_sock_ops {
__u32 sk_txhash;
__u64 bytes_received;
__u64 bytes_acked;
+ /*
+ * netns_dev might be zero if there's an error getting it
+ * when loading the BPF program. This is very unlikely.
+ */
+ __u64 netns_dev;
+ __u64 netns_ino;
};

/* Definitions for bpf_sock_ops_cb_flags */
--
2.21.0