From patchwork Fri Jun 16 16:12:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13282937 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 31614EB64D7 for ; Fri, 16 Jun 2023 16:13:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C48988E0007; Fri, 16 Jun 2023 12:13:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF7A38E0001; Fri, 16 Jun 2023 12:13:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6FD58E0007; Fri, 16 Jun 2023 12:13:31 -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 9518F8E0001 for ; Fri, 16 Jun 2023 12:13:31 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 24909120CF3 for ; Fri, 16 Jun 2023 16:13:31 +0000 (UTC) X-FDA: 80909106222.16.616504E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 433DF40010 for ; Fri, 16 Jun 2023 16:13:29 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LpNd0KDr; spf=pass (imf04.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=1686932009; 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=1DmsLXNf6UEopicQGVGHzvB3R+Io/k4xNBk1zidfJPQ=; b=Q53KrWJRhKLk6k0IUG4gL88FTN/zAen2jPaT/f7gtdyfC71/udMuvq4m1khHcDesjSdQPp wqu5X+z2Ye4+E0nDiS42Tnv4R2Hfu+ns4vqC25sPLZnJcMTVMjiZV2cIlDLu2vSdKsqz/r BklrUMInQ5MQw9mMyMFnEUqTAzqSw8A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686932009; a=rsa-sha256; cv=none; b=PxEkYbQtBMGSknqv2SXQSYi/zmpWD1xWocmpFgUCmlNusYtVQ5XVHmQdD1dJ6adzh8AAy3 fROnXpoOAMvRVtNoMonCbXGONYUpoC5ZJDNrxdX4xm13VSL5wBRRDaU/VVzDhi6RYUy1eS mMHs/FnELaMc7Y1L2Tr9oqWW+yGMcsQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LpNd0KDr; spf=pass (imf04.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=1686932008; 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=1DmsLXNf6UEopicQGVGHzvB3R+Io/k4xNBk1zidfJPQ=; b=LpNd0KDrEnGcB5qD4Hn+p9aL4KNHcVf3+pQiLD0qC6Q9Zwa287H778fDxYVKcGfjMmhYuM woil2FORuWBn6Fl8NNlFa1OfQvb1+qgQ+vKba8kXJQwsUdbjKAvS9TK26+VNrZiZjqPUeP PIatEpM1A6D5KvEBhMEoTsEyI+lBb6Y= 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-280-lvR3TEYCMuWBlcKwIOkPGg-1; Fri, 16 Jun 2023 12:13:25 -0400 X-MC-Unique: lvR3TEYCMuWBlcKwIOkPGg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70E1938041D5; Fri, 16 Jun 2023 16:13:24 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA8442026D49; Fri, 16 Jun 2023 16:13:21 +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 05/17] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Fri, 16 Jun 2023 17:12:48 +0100 Message-ID: <20230616161301.622169-6-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.4 X-Rspamd-Queue-Id: 433DF40010 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 3o7d7ixqbss3eb7dd665t4bs9b9aph5w X-HE-Tag: 1686932009-639340 X-HE-Meta: U2FsdGVkX1+GwXaw555yW3C/quG0DxrM2f6lJPgrGh+b5jinxlmh6vlXmLlKHUDBEQUfZA4tYcCQYjRlihyn6Gwpz4rXh1lgOuQEp3H5voyuukQPTQxz9Wf83pi5EjFunNkoPyjpcSa9fdoGaHjsXl9aTvwr8D4DSy+9Jf6v/tu8hQ2b7prfJk57sLbta50lU1iT1yEYpaQzt86v1Svihj9anXM5pmfzTew7UWL7C0l1R7NCw3EiNAuWraA7H7X6hh2BXWY7nLf4JNvfukgzKqAPn/NVDNeIP2v/zCjRZA3Qxoi386IRrHf09IUxnt6C0vyQeeS0larVh3illgVwX9NwxZe8SPzxNoS1HcoKM0I6zl4NtcJoCM8XII36oixgut7GBJC3J4NdNHNMQiW6FRmYg9vR4/n8fNPseFdRU8rRCpdxnOsntGMYHpO/I+u8TpJ/cqS1ZMi0OUIHWBmUmfJneo8eYFKuqiWvokouo9oZZLrmrq/zEnk1YNCZySmnBi7trHeNW4yUZJyPzSM37L5b7a2jA6GMckTxEETXD1rkIiNKEh8dBLWuAWn7hmreqjyhRGG92KtQXmAgjYqfhXfqEyMUf9cT15IjlxkWBNe6YPwvn6B6mvfRCwuIwRdQd8kkl+EquYwhU2zacS+2e62CYOMXyRtF2SWvA2CSdUUS/nRRYxxkRlC2kbDfvSZ0f0oQsz4M0hAMJI9+IfKkbufPFB9YXVUL+dmy1Lm7/x/9vb+7MCudPDD3m+h3hEGQBDQ83e649qEYCtETMttklbyfO7SyS93PUjtE2fCymCs7sDlmSpgbhHQLvckOYk9lAjmWfSN8YR3+JWwl5lkfnwndfPEiiNJlmcqIAx5QtwEYHFM3URip7cv2YynWBHjHCHhD9dEevhB4i2GSdOVEVE5kZONNfI3Cw7/94Oy0HJaavA09a42rKlnQae9vyWJQLIxbapKI/kKYxne4PUG +R2pg9LZ lstXXPnqiQRNtWNcxExAqEeR5KeTs0IUIPRH2OI8A2OfjxosWkhc/Aw0l+KkdvxNyzJl/PgVIO/XnNk4knGsprznpLRtj0NywiHC3ifpYmFNZuMloWiDLoPxX9MjcgRHYoGVH8GIf2agVsd3YphoKHfJOuOk12P+8MqI9GVHlJerWfbz5cHR0Yvz3GiYgWpYRq9Ap1xOn4QiyfcYAGQvtl90ic5tDWwfR65FWW75pjRDc0FDDkf+/ScyHOY2j9QOGQVeutpXl3S3cvu8RtnxzXS81FP5Cm2fg3D4+H+CnmVwWEkbt+VrrlEQ1PihzAq1rV2n2CKuz0F0OjMbuoX6jcEMx8fzuSgiE2HtfHGj4qC8yHVTlD8XI3CwQ3O+v6/IomeL4bsvGiOaJh/cVXieqz88Xqtbx3o0UT8VamFlpD2mO1XsHZ4JoMQyxDYM8jQFt89DvbPlMK+ZLq9O3Upt9VYymzp0lTciqufCLSjCmeoTenrMwRlfpwkVm55ctiy7i8BGAXF7dW3BGozM= 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_v1.c | 58 ++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/net/ceph/messenger_v1.c b/net/ceph/messenger_v1.c index d664cb1593a7..f082e5c780a3 100644 --- a/net/ceph/messenger_v1.c +++ b/net/ceph/messenger_v1.c @@ -74,37 +74,6 @@ static int ceph_tcp_sendmsg(struct socket *sock, struct kvec *iov, return r; } -/* - * @more: either or both of MSG_MORE and MSG_SENDPAGE_NOTLAST - */ -static int ceph_tcp_sendpage(struct socket *sock, struct page *page, - int offset, size_t size, int more) -{ - ssize_t (*sendpage)(struct socket *sock, struct page *page, - int offset, size_t size, int flags); - int flags = MSG_DONTWAIT | MSG_NOSIGNAL | more; - int ret; - - /* - * 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(page)) - sendpage = sock->ops->sendpage; - else - sendpage = sock_no_sendpage; - - ret = sendpage(sock, page, offset, size, flags); - if (ret == -EAGAIN) - ret = 0; - - return ret; -} - static void con_out_kvec_reset(struct ceph_connection *con) { BUG_ON(con->v1.out_skip); @@ -464,7 +433,6 @@ static int write_partial_message_data(struct ceph_connection *con) struct ceph_msg *msg = con->out_msg; struct ceph_msg_data_cursor *cursor = &msg->cursor; bool do_datacrc = !ceph_test_opt(from_msgr(con->msgr), NOCRC); - int more = MSG_MORE | MSG_SENDPAGE_NOTLAST; u32 crc; dout("%s %p msg %p\n", __func__, con, msg); @@ -482,6 +450,10 @@ static int write_partial_message_data(struct ceph_connection *con) */ crc = do_datacrc ? le32_to_cpu(msg->footer.data_crc) : 0; while (cursor->total_resid) { + struct bio_vec bvec; + struct msghdr msghdr = { + .msg_flags = MSG_SPLICE_PAGES, + }; struct page *page; size_t page_offset; size_t length; @@ -494,9 +466,12 @@ static int write_partial_message_data(struct ceph_connection *con) page = ceph_msg_data_next(cursor, &page_offset, &length); if (length == cursor->total_resid) - more = MSG_MORE; - ret = ceph_tcp_sendpage(con->sock, page, page_offset, length, - more); + msghdr.msg_flags |= MSG_MORE; + + bvec_set_page(&bvec, page, length, page_offset); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, length); + + ret = sock_sendmsg(con->sock, &msghdr); if (ret <= 0) { if (do_datacrc) msg->footer.data_crc = cpu_to_le32(crc); @@ -526,7 +501,10 @@ static int write_partial_message_data(struct ceph_connection *con) */ static int write_partial_skip(struct ceph_connection *con) { - int more = MSG_MORE | MSG_SENDPAGE_NOTLAST; + struct bio_vec bvec; + struct msghdr msghdr = { + .msg_flags = MSG_SPLICE_PAGES | MSG_MORE, + }; int ret; dout("%s %p %d left\n", __func__, con, con->v1.out_skip); @@ -534,9 +512,11 @@ static int write_partial_skip(struct ceph_connection *con) size_t size = min(con->v1.out_skip, (int)PAGE_SIZE); if (size == con->v1.out_skip) - more = MSG_MORE; - ret = ceph_tcp_sendpage(con->sock, ceph_zero_page, 0, size, - more); + msghdr.msg_flags &= ~MSG_MORE; + bvec_set_page(&bvec, ZERO_PAGE(0), size, 0); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, size); + + ret = sock_sendmsg(con->sock, &msghdr); if (ret <= 0) goto out; con->v1.out_skip -= ret;