From mboxrd@z Thu Jan 1 00:00:00 1970 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 BF634C6FD1F for ; Thu, 16 Mar 2023 15:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BD9094000A; Thu, 16 Mar 2023 11:26:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56DE1940007; Thu, 16 Mar 2023 11:26:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40D7194000A; Thu, 16 Mar 2023 11:26:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2CE2B940007 for ; Thu, 16 Mar 2023 11:26:49 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 00C331A095F for ; Thu, 16 Mar 2023 15:26:48 +0000 (UTC) X-FDA: 80575138896.15.6D5F543 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 3D7494000F for ; Thu, 16 Mar 2023 15:26:47 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G79rlx14; spf=pass (imf12.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=1678980407; a=rsa-sha256; cv=none; b=1em+gigfElt4SNq6vTbPZxG/meayMIwXAAEFs9kkj11X+PFgYedqoESzYEyLyeSSi7ywdL FupcRScU2pa51AvXNVMSXrK6yPDcHrZEwX6jLnOKEtqlrCfdDtSUFeR2MAON3mCJkPf4Z+ mdZY7g35Z+Kb9alxmiA6vGUQsLkrfiM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G79rlx14; spf=pass (imf12.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=1678980407; 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=OLS5n4UNczR7Lntud/yq4c19A8akH99w6SN5hz2uxtc=; b=SiNaJtC+GvvWE+EIJQOFEzAnJJZgtbwpm78hKMBW/rwFD6JOa4yXM2dDbuTVs0dKv1ZA+v +5F8cO7Mx51/SYcyQ0CrAdK1qJCJCmjRL0DpnouvAQq+e8rodgfnS8wMexXuQ21DonMfj+ 8mnwdwmvruRCOBKY6EgkDKwM5fKZvHM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678980406; 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=OLS5n4UNczR7Lntud/yq4c19A8akH99w6SN5hz2uxtc=; b=G79rlx14kSMgRSiToCTS+Zbw1bkikBVAPcY+wFLOs40nnDUhLXpjBfhOk8/82baCnYK2vY s3sYkq8YLncmcwrCmFyo31hZs4QsQv15kprqom4cKun6+RRv9XKgB5k/sFDeSiWsJ8GNTF pS3D6zVpTqYMuosN8pHOPmGmbVh9LmY= 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-391-UMelVK58POioH5w_UJM1sw-1; Thu, 16 Mar 2023 11:26:42 -0400 X-MC-Unique: UMelVK58POioH5w_UJM1sw-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 7F1BE811E7E; Thu, 16 Mar 2023 15:26:41 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 871AD40C6E67; Thu, 16 Mar 2023 15:26: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 , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Boris Pismenny , John Fastabend Subject: [RFC PATCH 07/28] tls: Inline do_tcp_sendpages() Date: Thu, 16 Mar 2023 15:25:57 +0000 Message-Id: <20230316152618.711970-8-dhowells@redhat.com> In-Reply-To: <20230316152618.711970-1-dhowells@redhat.com> References: <20230316152618.711970-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspam-User: X-Rspamd-Queue-Id: 3D7494000F X-Rspamd-Server: rspam01 X-Stat-Signature: 7kp43iey1dsczsypb4pp6k6zmgtu8hzy X-HE-Tag: 1678980407-930222 X-HE-Meta: U2FsdGVkX1+ZFNVai1LBQ6AEAir6cbT75rtBRXHjZrlWNVI/xB/QWqt6pwIwRMSZTc6CUuqyd+WfPRk0HlWkWp1Z0/xHFY8fJbmeBHWnBz+WGneR44SBKOpUjlzOfbszRsEeKRlwMNHEwWXK+lA22ud74aBd/maL8rYCDxO6dcNo0vK2Pvm7aBEAovMWftALAmHGWGjo9qL6hT1M9brEEYtHZSbvKxRIDNfznTRMzhO/BPICE2CWfNLMmhRIX6/BgqVC6GNI6iHVZbmF6oODegWA5nKzIh+79ce0HxO3PHNNJTv03sKXpUonEch5ibSriI35yl/spltsIthy8ixO5VNNRqW2RqpPDeFGL1XcpUbadc2EeRv8pGAdxzQujdK0iBhRB1kbTL4UGuRaKMZB9VCWB/kDXjbFwYDHfU0m5yq7D+p/87K3sLnUoIzHlLTfLORQc5qvdkJo4Hd/Ejb4PO2Fwjw/PITbKWwq82htwKBbLja8P6rIkVGqwHcoFZjM5VFipZkFj+drrZaoIjdFIdBqjd4fiLQRRDUZ/HcdyfdoyofTo60YYWtYVmkWJQKqxmzUm97pq8m7FR1rC7BxC0BXuXXov9dumO3iqGiE5tPr1ycNfQ9cTB4Op2gsHB1qxumVaEkkF7yzjmNES4eyHHplbbrinFfOw1/M5aG/vAHL8w1JWaDL3K4hgo8L+gErHgb52291oraWLM5NsVSKZoqgioqRJb6j/QSRj4cRKTeMLeuaQMVMy56gUd9J8iWU0kH0UA11Fzn5AIUVtOMmkfQt9D+EZ/J/rOFsKWugermBv2fcu7RS8Pp2Yrx8/7T5RWjCs6Ke1W60is66G2KIsnWzxwo9OKyl8xQiYoZfDWGV+VRK3eB4+inGDIYU5fVxL8G0l5Zz/1nG8dz5zU2C0G6KKLkzXJX3xodypXzfAjHxd3O+kgA5SRtU40YXai7p5UYkpQ1jdrkvkJwcwrL xRdZ1wVz rDTbMJRjorC/6Ch0BH/JKLrsO+BixHP7eD38asUo7sqkVwzyox5X3xMJTPu+OywZci375DDM+u6x5zBou6LNbtZc1syAT+m4+BIkh8Xm8TAtV/E3H/MZuq3ofZgFLrN1Nw6SSDDFGGe/byV0kpWmqme3kpk5BED9/dbFKvItce2tBblT29IdiA8+/byCEGYmg78lvP1Ni9DlfG9aNOCdlmcVWOTjw08UV8KQ9Thi+Vkb4kivdMZxWjr5wAT/rKnvUton21h9mrB9Z6LJQAR7Bylndas3lpDa+d3MUsqsnPgN9GKJOMWThckeSibqLwKXStRlTH3KTqaT3zMbpRsAS8xwQB0hqftpaF0D8uindKYMEmUNn/UxOnQQVktEv/a+USiogmkTdvDKVVaVc8BttMDnwvOjfY0Mih2QU1/oMspUFSBflm1aE31IkHZpuPkGGCoyvqg5pQ8BDYTEOEF6l7pFY0G5K1KBHhRqrAG1r/oMcL1DH1zfP41e7uE4G3ioTbeuHxMWp7O67u+CkNPBmQgdGrsGNJjNZdn4bDR/bA7QfuFYPLll3c0DTSQ== 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, allowing do_tcp_sendpages() to be removed. This is part of replacing ->sendpage() with a call to sendmsg() with MSG_SPLICE_PAGES set. Signed-off-by: David Howells cc: Boris Pismenny cc: John Fastabend cc: Jakub Kicinski cc: "David S. Miller" cc: Eric Dumazet cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- include/net/tls.h | 2 +- net/tls/tls_main.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/net/tls.h b/include/net/tls.h index 154949c7b0c8..d31521c36a84 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -256,7 +256,7 @@ struct tls_context { struct scatterlist *partially_sent_record; u16 partially_sent_offset; - bool in_tcp_sendpages; + bool splicing_pages; bool pending_open_record_frags; struct mutex tx_lock; /* protects partially_sent_* fields and diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 3735cb00905d..8802b4f8b652 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -124,7 +124,10 @@ int tls_push_sg(struct sock *sk, u16 first_offset, int flags) { - int sendpage_flags = flags | MSG_SENDPAGE_NOTLAST; + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = flags | MSG_SPLICE_PAGES | MSG_SENDPAGE_NOTLAST, + }; int ret = 0; struct page *p; size_t size; @@ -133,16 +136,19 @@ int tls_push_sg(struct sock *sk, size = sg->length - offset; offset += sg->offset; - ctx->in_tcp_sendpages = true; + ctx->splicing_pages = true; while (1) { if (sg_is_last(sg)) - sendpage_flags = flags; + msg.msg_flags = flags | MSG_SPLICE_PAGES; /* is sending application-limited? */ tcp_rate_check_app_limited(sk); p = sg_page(sg); retry: - ret = do_tcp_sendpages(sk, p, offset, size, sendpage_flags); + bvec_set_page(&bvec, p, size, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); + + ret = tcp_sendmsg_locked(sk, &msg, size); if (ret != size) { if (ret > 0) { @@ -154,7 +160,7 @@ int tls_push_sg(struct sock *sk, offset -= sg->offset; ctx->partially_sent_offset = offset; ctx->partially_sent_record = (void *)sg; - ctx->in_tcp_sendpages = false; + ctx->splicing_pages = false; return ret; } @@ -168,7 +174,7 @@ int tls_push_sg(struct sock *sk, size = sg->length; } - ctx->in_tcp_sendpages = false; + ctx->splicing_pages = false; return 0; } @@ -246,11 +252,11 @@ static void tls_write_space(struct sock *sk) { struct tls_context *ctx = tls_get_ctx(sk); - /* If in_tcp_sendpages call lower protocol write space handler + /* If splicing_pages call lower protocol write space handler * to ensure we wake up any waiting operations there. For example - * if do_tcp_sendpages where to call sk_wait_event. + * if splicing pages where to call sk_wait_event. */ - if (ctx->in_tcp_sendpages) { + if (ctx->splicing_pages) { ctx->sk_write_space(sk); return; }