bpf: selftest additions for SOCKHASH

This runs existing SOCKMAP tests with SOCKHASH map type. To do this
we push programs into include file and build two BPF programs. One
for SOCKHASH and one for SOCKMAP.

We then run the entire test suite with each type.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

1 files changed, 52 insertions, 2 deletions

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 02e4112510f8..d94d333a8225 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -118,6 +118,7 @@ enum bpf_map_type {
         BPF_MAP_TYPE_SOCKMAP,
         BPF_MAP_TYPE_CPUMAP,
         BPF_MAP_TYPE_XSKMAP,
+        BPF_MAP_TYPE_SOCKHASH,
 };
 
 enum bpf_prog_type {
@@ -1828,7 +1829,6 @@ union bpf_attr {
  *      Return
  *              0 on success, or a negative error in case of failure.
  *
- *
  * int bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32 flags)
  *      Description
  *              Do FIB lookup in kernel tables using parameters in *params*.
@@ -1855,6 +1855,53 @@ union bpf_attr {
  *             Egress device index on success, 0 if packet needs to continue
  *             up the stack for further processing or a negative error in case
  *             of failure.
+ *
+ * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags)
+ *      Description
+ *              Add an entry to, or update a sockhash *map* referencing sockets.
+ *              The *skops* is used as a new value for the entry associated to
+ *              *key*. *flags* is one of:
+ *
+ *              **BPF_NOEXIST**
+ *                      The entry for *key* must not exist in the map.
+ *              **BPF_EXIST**
+ *                      The entry for *key* must already exist in the map.
+ *              **BPF_ANY**
+ *                      No condition on the existence of the entry for *key*.
+ *
+ *              If the *map* has eBPF programs (parser and verdict), those will
+ *              be inherited by the socket being added. If the socket is
+ *              already attached to eBPF programs, this results in an error.
+ *      Return
+ *              0 on success, or a negative error in case of failure.
+ *
+ * int bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void *key, u64 flags)
+ *      Description
+ *              This helper is used in programs implementing policies at the
+ *              socket level. If the message *msg* is allowed to pass (i.e. if
+ *              the verdict eBPF program returns **SK_PASS**), redirect it to
+ *              the socket referenced by *map* (of type
+ *              **BPF_MAP_TYPE_SOCKHASH**) using hash *key*. Both ingress and
+ *              egress interfaces can be used for redirection. The
+ *              **BPF_F_INGRESS** value in *flags* is used to make the
+ *              distinction (ingress path is selected if the flag is present,
+ *              egress path otherwise). This is the only flag supported for now.
+ *      Return
+ *              **SK_PASS** on success, or **SK_DROP** on error.
+ *
+ * int bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void *key, u64 flags)
+ *      Description
+ *              This helper is used in programs implementing policies at the
+ *              skb socket level. If the sk_buff *skb* is allowed to pass (i.e.
+ *              if the verdeict eBPF program returns **SK_PASS**), redirect it
+ *              to the socket referenced by *map* (of type
+ *              **BPF_MAP_TYPE_SOCKHASH**) using hash *key*. Both ingress and
+ *              egress interfaces can be used for redirection. The
+ *              **BPF_F_INGRESS** value in *flags* is used to make the
+ *              distinction (ingress path is selected if the flag is present,
+ *              egress otherwise). This is the only flag supported for now.
+ *      Return
+ *              **SK_PASS** on success, or **SK_DROP** on error.
  */
 #define __BPF_FUNC_MAPPER(FN)           \
         FN(unspec),                     \
@@ -1926,7 +1973,10 @@ union bpf_attr {
         FN(skb_get_xfrm_state),         \
         FN(get_stack),                  \
         FN(skb_load_bytes_relative),    \
-        FN(fib_lookup),
+        FN(fib_lookup),                 \
+        FN(sock_hash_update),           \
+        FN(msg_redirect_hash),          \
+        FN(sk_redirect_hash),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call