From patchwork Fri Mar 31 16:09:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13196206 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 B8804C761A6 for ; Fri, 31 Mar 2023 16:11:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C09A6B00B3; Fri, 31 Mar 2023 12:11:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FACE6B00B4; Fri, 31 Mar 2023 12:11:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C23E6B00B5; Fri, 31 Mar 2023 12:11:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 69CD06B00B3 for ; Fri, 31 Mar 2023 12:11:32 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 245EBAC25E for ; Fri, 31 Mar 2023 16:11:32 +0000 (UTC) X-FDA: 80629683624.02.A671044 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 76BAB8002D for ; Fri, 31 Mar 2023 16:11:30 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jPjcc3i1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680279090; 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=CRURXkmllA2xL9ieN6VZi0pqT7oVjlTYx8+C8SGfzXvC/tvEPkwAE89x/IJHEhtuZ+9v/A vE57bPuGNg/RTnwSiU6lIqiB4MiXf59CI/U99qIwEECGtaOuZHxlEILZO+X4bdp9NVj57e 2HWUK7JGS9U2GWcePpeLbkfvdufriFA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=jPjcc3i1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680279090; a=rsa-sha256; cv=none; b=NkzDMQf0i8kbquewqvKyS5i8vMamqRmaUL1Pg4pIVok+qYI3bLecGJ9qv0Azml/PG08EQt wNUbJZjAWqtlK0ysT8tWWcXDJkQ1Jr5i68i9R6y0k2MgCVwmIiBRynAmvblukEKqHSMDqF bQ1RwqeprJgeWrM5hBWTZv8xTDHQ4ew= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680279089; 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=jPjcc3i1evQtTAfzlejbvELJyXK2x1P/+PmqqsAPppTlzdbex5aGg3RgdBvgEy73fqfNXE glt1gDYzcUPgvkYTnF2g60vEQ8LGL5woeNDlp0gW/HOCbCdMtYBf1PWA+AA5IKcYKodUZT rsWtxjSxHCey4Pgk+AkE2s0Z73mcn0U= 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-186-Zs9E43zDOwakJiLhI1Mt6A-1; Fri, 31 Mar 2023 12:11:26 -0400 X-MC-Unique: Zs9E43zDOwakJiLhI1Mt6A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A289F3C0F383; Fri, 31 Mar 2023 16:11:25 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D14E2166B33; Fri, 31 Mar 2023 16:11:23 +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: [PATCH v3 45/55] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Fri, 31 Mar 2023 17:09:04 +0100 Message-Id: <20230331160914.1608208-46-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 76BAB8002D X-Stat-Signature: zm1ertntkbki98ek4tsz6tt4ng9g3gmm X-HE-Tag: 1680279090-498620 X-HE-Meta: U2FsdGVkX1+8DcCKZm8h4pwZ1MWlS641aPk0u3NSkcwIIFz1q7bNqT/VCy/JPEnrvFGMejIETwQPOkdWuSRw5MXo7ZtkdwBBYni3TRbrroTLATrlzoXdFdyHO6D19G9V7uJ91oVNK3CKkwoGFUJ51Q/vKse7M+Gl3FkdhOYW7+Sp/6YV2b9K7yvbAiZ+hHdTDyX/Z9Cqdp284RcGwPsffV6gO97/Hb7fsi2mJd88S//ZIqug7GNnBL1OBT5ZZ65bc326kZB+93Cx6pTg6uhgLr74VSqOtNqtkeOawGxpQnLhOiyo3CJHFwW17HfdmIzPsETLgCX6rO8C8rlIwOoFwjJjwGia7zd8GbF38lxfqj0ifiB/x163amFWGO8c2RaTnmDcGkjCwLLMHFZTuJKShnHV3Bmqb0b73m6xncd9xtWxj79+wk+f8Y7F5YwzD8z1XN17oyerErc56LaymUX8yo4gos2d9XZp0afjz7eM5Wmbmab5KzOM5mrHfhAHJCqrf+4pQsY0H1rp6PnEJKndY8qWc5Swlthk2aRvI1x+SEBhHyZZMh2nqpruK4MekNF0ipHDKYVhj1FF/J23kp0HlfLBJNaizPRbUGII3DRvnOa6HsNg49RbG/HjAzFYPtEnoJ0vfHJU4luIDea2xdb7EQ23U+B26n0dlRCdFEi/dpN95DsyWevEUjh1KH8ZfN/4MORqnXHTzkeZd4XNQQu77ALvBUAbYG+0j5G2fLboPg43taPa419l56W4xywN38dwrJca8qUTgHN2E3JgUbn+pbKK1I87LlaVV8hmgDa07FuEpd20fLaHxlQbdBCN/2laOjjaxVtEQ7KNm7WapX9HU5lQDkB/BTaSZcH5pbmgzVLtn4kF6Wb43FQAv/S9NdmqcZr4iqZx0oHF9IkNDuRJ5w9NZlQBq5zHjoS6pLFD/U9hL4YUfiwYPn3cBcOo7eLufldrPLLj0fytqBFkPwY CF0y+oUQ tR6mxRl7jF72A+ff2lV8OreheFbBF986tP69hwvL4G+5FVH6bwr5AmyAXrCjs8pWzLLJIGy9REKi0+xF3wEnOqiE8Hi1WgB27vwriXLfcVUWPA+nxh+09YbXn5U7agq6nGUDbWz/AgNxW4Uy+YxA0GgvykDv/tGDFR5quzw4GU/qPSdFpRjNHGOIyqgyMc/K/h0Q0H5zAH8ih1SR7ZVhw6rLgyQi1Enh+qoJmnISBgeVkJZb7n1ErI9LXlb7VhqhBOwJdAQgottmZLEMq2E6eFxubM3YkSYLRvSQo2h0hRWQn6qBykE2imoTGmFmLPc1YSR9hXa9lIpjK/l41S4hNaY6czKiy93i8/0QPHLGFhUjYnTqGsPv15Rl8ashwTs0tstTP+x4eJJszVObgDXUxgyFLEoua3aoRI9F2/NF6psGi81trdAUxtCBXyZyKv9uMJgPsO1XZSmQOP6cPs8KaI+JK/A== 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;