[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220124094320.900713-3-haoxu@linux.alibaba.com>
Date: Mon, 24 Jan 2022 17:43:19 +0800
From: Hao Xu <haoxu@...ux.alibaba.com>
To: netdev@...r.kernel.org, io-uring@...r.kernel.org
Cc: Jens Axboe <axboe@...nel.dk>,
Pavel Begunkov <asml.silence@...il.com>,
Eric Dumazet <edumazet@...gle.com>,
"David S . Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
David Ahern <dsahern@...nel.org>,
Joseph Qi <joseph.qi@...ux.alibaba.com>
Subject: [PATCH 2/3] net-zerocopy: remove static for tcp_zerocopy_receive()
Remove static for tcp_zerocopy_receive() since we are going to
reference it in io_uring.
Signed-off-by: Hao Xu <haoxu@...ux.alibaba.com>
---
include/net/tcp.h | 3 +++
net/ipv4/tcp.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index ba0e7957bdfb..f4108dea6a82 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -424,6 +424,9 @@ int zc_receive_check(struct tcp_zerocopy_receive *zc, int *lenp,
int zc_receive_update(struct sock *sk, struct tcp_zerocopy_receive *zc, int len,
char __user *optval, struct scm_timestamping_internal *tss,
int err);
+int tcp_zerocopy_receive(struct sock *sk,
+ struct tcp_zerocopy_receive *zc,
+ struct scm_timestamping_internal *tss);
#endif
void tcp_parse_options(const struct net *net, const struct sk_buff *skb,
struct tcp_options_received *opt_rx,
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d47e3ccf7cdb..b08a04f58b42 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2066,9 +2066,9 @@ static void tcp_zc_finalize_rx_tstamp(struct sock *sk,
}
#define TCP_ZEROCOPY_PAGE_BATCH_SIZE 32
-static int tcp_zerocopy_receive(struct sock *sk,
- struct tcp_zerocopy_receive *zc,
- struct scm_timestamping_internal *tss)
+int tcp_zerocopy_receive(struct sock *sk,
+ struct tcp_zerocopy_receive *zc,
+ struct scm_timestamping_internal *tss)
{
u32 length = 0, offset, vma_len, avail_len, copylen = 0;
unsigned long address = (unsigned long)zc->address;
--
2.25.1
Powered by blists - more mailing lists