From patchwork Wed Mar 29 14:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 76627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp461613vqo; Wed, 29 Mar 2023 07:37:18 -0700 (PDT) X-Google-Smtp-Source: AKy350al9+UuS8+vZeb91WfVZ0x+pOSaYYncIleuxELC2rSwbRRdxslAUH1Y/J0R01Jq19QESPFc X-Received: by 2002:a05:6402:757:b0:4fd:c5e:79b8 with SMTP id p23-20020a056402075700b004fd0c5e79b8mr19878129edy.32.1680100637882; Wed, 29 Mar 2023 07:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680100637; cv=none; d=google.com; s=arc-20160816; b=XFh7GAZ8K3BUiMlOyZDWQWDj/FsMaUX7UfUQVW/pB2qrfmB0B9WX9SPIx+71U0KVK+ u+ERLq0IjZiy7B3syPv0MeCPAUpmKNHDE1qww6C2eYxKhxpR0zGmY+T5PgK0YP0xFbu+ 23vDuZVDdmpJakz3v9TFSz+ZmNWibr7pwefB61ZG0NQfQql3g+q90XBnsVLTblA87VGO krV+aeQ4dGlcSGVrfUjZVichm4hHsqUVraO9XXx/5+sMZ1hB/+aYOejboq1FdPkE74bh k2tPomEecOC28oYaOh1egr0GCS2b+KzvfStyyJf9XDW0izOmMODW+rERp0l9CYtPMNZD KNFg== 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=Bb5tuF13A7AUAmGHrtoNc4Ue+Am7P92yBHtRqoRTTps=; b=pAU+ot8yBeYoUrDWAvK1t8ILCNAeDnoK08cRPn52DBcLyXrnhszdhUE7jVpF/U3mTx uE+lDyxxDZw5Auk6kLad2+3UVmU7udF2ZR38suEdeZa8E3m7mFKuLLKWu2AhFyREEEHB JnFqCPxQ+fVO+C5VxL3JgqydvJqiflcoGQqS43wWqJNcfHnFmoS0gShjMji+YodNbUVh JffSYzguxT8UQ7Sbs4gag7VI6RhvOkXB0cdwZ6/aNR5sm0jsUK8dnQwuBtEboyWPQ756 nwVCnhAQrtbuDMm2KQ97kIkf9dO/DZ0uGLZOwA1EgyBFRznIx22MQOMeZBx7AWV+x3L7 TAkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ITtQfFbs; 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 w4-20020a50fa84000000b004ad6d2941efsi34659893edr.478.2023.03.29.07.36.50; Wed, 29 Mar 2023 07:37:17 -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=ITtQfFbs; 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 S229638AbjC2OR5 (ORCPT + 99 others); Wed, 29 Mar 2023 10:17:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjC2OQq (ORCPT ); Wed, 29 Mar 2023 10:16:46 -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 13F144C18 for ; Wed, 29 Mar 2023 07:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099286; 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=Bb5tuF13A7AUAmGHrtoNc4Ue+Am7P92yBHtRqoRTTps=; b=ITtQfFbsMu0vDog1WqpiWDXO4zirdomQ4CJNgLGfWMQSzWuhQfG5wemeYuhpQ+C9xtYjAK 19d2z0Y0kYUzkAO1j1SxzMq6pUsEHdaw4KcYgEJ9wUAewIU8o5pGTEzIiqClYqBFBYg4Xg bC3jPHsoH/ReVk/+XtvJ0TTAHKHgeJ4= 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-558-1vALR20tPYeGhBQuRt7gLg-1; Wed, 29 Mar 2023 10:14:42 -0400 X-MC-Unique: 1vALR20tPYeGhBQuRt7gLg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D8F81C0758E; Wed, 29 Mar 2023 14:14:41 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59D114020C82; Wed, 29 Mar 2023 14:14:39 +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 , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 15/48] tcp: Fold do_tcp_sendpages() into tcp_sendpage_locked() Date: Wed, 29 Mar 2023 15:13:21 +0100 Message-Id: <20230329141354.516864-16-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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?1761713206801810560?= X-GMAIL-MSGID: =?utf-8?q?1761713206801810560?= Fold do_tcp_sendpages() into its last remaining caller, tcp_sendpage_locked(). Signed-off-by: David Howells cc: Eric Dumazet cc: "David S. Miller" cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- include/net/tcp.h | 2 -- net/ipv4/tcp.c | 26 ++++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index db9f828e9d1e..844bc8e6a714 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -333,8 +333,6 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags); int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags); -ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, - size_t size, int flags); int tcp_send_mss(struct sock *sk, int *size_goal, int flags); void tcp_push(struct sock *sk, int flags, int mss_now, int nonagle, int size_goal); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index a1c5a6d9419c..a8f8ccaed10e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -971,14 +971,16 @@ static int tcp_wmem_schedule(struct sock *sk, int copy) return min(copy, sk->sk_forward_alloc); } -ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, - size_t size, int flags) +int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, + size_t size, int flags) { struct bio_vec bvec; - struct msghdr msg = { - .msg_flags = flags, - .msg_kflags = MSG_SPLICE_PAGES, - }; + struct msghdr msg = { .msg_flags = flags | MSG_SPLICE_PAGES, }; + + if (!(sk->sk_route_caps & NETIF_F_SG)) + return sock_no_sendpage_locked(sk, page, offset, size, flags); + + tcp_rate_check_app_limited(sk); /* is sending application-limited? */ bvec_set_page(&bvec, page, size, offset); iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); @@ -988,18 +990,6 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset, return tcp_sendmsg_locked(sk, &msg, size); } -EXPORT_SYMBOL_GPL(do_tcp_sendpages); - -int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset, - size_t size, int flags) -{ - if (!(sk->sk_route_caps & NETIF_F_SG)) - return sock_no_sendpage_locked(sk, page, offset, size, flags); - - tcp_rate_check_app_limited(sk); /* is sending application-limited? */ - - return do_tcp_sendpages(sk, page, offset, size, flags); -} EXPORT_SYMBOL_GPL(tcp_sendpage_locked); int tcp_sendpage(struct sock *sk, struct page *page, int offset,