tcp: export do_tcp_sendpages and tcp_rate_check_app_limited functions

Dave Watson · davem330 · commit e3b5616a3476 · 2017-06-15T12:12:40.000-04:00
Export do_tcp_sendpages and tcp_rate_check_app_limited, since tls will need to
sendpages while the socket is already locked.

tcp_sendpage is exported, but requires the socket lock to not be held already.

Signed-off-by: Aviad Yehezkel &lt;aviadye@mellanox.com&gt;
Signed-off-by: Ilya Lesokhin &lt;ilyal@mellanox.com&gt;
Signed-off-by: Boris Pismenny &lt;borisp@mellanox.com&gt;
Signed-off-by: Dave Watson &lt;davejwatson@fb.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -350,6 +350,8 @@ int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
 int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
 		 int flags);
+ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
+		 size_t size, int flags);
 void tcp_release_cb(struct sock *sk);
 void tcp_wfree(struct sk_buff *skb);
 void tcp_write_timer_handler(struct sock *sk);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
@@ -901,8 +901,8 @@ static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)
 	return mss_now;
 }
 
-static ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
-				size_t size, int flags)
+ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
+			 size_t size, int flags)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	int mss_now, size_goal;
@@ -1032,6 +1032,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
 	}
 	return sk_stream_error(sk, flags, err);
 }
+EXPORT_SYMBOL_GPL(do_tcp_sendpages);
 
 int tcp_sendpage(struct sock *sk, struct page *page, int offset,
 		 size_t size, int flags)
diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
@@ -185,3 +185,4 @@ void tcp_rate_check_app_limited(struct sock *sk)
 		tp->app_limited =
 			(tp->delivered + tcp_packets_in_flight(tp)) ? : 1;
 }
+EXPORT_SYMBOL_GPL(tcp_rate_check_app_limited);

Original file line number	Diff line number	Diff line change
`@@ -901,8 +901,8 @@ static int tcp_send_mss(struct sock sk, int size_goal, int flags)`
`901`	`901`	`return mss_now;`
`902`	`902`	`}`
`903`	`903`
`904`		`-static ssize_t do_tcp_sendpages(struct sock sk, struct page page, int offset,`
`905`		`- size_t size, int flags)`
	`904`	`+ssize_t do_tcp_sendpages(struct sock sk, struct page page, int offset,`
	`905`	`+ size_t size, int flags)`
`906`	`906`	`{`
`907`	`907`	`struct tcp_sock *tp = tcp_sk(sk);`
`908`	`908`	`int mss_now, size_goal;`
`@@ -1032,6 +1032,7 @@ static ssize_t do_tcp_sendpages(struct sock sk, struct page page, int offset,`
`1032`	`1032`	`}`
`1033`	`1033`	`return sk_stream_error(sk, flags, err);`
`1034`	`1034`	`}`
	`1035`	`+EXPORT_SYMBOL_GPL(do_tcp_sendpages);`
`1035`	`1036`
`1036`	`1037`	`int tcp_sendpage(struct sock sk, struct page page, int offset,`
`1037`	`1038`	`size_t size, int flags)`
Original file line number	Diff line number	Diff line change
`@@ -185,3 +185,4 @@ void tcp_rate_check_app_limited(struct sock *sk)`
`185`	`185`	`tp->app_limited =`
`186`	`186`	`(tp->delivered + tcp_packets_in_flight(tp)) ? : 1;`
`187`	`187`	`}`
	`188`	`+EXPORT_SYMBOL_GPL(tcp_rate_check_app_limited);`