Message ID | 20230329141354.516864-10-dhowells@redhat.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F836C6FD18 for <linux-mm@archiver.kernel.org>; Wed, 29 Mar 2023 14:14:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B2986B0081; Wed, 29 Mar 2023 10:14:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2627C6B0082; Wed, 29 Mar 2023 10:14:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DCA46B0085; Wed, 29 Mar 2023 10:14:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EDDBF6B0081 for <linux-mm@kvack.org>; Wed, 29 Mar 2023 10:14:34 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BF84412064D for <linux-mm@kvack.org>; Wed, 29 Mar 2023 14:14:34 +0000 (UTC) X-FDA: 80622131268.22.FBD850A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 09554A0027 for <linux-mm@kvack.org>; Wed, 29 Mar 2023 14:14:32 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qbqg4FYF; spf=pass (imf25.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680099273; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4TWX2aSvGOZ9Qof5Bdvg67w1lje6zmFD7Oc0vC/yB3w=; b=z7Zj92XFToEiunV0kAA2Wk/ZCDEhPZxtj9K5NS7iTPN9JED0MWOrS2c8TFrN5ZS7iqWwRC 5a0K804+yq9AOCre11tVKII6remmWbaS48k9tEYvsJ6gXh47xx8Eft8/4ZmgNagGonukeI iAZyIX+ITQNgPto+B5lrGbRwRHEsPyQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qbqg4FYF; spf=pass (imf25.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680099273; a=rsa-sha256; cv=none; b=OYrJ8x2UW0J1lG8hA0IBM4RIleJUFY3WRDWZf9AubdLErLyXLPM87L8uGH74YibnX8beHM mrv6tQD+CGpZq7YEGV0xKWd8KVcbTTmQIot9lOTXPy1QrNckYNXg7HgF7TKkr1RCwvHHrQ bcoJqOqmU5dvfrRu9Qhs827b1td1yr4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4TWX2aSvGOZ9Qof5Bdvg67w1lje6zmFD7Oc0vC/yB3w=; b=Qbqg4FYF+OtHNzDtrxIlbaHTkQR0xlShbAz/6Xh1X354q2unflCJXpD/KrNniDi/4P4XOY Rk06Ir68Flk9G5TQ9bWG7qKQVsU2ckOwRjudNRMRI/+1SA5EkOxPx4YqBugGdvUwGB5+Hi XsHcJzZ70r34iCTRXy4mnjGbKdVCDGs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-aG1NERqFMhu5XfuNhb_KOw-1; Wed, 29 Mar 2023 10:14:25 -0400 X-MC-Unique: aG1NERqFMhu5XfuNhb_KOw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1811811E7C; Wed, 29 Mar 2023 14:14:24 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 082972027040; Wed, 29 Mar 2023 14:14:22 +0000 (UTC) From: David Howells <dhowells@redhat.com> To: Matthew Wilcox <willy@infradead.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: David Howells <dhowells@redhat.com>, Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>, Jens Axboe <axboe@kernel.dk>, Jeff Layton <jlayton@kernel.org>, Christian Brauner <brauner@kernel.org>, Chuck Lever III <chuck.lever@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org>, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 09/48] tcp: Make sendmsg(MSG_SPLICE_PAGES) copy unspliceable data Date: Wed, 29 Mar 2023 15:13:15 +0100 Message-Id: <20230329141354.516864-10-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 09554A0027 X-Stat-Signature: jyxm8mgfh5oaqu69w896m74sqb34zsam X-Rspam-User: X-HE-Tag: 1680099272-431812 X-HE-Meta: U2FsdGVkX1/aLNVJpx8zsoUeWwBoiLcpfqfQo6Ff2zed9pwi3QQ3DvOduJ5ZZExMqdYpQDAqf8Men1UT9G1T+4g8rhR3SAdOUb2Oc6rTndvQJrQ4Rjfzn2SC1Qg/X31t8VjqQWH8m9jOshPuSBKSqjSdpVKZfgEqfGzg9MEVJJ4+CeinEk6HS/oEFZvYuMn1LIUsz49CTEP58I9SiJ+z7PHSnncH570beXfcIVL7wdsx3dyzI5MF4x6pAj6fV51hxjy79I+8a6qnmOELAQQ+9dVMCBuRXuZZIYgTtbHc7ALrT9/2R3QXRD1kga7mPBd02vT243EH9T28U4TAuAnDkY8rvO5A2YNXUrip28zkOaYI2ZajA7lYZgBY1DXig/fwrlbxf1SoVPnIbmmO2klCuyEmYVxu7m/C8KbvOoqnBuNoRQWeFP3YxEy1iGxnzsW8VP8Cn/zM3WgI0XIj4hRXLIUCvDbKGbJTK9caH+B3OUCEyzf54QYxYQG+8QF+vj+B8/RLc97qsW09pAKvevntGXlmZusN83skF4TadlvlGXO00TkwERFnbQF4cWJuAZPxYpudrpZmMK1dAPM7AoFmmQZ56JWsYoBgz6uxcoa2XoMyLF0Gelg/iuYosNgiYkb/5c9qoNuSyg9lTD4S+SXIT/p4ijDz+J6BfQd2QqSkN89VMfmE4/RKv75CIHCXUnp175yoIPzpj91c/SJaPQfKqMAsRJF0341ri7eF5fDJ03c6VmdVuz/SNjIAyBHhEB8JyFAUIKQqrjHSbM5Ck/VchxjEP5rYi3grsOWRG16ibScTyZpUhSnqvc5mV5Vn1XzQ2r7YJOznG0UvBOBgF1wCdbNFDG8oeqMsR+Q2P6rw0HMuTzqeZSZ3jflX9bRZO0v0rmuwIpcVwCU+urywA58UfCcmqvZ2AOZjNOiuC7dkuHImswJukgcmE27s7++/8JMx6ACGMpSg1gNz5f9iIAp 3M6EL3F9 uJrut1uOKE94yjQl3DEShzJcCjuDRqrdGwfnjzD4HaKyb+ZM1otaurYavTIMMeshR7gE+cE09e+wsYixvbolbOwnF2sOFTdaO8rM2qA+T6mErIw2oape9RYGkK+RojwHFXNh450Qg05QLIjIWpsadncMRCG+MNaGfgMBWkabtoHF/dnLgsxYmjXMp+10vICZG4I2xlLZFnwaAgCCmCWbIjoujCl9l17KBh8KQ7k0EM0XsYmSdhbsSCeHRHsSfftPcY7Eal5lkc1oYhCoR+rz3aI/qkF318mX4efX0Qo1M6mqDnJI59FfOChxDjDbzSFh7PsAvvbcZZBJYG/DnN0oKACYrCAT0vFkX6bcqxjt5L+hqaszAfiWrtcqTrxAaoxnJBazDzph+ncZkZLwAIKUwsmqjKYi3S5HpEzIaIJOx4+GjZMK96gqfEJofScl6GJ7ieymH X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES)
|
expand
|
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 910b327c236e..6ef0518eb706 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1417,10 +1417,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, @@ -1447,12 +1447,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; + } + if (can_coalesce) { skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy); } else { - get_page(page); + if (!put) + get_page(page); + put = false; skb_fill_page_desc_noacc(skb, i, page, off, copy); } + if (put) + put_page(page); page = NULL; if (!(flags & MSG_NO_SHARED_FRAGS))
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@redhat.com> cc: Eric Dumazet <edumazet@google.com> 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 --- net/ipv4/tcp.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)