1 files changed, 43 insertions, 11 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 6da880d2f022..58278669cc55 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -387,7 +387,7 @@ bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst);
 void tcp_close(struct sock *sk, long timeout);
 void tcp_init_sock(struct sock *sk);
 void tcp_init_transfer(struct sock *sk, int bpf_op);
-unsigned int tcp_poll(struct file *file, struct socket *sock,
+__poll_t tcp_poll(struct file *file, struct socket *sock,
                       struct poll_table_struct *wait);
 int tcp_getsockopt(struct sock *sk, int level, int optname,
                    char __user *optval, int __user *optlen);
@@ -953,6 +953,7 @@ struct rate_sample {
         u32  prior_in_flight;   /* in flight before this ACK */
         bool is_app_limited;    /* is sample from packet with bubble in pipe? */
         bool is_retrans;        /* is sample from retransmission? */
+        bool is_ack_delayed;    /* is this (likely) a delayed ACK? */
 };
 
 struct tcp_congestion_ops {
@@ -1507,8 +1508,7 @@ int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
 
 /* From tcp_fastopen.c */
 void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
-                            struct tcp_fastopen_cookie *cookie, int *syn_loss,
-                            unsigned long *last_syn_loss);
+                            struct tcp_fastopen_cookie *cookie);
 void tcp_fastopen_cache_set(struct sock *sk, u16 mss,
                             struct tcp_fastopen_cookie *cookie, bool syn_lost,
                             u16 try_exp);
@@ -1546,7 +1546,7 @@ extern unsigned int sysctl_tcp_fastopen_blackhole_timeout;
 void tcp_fastopen_active_disable(struct sock *sk);
 bool tcp_fastopen_active_should_disable(struct sock *sk);
 void tcp_fastopen_active_disable_ofo_check(struct sock *sk);
-void tcp_fastopen_active_timeout_reset(void);
+void tcp_fastopen_active_detect_blackhole(struct sock *sk, bool expired);
 
 /* Latencies incurred by various limits for a sender. They are
  * chronograph-like stats that are mutually exclusive.
@@ -2006,17 +2006,21 @@ void tcp_cleanup_ulp(struct sock *sk);
  * program loaded).
  */
 #ifdef CONFIG_BPF
-static inline int tcp_call_bpf(struct sock *sk, int op)
+static inline int tcp_call_bpf(struct sock *sk, int op, u32 nargs, u32 *args)
 {
         struct bpf_sock_ops_kern sock_ops;
         int ret;
 
-        if (sk_fullsock(sk))
+        memset(&sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp));
+        if (sk_fullsock(sk)) {
+                sock_ops.is_fullsock = 1;
                 sock_owned_by_me(sk);
+        }
 
-        memset(&sock_ops, 0, sizeof(sock_ops));
         sock_ops.sk = sk;
         sock_ops.op = op;
+        if (nargs > 0)
+                memcpy(sock_ops.args, args, nargs * sizeof(*args));
 
         ret = BPF_CGROUP_RUN_PROG_SOCK_OPS(&sock_ops);
         if (ret == 0)
@@ -2025,18 +2029,46 @@ static inline int tcp_call_bpf(struct sock *sk, int op)
                 ret = -1;
         return ret;
 }
+
+static inline int tcp_call_bpf_2arg(struct sock *sk, int op, u32 arg1, u32 arg2)
+{
+        u32 args[2] = {arg1, arg2};
+
+        return tcp_call_bpf(sk, op, 2, args);
+}
+
+static inline int tcp_call_bpf_3arg(struct sock *sk, int op, u32 arg1, u32 arg2,
+                                    u32 arg3)
+{
+        u32 args[3] = {arg1, arg2, arg3};
+
+        return tcp_call_bpf(sk, op, 3, args);
+}
+
 #else
-static inline int tcp_call_bpf(struct sock *sk, int op)
+static inline int tcp_call_bpf(struct sock *sk, int op, u32 nargs, u32 *args)
 {
         return -EPERM;
 }
+
+static inline int tcp_call_bpf_2arg(struct sock *sk, int op, u32 arg1, u32 arg2)
+{
+        return -EPERM;
+}
+
+static inline int tcp_call_bpf_3arg(struct sock *sk, int op, u32 arg1, u32 arg2,
+                                    u32 arg3)
+{
+        return -EPERM;
+}
+
 #endif
 
 static inline u32 tcp_timeout_init(struct sock *sk)
 {
         int timeout;
 
-        timeout = tcp_call_bpf(sk, BPF_SOCK_OPS_TIMEOUT_INIT);
+        timeout = tcp_call_bpf(sk, BPF_SOCK_OPS_TIMEOUT_INIT, 0, NULL);
 
         if (timeout <= 0)
                 timeout = TCP_TIMEOUT_INIT;
@@ -2047,7 +2079,7 @@ static inline u32 tcp_rwnd_init_bpf(struct sock *sk)
 {
         int rwnd;
 
-        rwnd = tcp_call_bpf(sk, BPF_SOCK_OPS_RWND_INIT);
+        rwnd = tcp_call_bpf(sk, BPF_SOCK_OPS_RWND_INIT, 0, NULL);
 
         if (rwnd < 0)
                 rwnd = 0;
@@ -2056,7 +2088,7 @@ static inline u32 tcp_rwnd_init_bpf(struct sock *sk)
 
 static inline bool tcp_bpf_ca_needs_ecn(struct sock *sk)
 {
-        return (tcp_call_bpf(sk, BPF_SOCK_OPS_NEEDS_ECN) == 1);
+        return (tcp_call_bpf(sk, BPF_SOCK_OPS_NEEDS_ECN, 0, NULL) == 1);
 }
 
 #if IS_ENABLED(CONFIG_SMC)