From patchwork Thu Mar 16 15:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13177824 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 232C7C76196 for ; Thu, 16 Mar 2023 15:27:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2886C940013; Thu, 16 Mar 2023 11:27:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EBA994000A; Thu, 16 Mar 2023 11:27:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 08B67940013; Thu, 16 Mar 2023 11:27:36 -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 EB85194000A for ; Thu, 16 Mar 2023 11:27:35 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B9D7BABC07 for ; Thu, 16 Mar 2023 15:27:35 +0000 (UTC) X-FDA: 80575140870.20.7F1D317 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 18BC11A0011 for ; Thu, 16 Mar 2023 15:27:32 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T0560YF+; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1678980453; 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=92bJ6Ynf1CSTwRAMP7lCPtKM1kI8JBpDgRb6Ls1sSMY=; b=aM7xaOCeE/cUybloDMGdO+JG5TCZw718pggXCbK2sMOIhYn3QzeBuDVOLtdSbcSqzlGkzB yBf1/zgc/FSxU+ux2OaKSm3OEVq/64Oe8VTbxABisseOoErd9aI+yNaf8T+Hc9UKfEJvxL BmrVcnC9sjoHpCGdhTqrGm8lMXeaEc4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T0560YF+; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1678980453; a=rsa-sha256; cv=none; b=8hwVy07kytx52juTvjsiZeJovMLCZhwllKRpPbCeR1AfmOCEMpmhM/T39C5oQtgXUZlDWz yQwzO3MTNA6sQR2sbnKk4r8miYVv4ixUvFB8LCJTvrpcowxOEjSwhWdifwrljLmY2aw1jw FTVGlPz6oHZyOecZZMpJR7CQNSbrweU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678980452; 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=92bJ6Ynf1CSTwRAMP7lCPtKM1kI8JBpDgRb6Ls1sSMY=; b=T0560YF+UveLKxyIQx6ZoR8+u2KbXX6nJFjTC5hjHOz+cSSMCuSj4NAPRca4lgCrGFvgOY a5IlhQiCB/0Aed3TQL2WKKrNXo6k9MZyAW77v+B0xLHNLqx5CmWnWpMmza8FxDQXdGGKmy oRdN18ieOdADNNnOI62KEaUJGuRjw54= 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-135-Uky157iCM7O_1XjnKbwmzg-1; Thu, 16 Mar 2023 11:27:30 -0400 X-MC-Unique: Uky157iCM7O_1XjnKbwmzg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D062185A791; Thu, 16 Mar 2023 15:27:29 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 150B540B3ED6; Thu, 16 Mar 2023 15:27:26 +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, Santosh Shilimkar , linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com Subject: [RFC PATCH 25/28] rds: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Thu, 16 Mar 2023 15:26:15 +0000 Message-Id: <20230316152618.711970-26-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.1 X-Rspamd-Queue-Id: 18BC11A0011 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: r6xx13ongw7nk9abitzrjybzr6mz5d4g X-HE-Tag: 1678980452-736443 X-HE-Meta: U2FsdGVkX1/wPpA6HPMAKNGiuX5h+opgsDbBEN7rWgCNjYXV37jgMuwjMcxqju3v0Z8wEDgCqpzfFOgIuFVcPj69zJkpBGeQawbYOZVwtEym3eJRQnV3lkTEmTtdlT+cXGNHTYbmB6hsNKsczBLSFdKIKFYlOXYNxqspHk1jzkNfjD7WbJCvCXwSU08zaVXa3hESDlmjBgR98gPBa4i0VrLpqmNue+xAgsMIAZjSc1yW11efiwY3pqQfpcIx2WVNdGKCxa6vwA/c6yvq6ejPAN6c815G29TV+4QiqeyPo27EGC+Y/4T890erUjCUDSKL240w0Wg+TgwKjjDVs52VLRJIcLBoIz2wAK3u/g1ZQrEXt86N6ozABma/2GPhzskegks6QDmva9UEJ7YyLIIJDaWIrAwQNFxjI7PrLfhVoQg4ZrT+wiYhVLXI1QO7Bm1O7waQYhMDE+QvhobR7d0xkyS0eeQ7CYhgViagThDmck5xh+1tnWpkMRWjvAHAnpe4VCsk23m2zwEOkciJs1RuVfiX+HXI7GG9yKTQziH/k/Nl4wyl4d2CClZ/2zr7YyZVyhMyntLXFXSZ9tUj2I1SMf4f5R24dv0DUzJlwGv3N+AcqYET6E/mWk/ZRzLlxvJr6iTUOdpLA/c+EZmJY7FR9OZ+h59oAHbawHJG/vcx/el4O+16zJwWcyOkEGDxgNhafL1wFta4know6bB1ZJhcjo7RyoFpRAx1CKdBf+jtp7S1HojyylHozHO1OtJSY8b0B9ge8kSqGceiF41uvwZ32qUg7ur6N3PgkJzhSWedELXpoOdUyjag34gWRLw7Q1ZOqYQSCFVXzN7DlEGiwcX6DRoyxQj0CpjtDEak0HOoTiY7m9lqCz1o5QHgtVOpFsUqV8doroeVVdOYrAiLViNn2RhptQ3EvlUH4aPRNgNSfd42hKicwwkRIotPHnwZRqTYFl+iGRhqfWLkc/lrFMM wMSnkVo0 T4l4tL1SMmN0qt9au7X8lTOubjHhz20p5kO74S/dFwcfThqibROKtcBKcgTjtf7hvAQMYfVNCqnKPhvgh+6MpYgGB3o4kay34zBowY6OkhT4c12pCg2x5v+aSFD/nFfhYn5r/Da91Tqi9WXBdmDw0GBNSHjULY5O0RFRXaq3abL+1XBM9MNx7r/4Ly0TYk4TL436GaREQUppKSS7OF9cg/yXMJKniCj4YwoshIoNTjv9VMMsqD6YxaZ0hPmM6wS1EJyBYMiUy9OFvy6YN7YgsLlPZ2niX2IE4lrgdlARjo/m99EiLHgkHAdVnUGWzBcMGJ2SAvRAJm9jceFT54yD5fc7WCd/Jqb3ZZRv/lReSOvsqA7N//OhvZaoSZw0X4CEf/VosAVSIDuEytPnfTsY+kRgatGG+1RX32MeH5XOwvZepk9eb2B+p+vhwDFf5i5iKi7TcDUBDTsNEpWC7dzbD17Bi+w== 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: When transmitting data, call down into TCP using a single sendmsg with MSG_SPLICE_PAGES to indicate that content should be spliced rather than performing several sendmsg and sendpage calls to transmit header and data pages. To make this work, the data is assembled in a bio_vec array and attached to a BVEC-type iterator. The header are copied into memory acquired from zcopy_alloc() which just breaks a page up into small pieces that can be freed with put_page(). Signed-off-by: David Howells cc: Santosh Shilimkar cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-rdma@vger.kernel.org cc: rds-devel@oss.oracle.com cc: netdev@vger.kernel.org --- net/rds/tcp_send.c | 80 ++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c index 8c4d1d6e9249..0d6eb85a930d 100644 --- a/net/rds/tcp_send.c +++ b/net/rds/tcp_send.c @@ -32,6 +32,7 @@ */ #include #include +#include #include #include "rds_single_path.h" @@ -52,29 +53,24 @@ void rds_tcp_xmit_path_complete(struct rds_conn_path *cp) tcp_sock_set_cork(tc->t_sock->sk, false); } -/* the core send_sem serializes this with other xmit and shutdown */ -static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len) -{ - struct kvec vec = { - .iov_base = data, - .iov_len = len, - }; - struct msghdr msg = { - .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL, - }; - - return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len); -} - /* the core send_sem serializes this with other xmit and shutdown */ int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, unsigned int hdr_off, unsigned int sg, unsigned int off) { struct rds_conn_path *cp = rm->m_inc.i_conn_path; struct rds_tcp_connection *tc = cp->cp_transport_data; + struct msghdr msg = { + .msg_flags = MSG_SPLICE_PAGES | MSG_DONTWAIT | MSG_NOSIGNAL, + }; + struct bio_vec *bvec; + unsigned int i, size = 0, ix = 0; + bool free_hdr = false; int done = 0; - int ret = 0; - int more; + int ret = -ENOMEM; + + bvec = kmalloc_array(1 + sg, sizeof(struct bio_vec), GFP_KERNEL); + if (!bvec) + goto out; if (hdr_off == 0) { /* @@ -101,41 +97,30 @@ int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, /* see rds_tcp_write_space() */ set_bit(SOCK_NOSPACE, &tc->t_sock->sk->sk_socket->flags); - ret = rds_tcp_sendmsg(tc->t_sock, - (void *)&rm->m_inc.i_hdr + hdr_off, - sizeof(rm->m_inc.i_hdr) - hdr_off); + ret = zcopy_memdup(sizeof(rm->m_inc.i_hdr) - hdr_off, + (void *)&rm->m_inc.i_hdr + hdr_off, + &bvec[ix], GFP_KERNEL); if (ret < 0) goto out; - done += ret; - if (hdr_off + done != sizeof(struct rds_header)) - goto out; + free_hdr = true; + size += bvec[ix].bv_len; + ix++; } - more = rm->data.op_nents > 1 ? (MSG_MORE | MSG_SENDPAGE_NOTLAST) : 0; - while (sg < rm->data.op_nents) { - int flags = MSG_DONTWAIT | MSG_NOSIGNAL | more; - - ret = tc->t_sock->ops->sendpage(tc->t_sock, - sg_page(&rm->data.op_sg[sg]), - rm->data.op_sg[sg].offset + off, - rm->data.op_sg[sg].length - off, - flags); - rdsdebug("tcp sendpage %p:%u:%u ret %d\n", (void *)sg_page(&rm->data.op_sg[sg]), - rm->data.op_sg[sg].offset + off, rm->data.op_sg[sg].length - off, - ret); - if (ret <= 0) - break; - - off += ret; - done += ret; - if (off == rm->data.op_sg[sg].length) { - off = 0; - sg++; - } - if (sg == rm->data.op_nents - 1) - more = 0; + for (i = sg; i < rm->data.op_nents; i++) { + bvec_set_page(&bvec[ix], + sg_page(&rm->data.op_sg[i]), + rm->data.op_sg[i].length - off, + rm->data.op_sg[i].offset + off); + off = 0; + size += bvec[ix].bv_len; + ix++; } + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, bvec, ix, size); + ret = sock_sendmsg(tc->t_sock, &msg); + rdsdebug("tcp sendmsg-splice %u,%u ret %d\n", ix, size, ret); + out: if (ret <= 0) { /* write_space will hit after EAGAIN, all else fatal */ @@ -158,6 +143,11 @@ int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, } if (done == 0) done = ret; + if (bvec) { + if (free_hdr) + put_page(bvec[0].bv_page); + kfree(bvec); + } return done; }