From patchwork Fri Jun 16 16:12:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13282939 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 E52D0EB64D7 for ; Fri, 16 Jun 2023 16:13:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73C908E0009; Fri, 16 Jun 2023 12:13:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C5D88E0001; Fri, 16 Jun 2023 12:13:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 566EC8E0009; Fri, 16 Jun 2023 12:13:39 -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 42D9E8E0001 for ; Fri, 16 Jun 2023 12:13:39 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D0FA640B5B for ; Fri, 16 Jun 2023 16:13:38 +0000 (UTC) X-FDA: 80909106516.23.BF50044 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id E4F7AC0002 for ; Fri, 16 Jun 2023 16:13:36 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="QOx9/x4S"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686932017; a=rsa-sha256; cv=none; b=vPf3hQFAaIv+JHMZWRaMa6TKw4ZHLskfYgb0tCsMXvwCG80jEfEUhVqU3c/jFc1/lGCs+b xjjvAMos8REjbAoO3b74zRVjnXNxLi+qiyFZIHJLJmSHOWLvUnyr609Jg1L+P5mL2JL6PL rkJGMjj7V3S5RiST9p8d/WO/4I5vlzQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="QOx9/x4S"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1686932017; 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=fSQZQ6YboxRaXsiohOL5R9kf0uRRv2lhrE9A+pyCn4U=; b=BhGHEeS7u9rAM9WAg0UwmyB9nj/AHFYKMoZs/Ky0UioVRyB//zZmAc5MNBawxTwQOueown l4iZnZYa7sf8dm/fF8rsRlKiSXBRWOigdpE9f45n65BNxNjgClMPjM9h20mB3YrdS83LSs +OYjjwek+Eoig/Uid6PAFhPuKHTCPys= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686932016; 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=fSQZQ6YboxRaXsiohOL5R9kf0uRRv2lhrE9A+pyCn4U=; b=QOx9/x4S8JyFxPfvn4MW1bQ6IHWkxkXBRrTK0Dtrn4zxFGyV/jTsti0dk2670x+NIX7JI4 l7DVgZT35dXOAsQjmqiZT7LEPApRPBmRA1RLI6+hIxjbCeJhF3RH8Rrm0e/8rlwJTl9dQO FKAp8GGsBNigaY8oajsK+L6YpXB8Npg= 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-589-6q7z6BCsPgKZv0muxF5mVQ-1; Fri, 16 Jun 2023 12:13:31 -0400 X-MC-Unique: 6q7z6BCsPgKZv0muxF5mVQ-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 37C5B3C0E456; Fri, 16 Jun 2023 16:13:30 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14059C1604C; Fri, 16 Jun 2023 16:13:27 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Alexander Duyck , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ilya Dryomov , Xiubo Li , Jeff Layton , ceph-devel@vger.kernel.org Subject: [PATCH net-next 07/17] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Fri, 16 Jun 2023 17:12:50 +0100 Message-ID: <20230616161301.622169-8-dhowells@redhat.com> In-Reply-To: <20230616161301.622169-1-dhowells@redhat.com> References: <20230616161301.622169-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E4F7AC0002 X-Stat-Signature: d9t3aerxpyr5pjn7asppopcakj6uoryu X-HE-Tag: 1686932016-245677 X-HE-Meta: U2FsdGVkX1+tWM2lMnD+e688w4jcl7XUxo/NwnALxctWCYqUkBuf9yYmWrs3/c9b6+KjdRCbR000vtWSoWbnpXDEQS7ULwsKWuvUMlnrjWPiB6ryO0tk8IWznEhMftlpygzxqUz/CHaovQkpll3QNs7S5tnB1ieYtXcPFihEIUDEJnOinsgOxX/OIxK8s+69lgmegQDsCL1dcGZ6mxbUclvZQ6kPUTX/mZhoqDynYjnA8M7v1aksJ7wfZQnxXaEnU2Sr0+6P7nqCBsFlMyVs586WkZ5Lsp59nQlLh+p9V9sjcBYn6GmBamZ7J5p0aJAwrtcCf09i1jhpPPlCiPNxdHtSIGCiNsEeX88R6cJcuRvM9iQy+eEzFLFfuLInWMiVOiIfeKV3SLN5YNVwpOKostaZJC5rAg30UJ808xnzMO3XRlXUFDMrrAS7yagx1X8U0b5kDIt1sEKrGybD7hq3M9AehG8bdinsPBmfuQJHIeNBUn6dmUpf4ICYLNz1oCryhKm8K74Qk/wsP3csFiiJqV2OT5/uuSP/qqOVOYr92narxSaLxqXeyQjAiV8I206x+oZax9csYA6HW4MN1H65hmXFGZ3AbZ8OwqWUghIYInTbZcnfGNlIVgu9MhI5xVO9SDjidfO6bzKrQqh6Ak4ANZsx0d1Z3VRs8aTXpLe60U/xIjXFH5tfP49rL0V2TIYHHPwR7a6w75+5cOLTHEQOkOSdskeTC8zalTCcQ0gVfBfr3vyrHKPAS2hzvnA8X4IR3HSRp828cmd7I9pTVAcoURm1V0OLEP4tWfsYYWFtCb2xCE4Kru/odpBOUuuLOjXL1kct3DsAbFF63egEK7Ie4pwmmTdTaItiH2YyyqODpU+6JMIvQwVid1+RdBbhO8FX4Dkc3GkEIGSkrDl19efuW5no47DrPdEydAaLyttOuivx/yTzEYwKPvKpMz8ecvc//WwG+rR0FVD9OeDGp7k ALi71AAR jMjxhuoNErB2sid5919D1fdhnDZBn7tjsluadnK1QzwuonmhrJuy0Uc/XGSNORT73inpwp9xq5nloUqtMljCdovHbh3v9UyXWjFG0DDkGL8Wb8pJLvWbvadAobRjHTTeKMJF8BtnubXAX1Pz5ebkD00jOBI6JFz++ud4YfMH1hGMvIvI2wJA32JZcgsPuNbgiwuPUI6Wah3eouD2Qg9bClraOzydc0fGCNic666no9IkES1f7DC021c9WWYwyNFiu9xS+zHXJJ4FLQ4ISODSJB2/ePrRjtGWbAtxgkQgesWXtzzQ2jt4UsrhpKv6r/uD+zKYfEm6CNYLCWAybe21FML0MEJ03qgznTbHmlWimkKHysteNNhOwEfOUcVhMfLYgj5Yh47Gdr5XSO3bh/1u/53C5n4Nsj5RAEWTEvs9+rwGXzcEWwrPVJocf2CVQV1+SjJtHExJLgs07Ke4CaJ2+GaAWY8HkmOWyuUVhiZaFYL9wg3cnM+G5ai2ewmleoHooBHkfO82VTePD1Sc= 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 | 91 +++++++++-------------------------------- 1 file changed, 19 insertions(+), 72 deletions(-) diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c index 301a991dc6a6..87ac97073e75 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. + * so we don't bother with MSG_MORE 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;