From patchwork Sat Jun 17 12:11:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13283548 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 7CF9BEB64D9 for ; Sat, 17 Jun 2023 12:12:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A135C6B0082; Sat, 17 Jun 2023 08:12:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94D7D6B0083; Sat, 17 Jun 2023 08:12:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C4B38E0001; Sat, 17 Jun 2023 08:12:39 -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 699936B0082 for ; Sat, 17 Jun 2023 08:12:39 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3590BA01BB for ; Sat, 17 Jun 2023 12:12:39 +0000 (UTC) X-FDA: 80912128038.06.7E523A2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 7122C1A0007 for ; Sat, 17 Jun 2023 12:12:37 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YzPKAeOv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1687003957; 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=Fr8R9cUCocDj4LYXtGmeXkCgA5OgO4hqxYPqdNjfTX8=; b=tVfBBx+VL7CU+QTotOD33VIyqQTSeYQXYIcyQh1q6vRsMvbzfu68MJqUCEV3dtjII2uOy/ KEUZUPUVRq6XwZXCTcIkPDPhrrINUfMtgQi/w3j1Kz0CeeApnAd+w/i2qP6FRnN0/VZDq3 qITlK1/Pi/+nZKDf2QiMQpiGjVNuUM8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YzPKAeOv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687003957; a=rsa-sha256; cv=none; b=AmTqp91X/IUXbTqIRQncWAlJi+lkORsqM38AcgcgQu13lWkl+dotrsdQI+qO5d27FWqBVn +KQR6zJC6mjW1cAwjreN+AOam2ePChcgt27CQX4OrDD4dfsLggOxAZY0p6STK1Y/2SW2Rk kUt0slkg8RP4PoDK8L9DSAYkFpF1jD0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687003956; 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=Fr8R9cUCocDj4LYXtGmeXkCgA5OgO4hqxYPqdNjfTX8=; b=YzPKAeOv9WsCtWwkqOyhSW8z/PLDBbZuMSNWbHK9M36Gbr44EJLk1YrIsXK44XPaFUiHuD 56K7UonSH4XnHiicuZncAlS8eXCasNKVUtPkv1GyFi/jHpkUXjhGutTkRvra0hRFSoPLrr Lew3RhQQP0F9UeukbCgQWBikweLIycg= 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-22-5_avo79NPta2RKQidrmpCQ-1; Sat, 17 Jun 2023 08:12:32 -0400 X-MC-Unique: 5_avo79NPta2RKQidrmpCQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB1253803506; Sat, 17 Jun 2023 12:12:31 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A20F1415102; Sat, 17 Jun 2023 12:12:29 +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, Santosh Shilimkar , linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com Subject: [PATCH net-next v2 08/17] rds: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Sat, 17 Jun 2023 13:11:37 +0100 Message-ID: <20230617121146.716077-9-dhowells@redhat.com> In-Reply-To: <20230617121146.716077-1-dhowells@redhat.com> References: <20230617121146.716077-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7122C1A0007 X-Stat-Signature: uuodqt47mrabzc3opt9ekna774j43ja3 X-Rspam-User: X-HE-Tag: 1687003957-722103 X-HE-Meta: U2FsdGVkX1/ze/LgdL3WscMsvF2nQ3Zsweuuc6VzEwB28nKXtfztGn9W1271MDUoR3eUJkV3tY7OuRlPrbAnzCfBl4ROhSPxh3dMef6ibnJCUqClVGBQ1LJqH4ilp+AhnPLXnCZiE9stqvMj1Lh61DB5lPNN1bTY5+2pwjJDgSrpNZGogIoTGjPFryyH3Np1yQ2+XMdd4/odAxHUmVYQQxE8wrm7JIiSTTvJGmKyo4CpTTeBhcO0rEKEqVxaztXKfSapKqy/17UHzkFa2ivB09nY8iRZiwnYA9Kq6qg2qu4r91lUq+ECY4x6mWQVf5Q+08DF5nCA0AxgBEmBPMhURcUXgikIApSm7YL4f5YJdhd6FCmqFbhlWXkYzuclGSl52lzY5nQ2IrAy/GlVumRDSe5vYO1COeusos5GZM1WLoZAhE3W6YqV71YNvaZConzeHB/Qva2VazdjLyQevGnEWN0Lsa5zh+4fzQTQqwKw8T6BDrK1mUrFvu64JyhbFsHAwQYk1I6Q80S/ZaM0L2aPRK0OqdwKkerLXG7J4fcOPmlID7Bp2tire6cird+VJ/5se3GJW6zCj6KGEN4+u80KBo55mfR1F2VobLR01HdgsZH59HTHSlaumCHIz4AakdjlSKCcpvwfmzQq6a/mQNjs5us+lT7a19Mm7rC2/TKZNgZOyfP7CtIGZ1ShDYXxIU1rXdLG37WSxB28kA22vvZe0CI2PRRIfGCMb0YK1QR9KbjMn/v9bx1+/M+9nlisGvNPH7fURKAcOplas99YipYiUGQ8GQs7MJU/pIxqT7AzsZ7wVqVHEF8T9pTN8Ey8JnQsQMwEzckhunaXzyJ8rHGswOG6DELCWMi5kyvrGnJQpsgnTVcs+xa92tSNtG7MphybYHmZH0Rg9dd+gskIoAkQkOvBO68fT31KmuznaCatUhsczxKelOtAcLHqMzg6U402ghWne1x/sPkxNREYZC/ MB1nmAaY /Kh2bZqWJKrAxWFI4hNlYqyIU4opKSPB6CjvKaq0Z6L5U1qE1TEqaKPT/WiiXN3YmdHTrj3YlmwpUQp6TnVTwTnubM+dnusi2Li4F4I+VJI+GwPdRf2ephmXd47bm2GQabLKsGNpoPlc+PuCa2CTVaxbJYnVxoFHKAzr92ff4hNgXLYtInnfY37BfO49qGGY5v4zLRoFOfDo6h5deJf3+vGhqpcIGyUiBTm4ruqyRXC0Bmk7RLWgV+ifjRJd7aPKvmwyHNcgMIYYf33JTejPIBPHkxOIK4PZ6whuyLCRtJwjRvPosMcOlvxd+IKdrcB2cwrH03rxM6V1NkxxAjo4meas5SJWK6gnHgojAzge+oeovlYQIvg2fFGmRURwHINVtb6u+Z4TVzy9BdPfquyoSayguHITW/pDh1wFBhJsJBtbmOE8r9VoRL56DZeomLPHI0ZYq6UOpS+uI7/M2ORptQsUt1RtKo98vOgiY9EbySe3SOXfKGUbmpvVdN2Ayj/o+6dotXtZGTRH5InE= 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 | 74 +++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c index 8c4d1d6e9249..550390d5ff2b 100644 --- a/net/rds/tcp_send.c +++ b/net/rds/tcp_send.c @@ -52,29 +52,23 @@ 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; 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 +95,26 @@ 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); - if (ret < 0) - goto out; - done += ret; - if (hdr_off + done != sizeof(struct rds_header)) - goto out; + bvec_set_virt(&bvec[ix], (void *)&rm->m_inc.i_hdr + hdr_off, + sizeof(rm->m_inc.i_hdr) - hdr_off); + 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 +137,7 @@ int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, } if (done == 0) done = ret; + kfree(bvec); return done; }