From patchwork Thu Mar 16 15:26:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13177821 Return-Path: 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 820CDC6FD1F for ; Thu, 16 Mar 2023 15:27:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C75E900002; Thu, 16 Mar 2023 11:27:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1760294000A; Thu, 16 Mar 2023 11:27:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0AE2900003; Thu, 16 Mar 2023 11:27:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DFA2C900002 for ; Thu, 16 Mar 2023 11:27:29 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B8CD580B15 for ; Thu, 16 Mar 2023 15:27:29 +0000 (UTC) X-FDA: 80575140618.23.AF19311 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 007A94001E for ; Thu, 16 Mar 2023 15:27:27 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WF33x7wE; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1678980448; 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=cLmy3QT3PxPcXOXP8Tmrcj7ottmHeL6VPbhO66kxXIU=; b=0ks1VeBM3NNAAjx3zCO6vcBR2wdU7ovGgyhNcbWLMWugalgjPT9btuVA336YJsWu1+JVcQ o+hIT1KWvoGVOXd6zGzgDwYxA9VRu9LKLb1VOhQFFXoijM1pa5b6Eu4ntX5GVDyhQiKsfM T/scFo+TGS3TCbkNJnsAt/95pfwE7b4= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WF33x7wE; spf=pass (imf04.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1678980448; a=rsa-sha256; cv=none; b=NZZpVTJG0tSjJIuFvGATU8a93rk7uzIN0smhIJ98tblSmNa+tXdFc+wnwxSxcc4Y91owDG ez04TpiRaKdNDHWwBZf97hmjSRD90XQiUF0vg5cEuV+89nTrl/18ZTRmm6h4F3HOSLGO5b z1Jy2xzZjG2wfHitjK4eqBPNYXuoby0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678980447; 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=cLmy3QT3PxPcXOXP8Tmrcj7ottmHeL6VPbhO66kxXIU=; b=WF33x7wEaldYAMrJeyWUYUhceMAM0aarp7Fb7ZgIaebEjI+5FM/aYMj5WPnyx1SHlwYYjv hBbz3p3mzxVqif6zd0k6gQMc9/lHMB3I4GRmJnScg1kBd16Gak1v0xt9DdBInkm37zp6pa hbEjbV4xhnmdZykZvT9mFimKOHXX3UE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-531-HxkbzJbbNIOwbn5zC8ZlYg-1; Thu, 16 Mar 2023 11:27:24 -0400 X-MC-Unique: HxkbzJbbNIOwbn5zC8ZlYg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 684F938149BF; Thu, 16 Mar 2023 15:27:18 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 521EB1121315; Thu, 16 Mar 2023 15:27:16 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, John Fastabend , Jakub Sitnicki , bpf@vger.kernel.org Subject: [RFC PATCH 21/28] tcp_bpf: Make tcp_bpf_sendpage() go through tcp_bpf_sendmsg(MSG_SPLICE_PAGES) Date: Thu, 16 Mar 2023 15:26:11 +0000 Message-Id: <20230316152618.711970-22-dhowells@redhat.com> In-Reply-To: <20230316152618.711970-1-dhowells@redhat.com> References: <20230316152618.711970-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: in5iopwds878hrdx576detogge3ifme8 X-Rspamd-Queue-Id: 007A94001E X-HE-Tag: 1678980447-868384 X-HE-Meta: U2FsdGVkX18ySqVZkjcTcuw7hsA/yv0HfB3/wpOjcBvdNma1XTlA7UQx2ClOFuhKI8qKDIUmdN3BMjMs3jzfIm8APqLbcEKB8aPdjKOAa2HfVXocdKyxNKUWRnau5vMI8Dfd9toy33BrvGS+HPZ+8PSKBiUnsgFfHtixKDPIa065Y6wzKXHg9mb+Hbxn3ev3Rm6jDtbESvCAx72RMGP5QucsiYHbVfQBH8vnw7DdcOiogrAqTSktvvWcyXhUtjfrVJEmux/B5MCkBldW0+NrsV6vS1WCASj5QOQ6O2ELdz8oIj8jjcMjvBOq5mCqEm5mcH9KsBz5qXeSTNjK8C7UUhTVMGZIRBSZ2ZdX8CyCGg+kGa5NtGWp96lv1HDdsETK6W3wLq+9V3BIwoTIRyfBANyorwmw/4hzQl4xlEymmvS0r8R9HIulpHHTcvNuTeVCFex+EVKEq2OkYQ1BrYjen3v+sqmX4TWgPwmcAtiQ8TYtfbI5Ej3hhcoQLi/l9+YdYLdeumCD1n6/VMnmsDorEkRzvjZxKsJgRX9GRerMw40Dchk6mSUIZPe9ZjsJndTncqTuvWNhaer2N5zCVgs4ladxJU61PtngzFrSmbAxQVYKQcOJFLKD045CheM0NEasBG1IejY8XjGspfAsCJ/ScyDbapy6roN4Wcdhk+p5nS7lF6GlCuJrqPcpZj8zwMqlfWZ4bVxwAO0IHs4FtgnuKLe/iXphMX8dCkNrjXPertNO9BYmAvy8Yj2kl/1TqibemI/s9kpuyfkJC5Vq67yEne0tGpV+opVMkWUp/+j0ozZgny6+rTjXYhkRUfRgEY1Kn1svDCoI8DlekdHq0LGQ3FHhkimmOyycvIcmjamixPKMR3IB8SKTXdH6n7esuG5kNPR1YvNd1onsY0H5yFrUgvfsLu+SNcwrHEi8yEt2UytNuLCrbGv/WAo5R5LPc/9W7WZ2u6xlMPco7nb5Jdl GGIyUfGF q+QoP0/b2H1q8i/GDN+IZiwZsY47Op+gU2oOz2r3VR/UrTyeSSHWhKzUhOhIWPexFBHxjeg0hXM8yj6qDwqyoUkoO1wg/hhMnqaO7YDATxIEod7WPZq5LSl4e91R5SbVcgWcW+vbS3dyU7qY/V6mPNqieeTpqi+WDh+DFC9KWchEFFHdWUvaYcy5+Bf85BpbHZUxJPf4+/p+U+tdxxtpfUEXkBCNYveJbpImY9OtxmpFdSGVH4oYIzmjOdwyCpPJ7xQD3AgBKtlW1Pm9W16NsbzLgqmlkKUmcZWZCpkDRUt4JKTR3QPof25mZ7aYdX/Vjs7MYO68s2r41UqmNHx/dQNz1JkZW48Z+jFDf8BR8wTA/YPzAKvBc800/z+tol6hDI8RpujWFY3HkFzEeb+5Li0+g+qYvQXLfQJ1fcMmbxzigGwDO70r2AAQnZ8bhzcYlPgKandl52uTA+rRiQbx3VpJCSkfh1sp38VSTxQZdDdR3w89eHlZxQdCtcPhZaal8+IHKUZz9RYJPTHIH464vKFggJCJ+jGWimxASWBGv7Qn/JRi97uwdt+/a0w== 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: Translate tcp_bpf_sendpage() calls to tcp_bpf_sendmsg(MSG_SPLICE_PAGES). Signed-off-by: David Howells cc: John Fastabend cc: Jakub Sitnicki cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: bpf@vger.kernel.org cc: netdev@vger.kernel.org --- net/ipv4/tcp_bpf.c | 49 +++++++++------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 7f17134637eb..de37a4372437 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -485,49 +485,18 @@ static int tcp_bpf_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) static int tcp_bpf_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags) { - struct sk_msg tmp, *msg = NULL; - int err = 0, copied = 0; - struct sk_psock *psock; - bool enospc = false; - - psock = sk_psock_get(sk); - if (unlikely(!psock)) - return tcp_sendpage(sk, page, offset, size, flags); + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = flags | MSG_SPLICE_PAGES, + }; - lock_sock(sk); - if (psock->cork) { - msg = psock->cork; - } else { - msg = &tmp; - sk_msg_init(msg); - } + bvec_set_page(&bvec, page, size, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); - /* Catch case where ring is full and sendpage is stalled. */ - if (unlikely(sk_msg_full(msg))) - goto out_err; - - sk_msg_page_add(msg, page, size, offset); - sk_mem_charge(sk, size); - copied = size; - if (sk_msg_full(msg)) - enospc = true; - if (psock->cork_bytes) { - if (size > psock->cork_bytes) - psock->cork_bytes = 0; - else - psock->cork_bytes -= size; - if (psock->cork_bytes && !enospc) - goto out_err; - /* All cork bytes are accounted, rerun the prog. */ - psock->eval = __SK_NONE; - psock->cork_bytes = 0; - } + if (flags & MSG_SENDPAGE_NOTLAST) + msg.msg_flags |= MSG_MORE; - err = tcp_bpf_send_verdict(sk, psock, msg, &copied, flags); -out_err: - release_sock(sk); - sk_psock_put(sk, psock); - return copied ? copied : err; + return tcp_bpf_sendmsg(sk, &msg, size); } enum {