Taking out the related functions to tcp_migrate.c

Author: forkjoseph

include/net/tcp.h

@@ -53,9 +53,16 @@ extern struct percpu_counter tcp_orphan_count;
 void tcp_time_wait(struct sock *sk, int state, int timeo);
 
 #if IS_ENABLED(CONFIG_TCP_MIGRATE)
+#define tcpmig_debug(fmt, args...)         \
+  do {                \
+      pr_err(__FILE__ ": " fmt, ##args);  \
+  } while (0)
 /* Global array of migrate_enabled sockets */
 #define MAX_TOKEN 10000
 extern struct sock *migrate_socks[MAX_TOKEN];
+#else
+#define tcpmig_debug(fmt, args...)         \
+  do { } while (0)
 #endif
 
 #define MAX_TCP_HEADER	(128 + MAX_HEADER)
@@ -589,18 +596,22 @@ int tcp_send_synack(struct sock *);
 void tcp_push_one(struct sock *, unsigned int mss_now);
 void __tcp_send_ack(struct sock *sk, u32 rcv_nxt);
 void tcp_send_ack(struct sock *sk);
-#if IS_ENABLED(CONFIG_TCP_MIGRATE)
-void tcp_send_migrate_req(struct sock *sk);
-int tcp_v4_migrate_hash(struct sock *sk);
-int tcp_v4_migrate_unhash(struct sock *sk);
-int tcp_v4_migrate_hash_place(struct sock *sk, u32 token);
-bool tcp_v4_migrate_unhashed(const struct sock *sk);
-#endif
 void tcp_send_delayed_ack(struct sock *sk);
 void tcp_send_loss_probe(struct sock *sk);
 bool tcp_schedule_loss_probe(struct sock *sk, bool advancing_rto);
 void tcp_skb_collapse_tstamp(struct sk_buff *skb,
 			     const struct sk_buff *next_skb);
+/* tcp_migrate.c */
+int tcp_v4_migrate_hash(struct sock *sk);
+int tcp_v4_migrate_unhash(struct sock *sk);
+int tcp_v4_migrate_hash_place(struct sock *sk, u32 token);
+bool tcp_v4_migrate_unhashed(const struct sock *sk);
+void tcp_send_migrate_req(struct sock *sk);
+int tcp_v4_migrate_request(struct sk_buff *skb, struct tcp_options_received *opts);
+#ifdef CONFIG_PROC_FS
+int tcpmig_proc_init(void);
+void tcpmig_proc_exit(void);
+#endif
 
 /* tcp_input.c */
 void tcp_rearm_rto(struct sock *sk);
@@ -1908,9 +1919,6 @@ int tcp_rtx_synack(const struct sock *sk, struct request_sock *req);
 int tcp_conn_request(struct request_sock_ops *rsk_ops,
 		     const struct tcp_request_sock_ops *af_ops,
 		     struct sock *sk, struct sk_buff *skb);
-#ifdef CONFIG_TCP_MIGRATE
-int tcp_v4_migrate_request(struct sk_buff *skb, struct tcp_options_received *opts);
-#endif
 
 /* TCP af-specific functions */
 struct tcp_sock_af_ops {

net/ipv4/Makefile

@@ -14,7 +14,8 @@ obj-y     := route.o inetpeer.o protocol.o \
 	     udp_offload.o arp.o icmp.o devinet.o af_inet.o igmp.o \
 	     fib_frontend.o fib_semantics.o fib_trie.o fib_notifier.o \
 	     inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o \
-	     metrics.o netlink.o
+	     metrics.o netlink.o \
+			 tcp_migrate.o
 
 obj-$(CONFIG_BPFILTER) += bpfilter/
 

net/ipv4/af_inet.c

@@ -2051,6 +2051,10 @@ static int __init ipv4_proc_init(void)
 		goto out_raw;
 	if (tcp4_proc_init())
 		goto out_tcp;
+#ifdef CONFIG_TCP_MIGRATE
+  if (tcpmig_proc_init())
+    goto out_tcpmig;
+#endif
 	if (udp4_proc_init())
 		goto out_udp;
 	if (ping_proc_init())
@@ -2063,6 +2067,10 @@ static int __init ipv4_proc_init(void)
 	ping_proc_exit();
 out_ping:
 	udp4_proc_exit();
+#ifdef CONFIG_TCP_MIGRATE
+out_tcpmig:
+  tcpmig_proc_exit();
+#endif
 out_udp:
 	tcp4_proc_exit();
 out_tcp:

net/ipv4/tcp_input.c

@@ -6605,68 +6605,3 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
 	return 0;
 }
 EXPORT_SYMBOL(tcp_conn_request);
-
-#if IS_ENABLED(CONFIG_TCP_MIGRATE)
-
-/* Atomically unhashes the sock from the ehash, updates its
- * destination address, and hashes it back into the ehash
- */
-int tcp_v4_change_daddr(struct sock *sk, __be32 newdaddr) {
-	int err;
-	//local_bh_disable();
-
-	printk(KERN_INFO "[%p][%s] unhashing\n", (void*)sk, __func__);
-	inet_unhash(sk);
-
-	sk->sk_daddr = newdaddr;
-
-	printk(KERN_INFO "[%p][%s] rehashing\n", (void*)sk, __func__);
-	err = inet_hash(sk);
-	if (err)
-		goto err;
-
-	//local_bh_enable();
-	return 0;
-err:
-	return err;
-}
-
-struct sock *tcp_v4_migrate_lookup(u32 token) {
-	if (token >= MAX_TOKEN) {
-		return NULL;
-	}
-	return migrate_socks[token];
-}
-
-int tcp_v4_migrate_request(struct sk_buff *skb, struct tcp_options_received *opts) {
-	struct sock *sk;
-	const struct iphdr *iph;
-	__be32 remote_addr;
-	u32 token = opts->migrate_token;
-	int err;
-
-	printk(KERN_INFO "[%s] token received is %u\n", __func__, token);
-
-	iph = ip_hdr(skb);
-	printk(KERN_INFO "[%s] iph = %p\n", __func__, iph);
-
-	// Migrate connection to this address:
-	remote_addr = iph->saddr;
-	printk(KERN_INFO "[%s] remote addr is: %x\n", __func__, ntohl(remote_addr));
-
-	/* Find the sock with this token */
-	sk = tcp_v4_migrate_lookup(token);
-
-	if (!sk) {
-		printk(KERN_INFO "[%s] could not find socket with token %u\n", __func__, token);
-		return -1;
-	}
-
-	printk(KERN_INFO "[%p][%s] Found sock and setting its daddr\n", (void*)sk, __func__);
-	err = tcp_v4_change_daddr(sk, remote_addr);
-
-	return err;
-}
-EXPORT_SYMBOL(tcp_v4_migrate_request);
-#endif
-