From patchwork Wed Apr 5 16:53:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 79813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp454507vqo; Wed, 5 Apr 2023 09:58:39 -0700 (PDT) X-Google-Smtp-Source: AKy350bZgBcf7Zo5lkURo5PIlhA7lgXOq+g2QxmEEpJa04XGY+k+5bXV6weRz02RJA+bHm21BgsT X-Received: by 2002:a17:906:edb3:b0:935:20d8:c3c with SMTP id sa19-20020a170906edb300b0093520d80c3cmr4216980ejb.61.1680713919154; Wed, 05 Apr 2023 09:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680713919; cv=none; d=google.com; s=arc-20160816; b=KRmjFTaYuf85qArfd/huDDjo3Xlx5ZAS7nyMSbG7BQjCG9GUgyV0ReiAv1oxFLBJQn IcXwk0no/xvtNO6dcib0iZVQLNWN6Goc+5ly4G+fjpb5AKvoISmop7WkUiBIGmX/38IV pJBVJtDIZXXPOmDgG/l5eQXoEYRfygHIJGnfk9sXHcItkU2lZ2r8SMHkk+v+V9W6ZkOe r8x7uxIO6qOzzbhMfk5HH4NIaeQB8AuXhdQSrYJf0e001IUd4jpfBAAsOU6zli333p8L tSPqDfm+WkP5KyKoQQKLNT73aAh+0yp78Hr6V2FQFk/KR33SbIv1fX22RGQUTT1wMkTw HDXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LU+EuI1w95foBpvL+MnfTRdJBoeqcZi7esoiDYFHUqg=; b=BHB555ZOBdacoBPe3aTOvKer1/j/MMkJzCVjxrOvbcJPSg23B/GO9I4F6hZ3OBd8oj JWulbELzrmN3/EQfCbieDv8P69hSEgdhXBPvqxilvKqxr6ERA/ISgvtX7JGYzwrC9Uk6 AM2dHWDo0g8V2lNmgjOorhdcZItXjHo07+v9zCRqwWw3j99cX4nULBCkc4wRVD6h2B00 6pk5XC6Mj2Ej8bOtCXi7nDLG2o/towSigUsxJlY7tcdeFWJqS4FJiLKXBv4jMwKk4LFb 7SqzBIhqP/VggwN0L42IOISBHPwotZ0wCQUNzX1Y4psV+LSj4e1ra6iv6ml1A9SdSDeQ ceQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QejeTNge; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pk25-20020a170906d7b900b008ca8e21134esi268312ejb.281.2023.04.05.09.58.15; Wed, 05 Apr 2023 09:58:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QejeTNge; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233857AbjDEQ4Y (ORCPT + 99 others); Wed, 5 Apr 2023 12:56:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233299AbjDEQ4I (ORCPT ); Wed, 5 Apr 2023 12:56:08 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8794E6191 for ; Wed, 5 Apr 2023 09:54:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680713657; 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=LU+EuI1w95foBpvL+MnfTRdJBoeqcZi7esoiDYFHUqg=; b=QejeTNge9D8ptm7U98n1WuZoVuxTK8PO5PUU6W145NXM2guh41Ab3geQ/cpEEQ8ESr2kb3 gdd2vkFxUEd3BmA7riwk3VhzLcWiAgTZAfrdqt3j23uvLsx9U6mjIxNVcsIdg1YNGAxYrm PBNwhz0bwtPCMBjaKmGdhQb/XoWuS7M= 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-256-Ory9MB64PridaGhduckyKQ-1; Wed, 05 Apr 2023 12:54:12 -0400 X-MC-Unique: Ory9MB64PridaGhduckyKQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95935885620; Wed, 5 Apr 2023 16:54:11 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A2CDC1602A; Wed, 5 Apr 2023 16:54:09 +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 , 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 v4 09/20] tcp_bpf: Inline do_tcp_sendpages as it's now a wrapper around tcp_sendmsg Date: Wed, 5 Apr 2023 17:53:28 +0100 Message-Id: <20230405165339.3468808-10-dhowells@redhat.com> In-Reply-To: <20230405165339.3468808-1-dhowells@redhat.com> References: <20230405165339.3468808-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762356278337775737?= X-GMAIL-MSGID: =?utf-8?q?1762356278337775737?= 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: 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 ebf917511937..24bfb885777e 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;