lkml.org 
[lkml]   [2023]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v8 10/16] tcp: Fold do_tcp_sendpages() into tcp_sendpage_locked()
    Date
    Fold do_tcp_sendpages() into its last remaining caller,
    tcp_sendpage_locked().

    Signed-off-by: David Howells <dhowells@redhat.com>
    cc: Eric Dumazet <edumazet@google.com>
    cc: David Ahern <dsahern@kernel.org>
    cc: "David S. Miller" <davem@davemloft.net>
    cc: Jakub Kicinski <kuba@kernel.org>
    cc: Paolo Abeni <pabeni@redhat.com>
    cc: Jens Axboe <axboe@kernel.dk>
    cc: Matthew Wilcox <willy@infradead.org>
    cc: netdev@vger.kernel.org
    ---
    include/net/tcp.h | 2 --
    net/ipv4/tcp.c | 21 +++++++--------------
    2 files changed, 7 insertions(+), 16 deletions(-)

    diff --git a/include/net/tcp.h b/include/net/tcp.h
    index 04a31643cda3..02a6cff1827e 100644
    --- a/include/net/tcp.h
    +++ b/include/net/tcp.h
    @@ -333,8 +333,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
    int flags);
    int tcp_sendpage_locked(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);
    int tcp_send_mss(struct sock *sk, int *size_goal, int flags);
    void tcp_push(struct sock *sk, int flags, int mss_now, int nonagle,
    int size_goal);
    diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
    index 28231e503af9..5e4752131583 100644
    --- a/net/ipv4/tcp.c
    +++ b/net/ipv4/tcp.c
    @@ -974,12 +974,17 @@ static int tcp_wmem_schedule(struct sock *sk, int copy)
    return min(copy, sk->sk_forward_alloc);
    }

    -ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
    - size_t size, int flags)
    +int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset,
    + size_t size, int flags)
    {
    struct bio_vec bvec;
    struct msghdr msg = { .msg_flags = flags | MSG_SPLICE_PAGES, };

    + if (!(sk->sk_route_caps & NETIF_F_SG))
    + return sock_no_sendpage_locked(sk, page, offset, size, flags);
    +
    + tcp_rate_check_app_limited(sk); /* is sending application-limited? */
    +
    bvec_set_page(&bvec, page, size, offset);
    iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size);

    @@ -988,18 +993,6 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,

    return tcp_sendmsg_locked(sk, &msg, size);
    }
    -EXPORT_SYMBOL_GPL(do_tcp_sendpages);
    -
    -int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset,
    - size_t size, int flags)
    -{
    - if (!(sk->sk_route_caps & NETIF_F_SG))
    - return sock_no_sendpage_locked(sk, page, offset, size, flags);
    -
    - tcp_rate_check_app_limited(sk); /* is sending application-limited? */
    -
    - return do_tcp_sendpages(sk, page, offset, size, flags);
    -}
    EXPORT_SYMBOL_GPL(tcp_sendpage_locked);

    int tcp_sendpage(struct sock *sk, struct page *page, int offset,
    \
     
     \ /
      Last update: 2023-05-18 13:38    [W:2.677 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site