From patchwork Wed Mar 29 14:13: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: 13192544 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 D5AC2C761AF for ; Wed, 29 Mar 2023 14:15:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D64F36B00A7; Wed, 29 Mar 2023 10:15:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9B26900002; Wed, 29 Mar 2023 10:15:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B145D6B00AA; Wed, 29 Mar 2023 10:15:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 99EBE6B00A8 for ; Wed, 29 Mar 2023 10:15:47 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6A965AC301 for ; Wed, 29 Mar 2023 14:15:47 +0000 (UTC) X-FDA: 80622134334.05.E1C2B28 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 5B7FA18001B for ; Wed, 29 Mar 2023 14:15:45 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C2BnMd5z; spf=pass (imf06.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=1680099345; 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=14pAi6JHwU3C53h/ZQrPmmNB396J3kzB8Cmz3sg/vjY=; b=FO5pw6EqJkNexuSwzcQB9IPAg9GHwkfFf8+3s2r98FFP75Bz7mYJz3+IX/AfhznC6uKjQ8 bOD6gmto55AT5tQiIc4axx07xn9yuywJGESRL6psoZ8s0gCO7jenmmBjfeHWXnlIwyueTE XvoZSnyMwIqHbpVmrtmRYf1AoQOpQD8= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C2BnMd5z; spf=pass (imf06.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=1680099345; a=rsa-sha256; cv=none; b=7B1oltq9hho04ejCJD3ryz7HXSOhtRmOd7cE+ge3uphalxJf0fprRjRBBbj1PzyuJMYmhc jmEiQdGU0c6pgdqWmwjptUOHQN+yJs9aScHoIqbkmLjYiL2F89UWjBrzYfEYeCdwUAFgll ys8Rtx0PR0oSevEFeEze2OPtiWZo0M4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099344; 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=14pAi6JHwU3C53h/ZQrPmmNB396J3kzB8Cmz3sg/vjY=; b=C2BnMd5zALhoFoNijhylO+9/hIJjvLRUVddgyVnuGKITVSSg/DO7BDuCNqwkpCgOHQZjIS vdjKvZt1R3kkyR4H8zqrbLbORBluF92XPAeXRNM0vg8ND5OJLSkkIWuMfHgdCopw+gegPK EYLd5WIcaTarQ1ppRR/vKDU2CFNLhbc= 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-618-VHJgX1wyNguGyTVDaKNkkw-1; Wed, 29 Mar 2023 10:15:42 -0400 X-MC-Unique: VHJgX1wyNguGyTVDaKNkkw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C9AAA802D1A; Wed, 29 Mar 2023 14:15:40 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E5D714171BB; Wed, 29 Mar 2023 14:15:38 +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, Ilya Dryomov , Xiubo Li , ceph-devel@vger.kernel.org Subject: [RFC PATCH v2 37/48] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Wed, 29 Mar 2023 15:13:43 +0100 Message-Id: <20230329141354.516864-38-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.7 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5B7FA18001B X-Stat-Signature: r5k44e8kikm156ftyttq8ocgrum3bncq X-HE-Tag: 1680099345-537242 X-HE-Meta: U2FsdGVkX189lIPhUq6YsA47gLNpVrNogj02GPyGzitfPB4rdjUK5C2CYBRHeDZfvzgNH5N4HxwxjlVOIiyh7AfsgI58ptkF02BFgYeNy1OVmlbFgPzMTLDcrn0N2i5jGgJStbiBVDWueI+iqTR/+mP4xTv/FQK5t/DoPzF0TwS1dTfyjWIPpD3f8JeJk6Xl37vIoQvvHEM9cUXWwyOkRVL3qhkf+dsHqTXnonDMHi/cxd8OjSWLcIS7tGhsZivVYtvMzYCwD2m8r5uLUGo8Zoys0wVlVMgn6ypM9gM8HrdpZ35r/i36DliOaxKip/Z0GOmNsIXsQ7YTXbufKoGyxnsjjQR/dp+WMLHbCAusg41SxRi5hJ4ylyhqK8NU9xJnwb9K3gs7qUK4p+PXCoKemSRayPasuUyMVyT7EkL0yYnVRPBtGApS1pNV8+9uai9kmixkVsFbKDd2QIzov12Vx3Wt01rVm7loYUT1gX0oKDykf4HT/XQ42q+The/OfneiEK/ad1PcOVA6IiQg4+nPK26uDaz98PUJ2uS9WejscBkFSfBmBApK/cNIXerBHXu6RSQbOk0/zjC6AbmScYqGJqg4pUJiBAZqccPm8AIDZNSjXdjJlHe30QemCM58tl4F9NN3YJ8vlQ6/Z1wjSLTO8bPpGWklGoccgPwFD/FGRFmhYlHDuIVEheA8QYQbcN+kYc1rP39ZzU15/49+cD2Ip8Ab+suZije5LRmpXjx4t/nYglrDQETLMq+bGknrLQ8xPhlEmv/nAixu9YLKv5skQQPPjmV3SkJ7rI2auaOS4KnKCEvtmuKaz6STwTr/pCs+XpjnWrOiXOVpsbQL5XGfCEdMLFXVS1jt5mdgZH3ii30ejAP7suD6mx+1awo5cgP479OHlia0LEtzfkG5wF/PyYlYMzZMWPcr7EHigd6LsWdqOFaNDIbHqaJ7ZpnQlzdpUToE6IK3tVnpr8jjM+t 1pCFb8t3 dmGW675ea6nKDQOzln+CjDws7HJP2SAYDbRNVjYz8p2aWFp3QgfP1CeAf3W4FAQlXl4+rQiAdDYOkn+YW99+pqssRx8W9GgAkXUzraT7m8Ih5RzSMWYiG1/4HgEtQ7l2bf48NMTW2Z85MNWuPbFhheletmtvm6xxMHw3jpaY6IENuJAIUYG96MF97EdAF5p1MA7Gb7VCkLLDkOX4aWSFg//1r8hQ+6fBCvSYFDIdhE7u3qRtVJSuS/DaUWPKDLaLcfiYvMRp3SeyNTsuIgZtuVrG8Gfu2JyF97ALOOLhCMJudQtOZJAGNrfDqadFU/TH+w47apEnN/Ni3Jnl6JPoDeoYd6SSBc/4jccim0pMaC5dWfq97OONIj/vUB/wxQZnsKD5azuO+guwcpNPQXp0cQMi4Z/eGfydcMzIa06AFHtAYsOgP0dG3dgH34WI87u3+mqHm4wlpqTQLHHM+d52S7wZRmw== 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: Use sendmsg() and MSG_SPLICE_PAGES rather than sendpage in ceph when transmitting data. For the moment, this can only transmit one page at a time because of the architecture of net/ceph/, but if write_partial_message_data() can be given a bvec[] at a time by the iteration code, this would allow pages to be sent in a batch. Signed-off-by: David Howells cc: Ilya Dryomov cc: Xiubo Li cc: Jeff Layton cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: ceph-devel@vger.kernel.org cc: netdev@vger.kernel.org --- net/ceph/messenger_v2.c | 89 +++++++++-------------------------------- 1 file changed, 18 insertions(+), 71 deletions(-) diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c index 301a991dc6a6..1637a0c21126 100644 --- a/net/ceph/messenger_v2.c +++ b/net/ceph/messenger_v2.c @@ -117,91 +117,38 @@ static int ceph_tcp_recv(struct ceph_connection *con) return ret; } -static int do_sendmsg(struct socket *sock, struct iov_iter *it) -{ - struct msghdr msg = { .msg_flags = CEPH_MSG_FLAGS }; - int ret; - - msg.msg_iter = *it; - while (iov_iter_count(it)) { - ret = sock_sendmsg(sock, &msg); - if (ret <= 0) { - if (ret == -EAGAIN) - ret = 0; - return ret; - } - - iov_iter_advance(it, ret); - } - - WARN_ON(msg_data_left(&msg)); - return 1; -} - -static int do_try_sendpage(struct socket *sock, struct iov_iter *it) -{ - struct msghdr msg = { .msg_flags = CEPH_MSG_FLAGS }; - struct bio_vec bv; - int ret; - - if (WARN_ON(!iov_iter_is_bvec(it))) - return -EINVAL; - - while (iov_iter_count(it)) { - /* iov_iter_iovec() for ITER_BVEC */ - bvec_set_page(&bv, it->bvec->bv_page, - min(iov_iter_count(it), - it->bvec->bv_len - it->iov_offset), - it->bvec->bv_offset + it->iov_offset); - - /* - * sendpage cannot properly handle pages with - * page_count == 0, we need to fall back to sendmsg if - * that's the case. - * - * Same goes for slab pages: skb_can_coalesce() allows - * coalescing neighboring slab objects into a single frag - * which triggers one of hardened usercopy checks. - */ - if (sendpage_ok(bv.bv_page)) { - ret = sock->ops->sendpage(sock, bv.bv_page, - bv.bv_offset, bv.bv_len, - CEPH_MSG_FLAGS); - } else { - iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bv, 1, bv.bv_len); - ret = sock_sendmsg(sock, &msg); - } - if (ret <= 0) { - if (ret == -EAGAIN) - ret = 0; - return ret; - } - - iov_iter_advance(it, ret); - } - - return 1; -} - /* * Write as much as possible. The socket is expected to be corked, * so we don't bother with MSG_MORE/MSG_SENDPAGE_NOTLAST here. * * Return: - * 1 - done, nothing (else) to write + * >0 - done, nothing (else) to write * 0 - socket is full, need to wait * <0 - error */ static int ceph_tcp_send(struct ceph_connection *con) { + struct msghdr msg = { + .msg_iter = con->v2.out_iter, + .msg_flags = CEPH_MSG_FLAGS, + }; int ret; + if (WARN_ON(!iov_iter_is_bvec(&con->v2.out_iter))) + return -EINVAL; + + if (con->v2.out_iter_sendpage) + msg.msg_flags |= MSG_SPLICE_PAGES; + dout("%s con %p have %zu try_sendpage %d\n", __func__, con, iov_iter_count(&con->v2.out_iter), con->v2.out_iter_sendpage); - if (con->v2.out_iter_sendpage) - ret = do_try_sendpage(con->sock, &con->v2.out_iter); - else - ret = do_sendmsg(con->sock, &con->v2.out_iter); + + ret = sock_sendmsg(con->sock, &msg); + if (ret > 0) + iov_iter_advance(&con->v2.out_iter, ret); + else if (ret == -EAGAIN) + ret = 0; + dout("%s con %p ret %d left %zu\n", __func__, con, ret, iov_iter_count(&con->v2.out_iter)); return ret;