sock_map: Rename skb_parser and skb_verdict

[linux-block.git] / net / core / sock_map.c

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index d758fb83c8841d35737c25c6a42f338468b95a6f..69785070f02d7ee54554b0481e168258a752e94b 100644 (file)
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -148,9 +148,9 @@ static void sock_map_del_link(struct sock *sk,
                        struct bpf_map *map = link->map;
                        struct bpf_stab *stab = container_of(map, struct bpf_stab,
                                                             map);
-                       if (psock->parser.enabled && stab->progs.skb_parser)
+                       if (psock->saved_data_ready && stab->progs.stream_parser)
                                strp_stop = true;
-                       if (psock->parser.enabled && stab->progs.skb_verdict)
+                       if (psock->saved_data_ready && stab->progs.stream_verdict)
                                verdict_stop = true;
                        list_del(&link->list);
                        sk_psock_free_link(link);
@@ -224,23 +224,23 @@ out:
 static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
                         struct sock *sk)
 {
-       struct bpf_prog *msg_parser, *skb_parser, *skb_verdict;
+       struct bpf_prog *msg_parser, *stream_parser, *stream_verdict;
        struct sk_psock *psock;
        int ret;
 
-       skb_verdict = READ_ONCE(progs->skb_verdict);
-       if (skb_verdict) {
-               skb_verdict = bpf_prog_inc_not_zero(skb_verdict);
-               if (IS_ERR(skb_verdict))
-                       return PTR_ERR(skb_verdict);
+       stream_verdict = READ_ONCE(progs->stream_verdict);
+       if (stream_verdict) {
+               stream_verdict = bpf_prog_inc_not_zero(stream_verdict);
+               if (IS_ERR(stream_verdict))
+                       return PTR_ERR(stream_verdict);
        }
 
-       skb_parser = READ_ONCE(progs->skb_parser);
-       if (skb_parser) {
-               skb_parser = bpf_prog_inc_not_zero(skb_parser);
-               if (IS_ERR(skb_parser)) {
-                       ret = PTR_ERR(skb_parser);
-                       goto out_put_skb_verdict;
+       stream_parser = READ_ONCE(progs->stream_parser);
+       if (stream_parser) {
+               stream_parser = bpf_prog_inc_not_zero(stream_parser);
+               if (IS_ERR(stream_parser)) {
+                       ret = PTR_ERR(stream_parser);
+                       goto out_put_stream_verdict;
                }
        }
 
@@ -249,7 +249,7 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
                msg_parser = bpf_prog_inc_not_zero(msg_parser);
                if (IS_ERR(msg_parser)) {
                        ret = PTR_ERR(msg_parser);
-                       goto out_put_skb_parser;
+                       goto out_put_stream_parser;
                }
        }
 
@@ -261,8 +261,8 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
 
        if (psock) {
                if ((msg_parser && READ_ONCE(psock->progs.msg_parser)) ||
-                   (skb_parser  && READ_ONCE(psock->progs.skb_parser)) ||
-                   (skb_verdict && READ_ONCE(psock->progs.skb_verdict))) {
+                   (stream_parser  && READ_ONCE(psock->progs.stream_parser)) ||
+                   (stream_verdict && READ_ONCE(psock->progs.stream_verdict))) {
                        sk_psock_put(sk, psock);
                        ret = -EBUSY;
                        goto out_progs;
@@ -283,15 +283,15 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
                goto out_drop;
 
        write_lock_bh(&sk->sk_callback_lock);
-       if (skb_parser && skb_verdict && !psock->parser.enabled) {
+       if (stream_parser && stream_verdict && !psock->saved_data_ready) {
                ret = sk_psock_init_strp(sk, psock);
                if (ret)
                        goto out_unlock_drop;
-               psock_set_prog(&psock->progs.skb_verdict, skb_verdict);
-               psock_set_prog(&psock->progs.skb_parser, skb_parser);
+               psock_set_prog(&psock->progs.stream_verdict, stream_verdict);
+               psock_set_prog(&psock->progs.stream_parser, stream_parser);
                sk_psock_start_strp(sk, psock);
-       } else if (!skb_parser && skb_verdict && !psock->parser.enabled) {
-               psock_set_prog(&psock->progs.skb_verdict, skb_verdict);
+       } else if (!stream_parser && stream_verdict && !psock->saved_data_ready) {
+               psock_set_prog(&psock->progs.stream_verdict, stream_verdict);
                sk_psock_start_verdict(sk,psock);
        }
        write_unlock_bh(&sk->sk_callback_lock);
@@ -303,12 +303,12 @@ out_drop:
 out_progs:
        if (msg_parser)
                bpf_prog_put(msg_parser);
-out_put_skb_parser:
-       if (skb_parser)
-               bpf_prog_put(skb_parser);
-out_put_skb_verdict:
-       if (skb_verdict)
-               bpf_prog_put(skb_verdict);
+out_put_stream_parser:
+       if (stream_parser)
+               bpf_prog_put(stream_parser);
+out_put_stream_verdict:
+       if (stream_verdict)
+               bpf_prog_put(stream_verdict);
        return ret;
 }
 
@@ -657,7 +657,6 @@ const struct bpf_func_proto bpf_sock_map_update_proto = {
 BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,
           struct bpf_map *, map, u32, key, u64, flags)
 {
-       struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
        struct sock *sk;
 
        if (unlikely(flags & ~(BPF_F_INGRESS)))
@@ -667,8 +666,7 @@ BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,
        if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
                return SK_DROP;
 
-       tcb->bpf.flags = flags;
-       tcb->bpf.sk_redir = sk;
+       skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
        return SK_PASS;
 }
 
@@ -1250,7 +1248,6 @@ const struct bpf_func_proto bpf_sock_hash_update_proto = {
 BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,
           struct bpf_map *, map, void *, key, u64, flags)
 {
-       struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
        struct sock *sk;
 
        if (unlikely(flags & ~(BPF_F_INGRESS)))
@@ -1260,8 +1257,7 @@ BPF_CALL_4(bpf_sk_redirect_hash, struct sk_buff *, skb,
        if (unlikely(!sk || !sock_map_redirect_allowed(sk)))
                return SK_DROP;
 
-       tcb->bpf.flags = flags;
-       tcb->bpf.sk_redir = sk;
+       skb_bpf_set_redir(skb, sk, flags & BPF_F_INGRESS);
        return SK_PASS;
 }
 
@@ -1461,11 +1457,13 @@ int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
        case BPF_SK_MSG_VERDICT:
                pprog = &progs->msg_parser;
                break;
+#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)
        case BPF_SK_SKB_STREAM_PARSER:
-               pprog = &progs->skb_parser;
+               pprog = &progs->stream_parser;
                break;
+#endif
        case BPF_SK_SKB_STREAM_VERDICT:
-               pprog = &progs->skb_verdict;
+               pprog = &progs->stream_verdict;
                break;
        default:
                return -EOPNOTSUPP;