bpf: convert sockmap field attach_bpf_fd2 to type

In the initial sockmap API we provided strparser and verdict programs
using a single attach command by extending the attach API with a the
attach_bpf_fd2 field.

However, if we add other programs in the future we will be adding a
field for every new possible type, attach_bpf_fd(3,4,..). This
seems a bit clumsy for an API. So lets push the programs using two
new type fields.

   BPF_SK_SKB_STREAM_PARSER
   BPF_SK_SKB_STREAM_VERDICT

This has the advantage of having a readable name and can easily be
extended in the future.

Updates to samples and sockmap included here also generalize tests
slightly to support upcoming patch for multiple map support.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support")
Suggested-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 12 insertions, 6 deletions

diff --git a/samples/sockmap/sockmap_kern.c b/samples/sockmap/sockmap_kern.c
index 6ff986f7059b..f9b38ef82dc2 100644
--- a/samples/sockmap/sockmap_kern.c
+++ b/samples/sockmap/sockmap_kern.c
@@ -82,8 +82,7 @@ int bpf_sockmap(struct bpf_sock_ops *skops)
                 if (lport == 10000) {
                         ret = 1;
                         err = bpf_sock_map_update(skops, &sock_map, &ret,
-                                                  BPF_NOEXIST,
-                                                  BPF_SOCKMAP_STRPARSER);
+                                                  BPF_NOEXIST);
                         bpf_printk("passive(%i -> %i) map ctx update err: %d\n",
                                    lport, bpf_ntohl(rport), err);
                 }
@@ -95,8 +94,7 @@ int bpf_sockmap(struct bpf_sock_ops *skops)
                 if (bpf_ntohl(rport) == 10001) {
                         ret = 10;
                         err = bpf_sock_map_update(skops, &sock_map, &ret,
-                                                  BPF_NOEXIST,
-                                                  BPF_SOCKMAP_STRPARSER);
+                                                  BPF_NOEXIST);
                         bpf_printk("active(%i -> %i) map ctx update err: %d\n",
                                    lport, bpf_ntohl(rport), err);
                 }
diff --git a/samples/sockmap/sockmap_user.c b/samples/sockmap/sockmap_user.c
index fb78f5abefb4..7cc9d228216f 100644
--- a/samples/sockmap/sockmap_user.c
+++ b/samples/sockmap/sockmap_user.c
@@ -256,8 +256,16 @@ int main(int argc, char **argv)
         }
 
         /* Attach programs to sockmap */
-        err = __bpf_prog_attach(prog_fd[0], prog_fd[1], map_fd[0],
-                                BPF_CGROUP_SMAP_INGRESS, 0);
+        err = bpf_prog_attach(prog_fd[0], map_fd[0],
+                                BPF_SK_SKB_STREAM_PARSER, 0);
+        if (err) {
+                fprintf(stderr, "ERROR: bpf_prog_attach (sockmap): %d (%s)\n",
+                        err, strerror(errno));
+                return err;
+        }
+
+        err = bpf_prog_attach(prog_fd[1], map_fd[0],
+                                BPF_SK_SKB_STREAM_VERDICT, 0);
         if (err) {
                 fprintf(stderr, "ERROR: bpf_prog_attach (sockmap): %d (%s)\n",
                         err, strerror(errno));