From patchwork Thu May 18 11:34:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13246567 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 75963C7EE24 for ; Thu, 18 May 2023 11:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EDEA280003; Thu, 18 May 2023 07:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09EC1900003; Thu, 18 May 2023 07:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E812690000D; Thu, 18 May 2023 07:35:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D4441900003 for ; Thu, 18 May 2023 07:35:38 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A5B3B1A0814 for ; Thu, 18 May 2023 11:35:38 +0000 (UTC) X-FDA: 80803170756.13.B622549 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id AC7DC40010 for ; Thu, 18 May 2023 11:35:36 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=a5A25vU4; spf=pass (imf11.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=1684409736; a=rsa-sha256; cv=none; b=dxHd+Zd5F96QC7Scp836gTRtvFVEZSBRwdTTwxoe1h6/x/Mp4/BhIx9sREMb0V6ZxkvIIC f1YY1CMMC0nGgVciZqzBlXQKMwHw4CJ1x5RK1t8CnTakfKt7Iy1ySoy0G9QySOHFfEdzRR MGQc59m1vihXmmUuMl+S7OkAnpDLXjk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=a5A25vU4; spf=pass (imf11.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=1684409736; 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=2EXLlBUI8HMrlq1LdzuePmnE9vo0jChMg019VHUJEgs=; b=mfTr0IlBSv00lNflbQlJlesZUusNZR131JQGSJ2NQ/SfAm0tchHzUU5uAyPh8EoPlU89OK NIEC/jXnMVz9SqOI0vn2x5zyA9cY/G+5T8GEcWKvBXB89Jx57D1JjAOSk8xqMNhywNn0SH S1Cqf0GKsl09xJtCdRRZjFzKfZDCRpI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684409736; 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=2EXLlBUI8HMrlq1LdzuePmnE9vo0jChMg019VHUJEgs=; b=a5A25vU4ox72y1WgqajmPDPLXxBJLanQ8l+VgC9NiqMvEWkJDaOOPujomDYyKT1wDUDbhL rZEie6Lwcr3QSXpKsx/4q7Evf3FytP73UVox1p+LmLqJR0onHXGtpq3zsmXTBFv5Tm+sku 5DhXcp4Poo3QhayFs98IEAeI7JnGlho= 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-84-Mvf0PKrvOkyxjyMevBqNLQ-1; Thu, 18 May 2023 07:35:29 -0400 X-MC-Unique: Mvf0PKrvOkyxjyMevBqNLQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1BF83C10221; Thu, 18 May 2023 11:35:28 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27987492B01; Thu, 18 May 2023 11:35:26 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, John Fastabend , Jakub Sitnicki , bpf@vger.kernel.org Subject: [PATCH net-next v8 06/16] tcp_bpf: Inline do_tcp_sendpages as it's now a wrapper around tcp_sendmsg Date: Thu, 18 May 2023 12:34:43 +0100 Message-Id: <20230518113453.1350757-7-dhowells@redhat.com> In-Reply-To: <20230518113453.1350757-1-dhowells@redhat.com> References: <20230518113453.1350757-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspam-User: X-Stat-Signature: b99okafsig18f43pfb9nc4kr78ow7iqq X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: AC7DC40010 X-HE-Tag: 1684409736-759316 X-HE-Meta: U2FsdGVkX19OwgeZwQ3ViAlYun1pdBWxEGsuH6U7FV/UID4GVp2tkop0ntPw2f/Rg6Y753aMkbwMHOO5HVfR7Ijh1Hab4hBZqyX2hYTknLr4y7xcYent3W4slHZkjz9b4r6GvMeH8KlJ/oE2m+dRl5i+UM9jdHDGJnkAaFYchHcUCmQm4/BVi8ANVF9uVDfG4uSvCGpmQ+OM5HSwpXVF+t6dCIm8AC+3ZdYoCq7d88nkx9yINvmDDY7zqJiD9QPq4vkqROXHCKz5jFVcW0mRZpMjmbB92Ho6JI5d2nbsR0hLHLEy0V4G6V63n2EpPkT1waXC47O0VtqafKB7t2RaGsNLxejqStElBZ6Aae56Iynpze5ln9lFYBnUprOFig5HT4ZzQ1DuHdHv8nrSRZbjNHwrss70CQCtdLzoJvaoqwFHRyJhgXk5XQdiXNiOiFBcAj+Zd5HkIxVuHpbFmjTxRQSj89+Uev/ByILvUK54a6jxQm+yQWy/U1CbISI5WB2PnvzgX5do8nJgFQc+IiolwFggTYZ6Y67yD3+z80SxD4/wI1t9NUreLf0CXT6tASs7X9rXFj3DP82fhIJZGvnQIUssF626WzfUcSzHMoabbpIleFxWTJO8g8/8ruozOr+VTjgTO4JuQVS0F3XjXz3iSxizncBk4zYYrrlgeHBXj5BNqnUeYd94U95kZS8pcM6ms+yM2IVmKDJRhwR45+iY/HxTBI1nH4a8K7coRyXZCjr74HP4PPQoYM4EXw3oG94V9UxKzo+3bPvHiwlv2zYDstoRsLLxID4nP7g3NniE2dorts/Um+aQrHW5rHgq7K3QdJ1oVYgSX69+QnjmIiY+joX1/nya9QM60FXIDleLRu9s/kKD6FKprUVJUrk2gFVbJEv8BLZisL1kQqgE32dNMXNoaDbwZFx8wGoGStjQgWKQraxjzGHTCIIVygOrpZveSizwQSriD5bVLAWw9cu xcDxXkwK WN/XfBf8XPUL4VOn6btCXjW+3pKrR0HnrI5OAJUCr+KOKGVRfbSUf9Z9y4TduDvVwUQdPbV9DYKXwkG7jkRSUOqsvpqjRtUknUWS0LD12epjSqwRlJfelrdWUNxwkI3cjl7ZKSMRWxy7+var52D/zjoeeqfkzZmk7M6x57geuI0Ub/PGF0OUCFowlscsnzo6pFK6lZ8nc+Mq0XCp5aZN3bnKZJsJ36ZoPJijCz0J4LF0kEuuigVVa/8q/+Z8kl0ygZS/HaItvCn3pBG21Z4xz2+fteHgubRZFqJo5C03JK8ftxB9uYtuk+jnRAPghwLMu3Is17zhzW9l73Zq7JWsdlzJYtFvZioIVxyx4/HlzZMhfRuInd2SMEmL8x/dwtfJCjd5+dT6JF4XjrAp39kFIf0sHaDG6auuCdZTDTFPI1XczY7IvCT7Z/sqit+KrR6xB95hun4BYzKm3zFNJ/89MJv79FzV5+yIsfpvbxXbAxImq0rZDPuJmHtWgdblNnuQXkZCnmsaRCrRCdw3bSIoVnr+Rbg16u/fHnUy6 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: do_tcp_sendpages() is now just a small wrapper around tcp_sendmsg_locked(), so inline it. This is part of replacing ->sendpage() with a call to sendmsg() with MSG_SPLICE_PAGES set. Signed-off-by: David Howells cc: John Fastabend cc: Jakub Sitnicki cc: "David S. Miller" cc: Eric Dumazet cc: David Ahern cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org cc: bpf@vger.kernel.org --- net/ipv4/tcp_bpf.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 2e9547467edb..0291d15acd19 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -72,11 +72,13 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, { bool apply = apply_bytes; struct scatterlist *sge; + struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, }; struct page *page; int size, ret = 0; u32 off; while (1) { + struct bio_vec bvec; bool has_tx_ulp; sge = sk_msg_elem(msg, msg->sg.start); @@ -88,16 +90,18 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, tcp_rate_check_app_limited(sk); retry: has_tx_ulp = tls_sw_has_ctx_tx(sk); - if (has_tx_ulp) { - flags |= MSG_SENDPAGE_NOPOLICY; - ret = kernel_sendpage_locked(sk, - page, off, size, flags); - } else { - ret = do_tcp_sendpages(sk, page, off, size, flags); - } + if (has_tx_ulp) + msghdr.msg_flags |= MSG_SENDPAGE_NOPOLICY; + if (flags & MSG_SENDPAGE_NOTLAST) + msghdr.msg_flags |= MSG_MORE; + + bvec_set_page(&bvec, page, size, off); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, size); + ret = tcp_sendmsg_locked(sk, &msghdr, size); if (ret <= 0) return ret; + if (apply) apply_bytes -= ret; msg->sg.size -= ret; @@ -404,7 +408,7 @@ static int tcp_bpf_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) long timeo; int flags; - /* Don't let internal do_tcp_sendpages() flags through */ + /* Don't let internal sendpage flags through */ flags = (msg->msg_flags & ~MSG_SENDPAGE_DECRYPTED); flags |= MSG_NO_SHARED_FRAGS;