From patchwork Thu Mar 16 15:26: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: 13177826 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 343C0C761AF for ; Thu, 16 Mar 2023 15:27:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C72E8900008; Thu, 16 Mar 2023 11:27:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C23F8900003; Thu, 16 Mar 2023 11:27:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC465900008; Thu, 16 Mar 2023 11:27:40 -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 9BA16900003 for ; Thu, 16 Mar 2023 11:27:40 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6325A121405 for ; Thu, 16 Mar 2023 15:27:40 +0000 (UTC) X-FDA: 80575141080.09.C15FEE9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 9E95118000C for ; Thu, 16 Mar 2023 15:27:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KkGB8Kun; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1678980458; 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=lvAI2dCmYatT9ZxEk9/sngQlw7FOU21WLj5vHppXDWVLxyuqBZRaHNrRNUY7vM9fMqEsyi +axF30Ml0haAc7rnOo1FNKBXFRGjG7r9Kzp/0MairB2XoefhjYyk96WUjgaT8IpAfxqhkT /oYocm9jH+bnfMnclFuqRGXw91J9jQE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KkGB8Kun; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678980458; a=rsa-sha256; cv=none; b=MUFxDvCjLkytZ5VBzXohH6KIG9qSGAtoUovu4k6I5N82LGOzOj+jySRZZo5qGuyUOPKacc 4zza4IUIvlF9+MqchE5OmTk4CBkVNDJ3JH4RuJVli94REtxLQ4BYicijkYpV7uRjoIXwZW hdWGi4KG2ZsPPVVNMV+wfkduteikRbM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678980457; 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=KkGB8Kun1f7XldWy1TObInYwkXKlfO9UNdV8/Nog8OdEIMAU5fOWZTctWt5qCf5kj/E8VP xriZsVP7rJpS5SA7OgoXuhy58lAkJGlzhnWlAoz9Ew/NH/mX1UpEH3bqnbZk7pa+nk/eqn nwYVQkSQIIT8D6u8ADBYUFDmcnF6AHg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-319-pD9jpABAOzyxINJMnpA1QQ-1; Thu, 16 Mar 2023 11:27:27 -0400 X-MC-Unique: pD9jpABAOzyxINJMnpA1QQ-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 72108185A790; Thu, 16 Mar 2023 15:27:26 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A34D2027040; Thu, 16 Mar 2023 15:27:24 +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 , 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: [RFC PATCH 24/28] ceph: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage() Date: Thu, 16 Mar 2023 15:26:14 +0000 Message-Id: <20230316152618.711970-25-dhowells@redhat.com> In-Reply-To: <20230316152618.711970-1-dhowells@redhat.com> References: <20230316152618.711970-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Stat-Signature: u1qrqkgdjahieexkeuueaostj1ak93sf X-Rspam-User: X-Rspamd-Queue-Id: 9E95118000C X-Rspamd-Server: rspam06 X-HE-Tag: 1678980458-992726 X-HE-Meta: U2FsdGVkX1//7QyyPvgc3WZTiMLM8IT6Ry/WkCAjtLhLx9AxzE6iYfTJsNL4J+grxWfQ3SozgfEaa7sLuPglHTiehc9f7a9ALAoy9Wxtz4q8NYM7cHv8a6uLkOkIsSSJa7AZ7lR13pjgPbxGHixIERdhPIbbPPs6k0PYn39OWBZl1E7Egv7yAs7Te5DNKKbTtF7pPaCJ1jkTXRy7O3Vr0V4d3MN5nol7ko2CMkVzMVU3GcJb7t+l2SjUX7/VILjJafZ/he/hiMvCU/7O2d26vFNgG6D2yjoqBgaU6g8HOw2XZJ/EYi+kjOWI9lnlEA/BDtgjHZschIWZ7llvJlwi/kPI4v7ffOu/JUidJ/ZZMBx64OymaDBz9wOStJquoxdbGjfDC05Xtu8cTLn+S3/miXfANHMOvN3/LlV/uu55ll8MyWXsxiPZG700+KGb1i+GdbCXmrjk/0qr8x/SgdpXIof7zniMnM3QcfCFTyF7hZCPFMyXDYPWhPtBcvJVFSzijEeiNp/W3kzThCPUldxXV/5j0RJhzcfyowYXf2fSjDt8cCQHUJ5d4lT26vB7ZxQ9lnJNe/+mgGzklzpL0VKr+rj65RSrcSEVaeieCHcLGLGjQzpp8fbmvVrm+8grnD3aysjOTIy0vBXyhSjq8cfMsTUiFpSywIyOSDYD13ij6wdkx/xe4BMM0vHAokFzJOqxFlqxJtAmziOXwhEkwaH9vJ8y04gSmJXIf7Ve9fwEens1bX2ro31W2qBOsAmrqcB5mtq+ukp9XhL3UPgCxjgFPCG7wYA3XzjMvZtn9fdDF426tIoWQXmfoV9w0zGNoVzIw59e9IGp12i9N63btjOX+glGM0PD97tgk5wHWpKLhK4uMlOHW3W2wVxt0LUOySIxUQJq+HKFuM0yplBdc633YwzJdXbJm4tcDeQNZct9bDPIPrDud0DJk0KAjG0aC2GeDb5QoWB+lMY5g9yzRs7 4vVBLy0g RYOQqncRExjl2GLVtdeA8scoCLLKto4n5HLd2cLPx5FgM13ZMnkAigMX42PUW/1cq/iStVae3jiEInVBfgTSRTckxoH27mfaiE72OwHRXODUPSRLJvoApNOfCk8goRhfajDeveCR8rEG0wvsciKPpX9FJuP+DoqaZ3jv7CfaVO1Hasmi1jIFQBlbzJq6gl+KPfYZzAoDTJD6AhuBkYTQOiJ+8g79XKLifELict3YSpLPK2GQo/w4Qqv9idz8V+gAizzA77zif9+EonKLhKds6lNZWKrq6hr6ba5wknLNwHnh1eDkcS8KV3JzquHqUAIVnckH75n0yxOLciULdLzdrGQf7DisQLY43J7KTPCoZuYsAjt8/QXkNeP7rZVmfHlEwc8+QfU+QEyQvZs1hR4w+s6iPu3DktHxTEYnCHd6JUUQOfCGYV7zZP8y+Y4YotpkgeNEGWegP1ElMMGxOypWSqPotgA== 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;