From patchwork Fri Jun 23 11:44:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13290403 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 C4F55C0015E for ; Fri, 23 Jun 2023 11:44:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42A5C8D0006; Fri, 23 Jun 2023 07:44:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D92A8D0001; Fri, 23 Jun 2023 07:44:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 252D58D0006; Fri, 23 Jun 2023 07:44:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 172CA8D0001 for ; Fri, 23 Jun 2023 07:44:49 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C7808120EF9 for ; Fri, 23 Jun 2023 11:44:48 +0000 (UTC) X-FDA: 80933830656.03.C860D8A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id F131518000C for ; Fri, 23 Jun 2023 11:44:45 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="GwI//IE1"; spf=pass (imf24.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=1687520686; 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=fA1o71coQXQ8If3Yc4lrUFAQEIUI0BOPMvf7SzyrGYWRToXiJY49efAh5ISV9CagqqK8h4 YXQKFv0So3LrW+Cq3akNylTWIrfwrGxHc/O2pPShRLge6GhpQXDMGIL2wV9Y0ypePJUEr+ EqfOiH+ZqLf1IdP2w2c5NMISzV+1WqA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687520686; a=rsa-sha256; cv=none; b=drL0DBlHJHqJ1CoZrXfq7dKSHnp06YmVOzFVlak9jxLLz/GxCBSMP5V1ZYfDB04niTF+gP rzmiDektj9wecDGVu2P2RpmVs2vvLWAGF+y8Tf/SFRPsAhdeToXrZyxrl9UU6NWYr0upTO 3hHXJz9sj4IbYaGeGwlde7QLJCsUpYI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="GwI//IE1"; spf=pass (imf24.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687520685; 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=GwI//IE15xq2AWv3QmrtNM4n3JxWoafMnGQtH2ewwG6v397CRr2aam3P7K0sHQoYBo6Pba /V7dXwkbpltqArLfscW2Kolqy+scY8E7GohDO07zZlkN0kHzi2nu/o6HsC0aAiRi18Eoui YoRzMb3cC5Lw7XInGIpu3IsN9Or7USk= 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-642-5G0_5PVBNSa9A5rtzK9tkA-1; Fri, 23 Jun 2023 07:44:41 -0400 X-MC-Unique: 5G0_5PVBNSa9A5rtzK9tkA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 090B828EC10F; Fri, 23 Jun 2023 11:44:40 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D0A7492B01; Fri, 23 Jun 2023 11:44:38 +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 v4 04/15] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Fri, 23 Jun 2023 12:44:14 +0100 Message-ID: <20230623114425.2150536-5-dhowells@redhat.com> In-Reply-To: <20230623114425.2150536-1-dhowells@redhat.com> References: <20230623114425.2150536-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspamd-Queue-Id: F131518000C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5psq5qib493a1n8ncge4c96k8pc57gwd X-HE-Tag: 1687520685-557191 X-HE-Meta: U2FsdGVkX19rW9+txeYaCYTQ1ImZNdsiUEqlsoj2eZPK90OD8Y4X0Ckqhj1+zzdCGLYezqj6cgpHC5/9/GT081NC8Ne9ytiotGouBH9z7U0mSeiUw9G3l1/hjIijUZ6u82itBxRS65d3Wsj+h5W9pCZihPHEGOuVQssEtlGlMNyl9mlAkHJTcDVmYFjfzAd5aDDeyFAAju+g5RMlf0F946Y6LCJtmgNZkXigOV5lqP2/N1claxLSN20gN3IRg9feE6CTP9g401IIsA2RmrNcgOf1fKPFlQtgLX+ZR28F2sfSntKQvCAFSdJoK4NGo2S/SC2wNv6vSRDlmKTD/X4KFzugWlvI/4Al297a6C1fKpZ14K9FXZ/Hw5buXphLGwpRTXyrjF8LKsGN2QxkOCXh/6JxyRUDcu3xpYYGPKqH4h0swCk1Cqxph44ZVMETx5UmA0QB2oGMeT/XCYmWk9EIvKpuMei2wcxdzTg+Nbm7NY7WO6ik9ZDZuLeQq2qzVQld6JYeLiEphroG8JwsIUabxKrU/HGK/+bbO/h/IU3aleylFSUNaiauoPvml5h44pkqyEIeSlmaefynWPziw3iKoylv5WwtOxpUb27gtby3KYTLrn0X+TwQP8AzY3dx03mqcYDFqDLIVE4e507gJFcoFJ/XVQBS8D91jUepAvUZvB3Wipvp/fPR0rZaMKUnoLYz/CatczWlzdfC26+ZThFJw8YJXU+r32R3q5ylKid4R1ShGn6LI6cBVLvkNxGeUGDdiyfWv4D+/JgN4pnT5puKPT5uaeL1AOjxy2WKUAuMogCB4af/DDlLQCoqZe2z0r1mHmZPdtBhlYOsHgPk+Y15CNx8uab4Z+1RHzWFfjlKWyLKJDIrmBtUdGYnptJ2K1y3xEn9hbvXhyi4ylYeCT/k7qNdfKWxvKtGYvnXhDobrjomYq2Y9EwGkOY1PDC2PuVB4rUbGbc/HcLtiYF2++e LEU68XBw P3Sh7gVyTQjA/PiXcvnS8TF7eOAUl/jAl2Xt8QnMI6HOkBauwNf/w85qbnYKRwRZZDJGzRuX0yi8IcaDBYjHtpUEfWmJtyyEzmrgcpNgTlxGiGLijt2p/5dFN+xp++b1CSv72kJA17rwALfW0g3o3sMPKuomzLMcH9YsyjZMQ/O9tuc+8HZVZguPlFj7G2xQ/ODbQyVCNLeQroA8NT/SsdI5UjH1r4DOSyco6Thq0E0A1gIZicHbGbBcUyhX71mNqTEkpXrqplpfapeXjs7wV9Pw4TMgobW779acVqLl5ZUwe+PvrpIbECs9Lqh0ZAeLQBuhkS5MiEQhzL9jV16r0WRaLcgm3UTuAZu1YwJ/WWCLjnEvhJGT1D9ZstUNr57KjD0DV0cXazoPYZ3N8kMPByWW3QMPSH+ajYyep0SxpirmsBpvS5blPpAqE5YMvQll1yfyDB9f3ZClsAeLuy2LqYQG3i+wnD10sHmSKq8mc1Ek5+0g84kvZf7lt0+r7CgaSlL23AEK+tes58vE= 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;