Re: [PATCH net-next v5 06/19] tcp: Make sendmsg(MSG_SPLICE_PAGES) copy unspliceable data

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Apr 6, 2023 at 5:43 AM David Howells <dhowells@xxxxxxxxxx> wrote:
>
> If sendmsg() with MSG_SPLICE_PAGES encounters a page that shouldn't be
> spliced - a slab page, for instance, or one with a zero count - make
> tcp_sendmsg() copy it.
>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> cc: Eric Dumazet <edumazet@xxxxxxxxxx>
> cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
> cc: David Ahern <dsahern@xxxxxxxxxx>
> cc: Jakub Kicinski <kuba@xxxxxxxxxx>
> cc: Paolo Abeni <pabeni@xxxxxxxxxx>
> cc: Jens Axboe <axboe@xxxxxxxxx>
> cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
> cc: netdev@xxxxxxxxxxxxxxx
> ---
>  net/ipv4/tcp.c | 28 +++++++++++++++++++++++++---
>  1 file changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index 510bacc7ce7b..238a8ad6527c 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -1418,10 +1418,10 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
>                                 goto do_error;
>                         copy = err;
>                 } else if (zc == 2) {
> -                       /* Splice in data. */
> +                       /* Splice in data if we can; copy if we can't. */
>                         struct page *page = NULL, **pages = &page;
>                         size_t off = 0, part;
> -                       bool can_coalesce;
> +                       bool can_coalesce, put = false;
>                         int i = skb_shinfo(skb)->nr_frags;
>
>                         copy = iov_iter_extract_pages(&msg->msg_iter, &pages,
> @@ -1448,12 +1448,34 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
>                                 goto wait_for_space;
>                         copy = part;
>
> +                       if (!sendpage_ok(page)) {
> +                               const void *p = kmap_local_page(page);
> +                               void *q;
> +
> +                               q = page_frag_memdup(NULL, p + off, copy,
> +                                                    sk->sk_allocation, ULONG_MAX);
> +                               kunmap_local(p);
> +                               if (!q) {
> +                                       iov_iter_revert(&msg->msg_iter, copy);
> +                                       err = copy ?: -ENOMEM;
> +                                       goto do_error;
> +                               }
> +                               page = virt_to_page(q);
> +                               off = offset_in_page(q);
> +                               put = true;
> +                               can_coalesce = false;
> +                       }
> +

This is almost identical in the later udp and unix implementations.
Could this be a wrapper, something like

    page = sendpage_copy_if_needed(&page, &off, copy, gfp, &put));

(it seems page is never needed if it would return NULL)





[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux