From patchwork Tue Jun 20 14:53:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13285994 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 25FFCEB64DB for ; Tue, 20 Jun 2023 14:55:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E8D98D0007; Tue, 20 Jun 2023 10:55:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0733A8D0001; Tue, 20 Jun 2023 10:55:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1AE48D0007; Tue, 20 Jun 2023 10:55:43 -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 B64C88D0001 for ; Tue, 20 Jun 2023 10:55:43 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7C861411C0 for ; Tue, 20 Jun 2023 14:55:43 +0000 (UTC) X-FDA: 80923425366.28.A786B39 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 921C420015 for ; Tue, 20 Jun 2023 14:55:41 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eZOvktRr; spf=pass (imf13.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=1687272941; 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=vgxtQ3P2+tWPlES+u+n0IEKG9hiN/XaYpsM/BHrW4VMRQfJjBz0bULucGu2+pnM7Qk6KE3 1+ijG6VaSezlT31aZFI4LRoyJaV98y20IZ2UMSeS9eIS3ZWSBd/zLqCnagjYhsIhlOscSk Wy7uYEvd9HKcfhNMhK6HElVS5kSt49s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687272941; a=rsa-sha256; cv=none; b=hjKQ1XgQpfkAFvz/e6Eg4Vp+svXAfalpDijhmU/8Xl7izJXn73TJglKTc2v7wNmrwh1t2n uGKA361n3uX0GUdqPt9FS+XzzmVyQBHLTPMwzSExIfLTiOauQBYITqY3b9SbM2vabxcT9f iyzQnVWCfBpqDGOr5JB16TwvnSkOI00= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eZOvktRr; spf=pass (imf13.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=1687272940; 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=eZOvktRr3vJRixEPxcduNGJmxz8sB5lSuNQeyyb76cELvo/sfEZL8wTtCE77wSCojOw088 +7OZHMiP5uKZpd+DEyDzv8aTX4dQbD8LL7tLEEsMMaoNyzWC71KIJMS7vmggsphXD2YGku rWee3S/+RPHavl2G1+S/brYGvrb9ztw= 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-644-q3ToHJJIOfyekEbhjCK1ZA-1; Tue, 20 Jun 2023 10:55:36 -0400 X-MC-Unique: q3ToHJJIOfyekEbhjCK1ZA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A0FD23814975; Tue, 20 Jun 2023 14:53:55 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id D552B492C13; Tue, 20 Jun 2023 14:53:53 +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 v3 05/18] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Tue, 20 Jun 2023 15:53:24 +0100 Message-ID: <20230620145338.1300897-6-dhowells@redhat.com> In-Reply-To: <20230620145338.1300897-1-dhowells@redhat.com> References: <20230620145338.1300897-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Queue-Id: 921C420015 X-Rspam-User: X-Stat-Signature: md3zdbd5oi9hdrb8a3nxnjjxgtu1bjrc X-Rspamd-Server: rspam03 X-HE-Tag: 1687272941-148915 X-HE-Meta: U2FsdGVkX1/wm/nPcTsFjo/ESrp1Lv7A6VPt14f8GcABsOgooEwIGbp8ur4e7yzhCwTv6QN4wzIPVKQ66yAgDMHrOk+ZqiXdOGWgyz6uQFWWqCMlNi4kQwuo5FJCXGKWsftl/FSpbTt4FuWuISYfiS2K+0IK84a0k70mkMoapkvmHNv0tpc/WuAy/kjgJw2EpgWYfcg4ZucFVzhr/yNQuMFyLYN926qY57koY14PWWnAMyXmTyzI/YXjCcDSioE4lzJSxgE+4kP0P8ncFFHu7J5odINt9NpBoemZGVUXQ/cDBOz1q00GkXKNGia6p0sx2XqiK3iwh/Gn+UrlvZSgOwSD9R23trLL/YIi0/cT20Hn7zeGfsdWlzr3zeBECqw2iTsBSwL3Hr5l+moXNxOeuyEtGSOsoA4aCB8EeoaRDpgTbuRvCKsPnf2kqZtiD9tez4+Blw07iz0AWds+O9rrblOsRG/Ad5pm1RnhWKLr/AsSulvVMNuOMg7qRPlFK+jAV2rXffL4g61Z2WEPM+1k5q8rfsE0IhD/MiHksfjyF9AX9kTBinacOCJ7XR/Fa4DR2O274PRht1+pYpiomT+9HFMsyZVDwlDkR/6M+/rAydMB2njfrWK1gNA7B0jCPdcQwgFrnZOnZUNi4qfKrRflo9C9E48pX76hlYzb+ry/CCjQl4jVLd+ZJ6I3bH5q+NvnF/jjp6LeGuvvKw2tziqlI6X4RjAfSh9xwbnZVjbw5XkIJLXohl2idm01kk4jSA6sEra0Vfu02kI1+roymJPgO9XxeV1b0aYZJkv+ghKpKYflqUD3ymHg2YjELfVNIQDgVedpv9+671ZnLFwZ1iBNWvYF2HD3po37z9LU7ZPEzPSeg0nQJkh56ufOj+YnH+e32UPXWCjl9bKfUT3GU+q2mzu3bF1hEeZeRdYJ1ZQSxEfUzHqnW/DjrjhMu9+4foYrI3jWjBIdMwjE6ziy7fC hhjDFrPr PVn0YFCjzQ1NOqNjBCG4UI9knDgjvIplbXR6owvDJfqp/TlUgr3ToBKxOSdr88TO19Wwz2E34FeZIC1fWsKtPkxADZc9NVnfqGBBVgZfyvKh0jui2/2KtMIHs12uYW0KkkS8iICfN8dquYk3AEJr/mvP7sQeOlUF1VLrH7B9pLWzjUzllmwe7Z8GFXX8uiANdH9BoKk4wFUAPgK/28M3UQYABUK9HdrpnJgJ3bdwShd8SOV70GyGBy59vAw5Ei7pzs7DU072YGbY1CDrVccwBjVf7l/g45hyjC6i5AYESNTXePsUXeV8CKp6RXjOHiDrfE4YVmDyHpIn3TYYj9Zvb2AIkKboAKW5oivOKAOo7+WEbtXA4zhcFtps/PEK636fZ65dX4fKsuGQsaXtmQuu7its/29J56nRTYXwk2Ln13hHLWHUZCtTz+i0pirCkizPM/Kz9ESGLKJJZx+OoJMr88I5p/Lsr5SDvtcrfUtPHPWYyMEGcNq7R97HYhROCFy1mQlUDV80eZ0mLRwk= 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;