Merge branch 'master' into tcpmig-two-options

Author: BGR360

include/linux/tcp.h

@@ -118,6 +118,10 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
 #if IS_ENABLED(CONFIG_SMC)
 	rx_opt->smc_ok = 0;
 #endif
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	rx_opt->migrate_enabled = 0;
+	rx_opt->migrate_token = 0;
+#endif
 }
 
 /* This is the max number of SACKS that we'll generate and process. It's safe
@@ -142,6 +146,10 @@ struct tcp_request_sock {
 						  * FastOpen it's the seq#
 						  * after data-in-SYN.
 						  */
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	bool      migrate_enabled;
+	u32       migrate_token;
+#endif
 };
 
 static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)

include/net/tcp.h

@@ -1608,6 +1608,17 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, const struct sk_buff *,
 int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
 		     const struct tcp_md5sig_key *key);
 
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+extern int migrate_syn;
+extern int migrate_syn_ack;
+
+/* #ifdef CONFIG_PROC_FS */
+/* void tcp_migrate_proc_init(void); */
+/* void tcp_migrate_proc_exit(void); */
+/* #endif */
+#endif
+
+
 /* From tcp_fastopen.c */
 void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
 			    struct tcp_fastopen_cookie *cookie);

net/ipv4/tcp.c

@@ -303,6 +303,11 @@ EXPORT_SYMBOL(tcp_have_smc);
 struct percpu_counter tcp_sockets_allocated;
 EXPORT_SYMBOL(tcp_sockets_allocated);
 
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+int migrate_syn = 0; 
+int migrate_syn_ack = 0;
+#endif
+
 /*
  * TCP splice context
  */
@@ -4007,4 +4012,7 @@ void __init tcp_init(void)
 	tcp_metrics_init();
 	BUG_ON(tcp_register_congestion_control(&tcp_reno) != 0);
 	tcp_tasklet_init();
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	migrate_syn = migrate_syn_ack = 0;
+#endif
 }

net/ipv4/tcp_input.c

@@ -6331,6 +6331,10 @@ static void tcp_openreq_init(struct request_sock *req,
 #if IS_ENABLED(CONFIG_SMC)
 	ireq->smc_ok = rx_opt->smc_ok;
 #endif
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	tcp_rsk(req)->migrate_enabled = 0;
+	tcp_rsk(req)->migrate_token = 0;
+#endif
 }
 
 struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
@@ -6482,6 +6486,8 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
 		tp->migrate_enabled = true;
 		tp->migrate_token = tmp_opt.migrate_token;
 		printk(KERN_INFO "[%s] token %u\n", __func__, tp->migrate_token);
+    tcp_rsk(req)->migrate_enabled = true;
+    tcp_rsk(req)->migrate_token = tmp_opt.migrate_token;
 	}
 #endif
 
@@ -6523,6 +6529,10 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
 		tcp_reqsk_record_syn(sk, req, skb);
 		fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst);
 	}
+
+	/* JOSEPH: skipped for putting token in tcp mig for now (will be
+	 * done in tcp_v4_sync_recv_sock when ACK for SYNACK is received */
+
 	if (fastopen_sk) {
 		af_ops->send_synack(fastopen_sk, dst, &fl, req,
 				    &foc, TCP_SYNACK_FASTOPEN);

net/ipv4/tcp_ipv4.c

@@ -1477,6 +1477,21 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
 	}
 #endif
 
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	if (tcp_rsk(req)->migrate_enabled) {
+		/* copy mig info to child socket (returned via accept) 
+		 * currently, assuming that no incoming connection for time
+		 * between SYN-ACK by server and ACK by client.
+		 */
+		printk("[%s] setting child token to %u\n", __func__, tcp_rsk(req)->migrate_token);
+		newtp->migrate_enabled = tcp_rsk(req)->migrate_enabled;
+		newtp->migrate_token = tcp_rsk(req)->migrate_token;
+	} else {
+		newtp->migrate_enabled = false;
+		newtp->migrate_token = 0;
+	}
+#endif
+
 	if (__inet_inherit_port(sk, newsk) < 0)
 		goto put_and_exit;
 	*own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
@@ -2514,6 +2529,64 @@ static const struct seq_operations tcp4_seq_ops = {
 	.stop		= tcp_seq_stop,
 };
 
+
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+static void get_tcp_mig_sock(struct sock *sk, struct seq_file *f, int i)
+{
+	const struct tcp_sock *tp = tcp_sk(sk);
+	const struct inet_sock *inet = inet_sk(sk);
+	__be32 dest = inet->inet_daddr;
+	__be32 src = inet->inet_rcv_saddr;
+	__u16 destp = ntohs(inet->inet_dport);
+	__u16 srcp = ntohs(inet->inet_sport);
+	int state;
+	bool migrate_enabled = tp->migrate_enabled;
+	u32 migrate_token;
+
+	if (!migrate_enabled)
+		goto skip;
+
+	state = inet_sk_state_load(sk);
+	migrate_token = tp->migrate_token;
+
+	seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %d",
+		i, src, srcp, dest, destp, state, migrate_token
+		);
+	seq_pad(f, '\n');
+
+	/* TODO: given tcp_mig socket, now put the socket into MIG_SYN state
+	 */
+skip:
+	return;
+}
+static int tcp_mig_seq_show(struct seq_file *seq, void *v)
+{
+	struct tcp_iter_state *st;
+	struct sock *sk = v;
+
+	seq_setwidth(seq, TMPSZ - 1);
+	if (v == SEQ_START_TOKEN) {
+		seq_puts(seq, "  sl  local_address rem_address			token\n");
+		goto out;
+	}
+	st = seq->private;
+
+	if (sk->sk_state != TCP_TIME_WAIT && sk->sk_state != TCP_NEW_SYN_RECV)
+		get_tcp_mig_sock(v, seq, st->num);
+
+out:
+	return 0;
+}
+
+
+static const struct seq_operations tcp_mig_seq_ops = {
+	.show		= tcp_mig_seq_show,
+	.start		= tcp_seq_start,
+	.next		= tcp_seq_next,
+	.stop		= tcp_seq_stop,
+};
+#endif
+
 static struct tcp_seq_afinfo tcp4_seq_afinfo = {
 	.family		= AF_INET,
 };
@@ -2523,12 +2596,20 @@ static int __net_init tcp4_proc_init_net(struct net *net)
 	if (!proc_create_net_data("tcp", 0444, net->proc_net, &tcp4_seq_ops,
 			sizeof(struct tcp_iter_state), &tcp4_seq_afinfo))
 		return -ENOMEM;
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	if (!proc_create_net_data("tcp_mig_syn", 0444, net->proc_net, &tcp_mig_seq_ops,
+			sizeof(struct tcp_iter_state), &tcp4_seq_afinfo))
+		return -ENOMEM;
+#endif
 	return 0;
 }
 
 static void __net_exit tcp4_proc_exit_net(struct net *net)
 {
 	remove_proc_entry("tcp", net->proc_net);
+#if IS_ENABLED(CONFIG_TCP_MIGRATE)
+	remove_proc_entry("tcp_mig_syn", net->proc_net);
+#endif
 }
 
 static struct pernet_operations tcp4_net_ops = {