From patchwork Tue Jun 20 14:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13286017 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 51219EB64D7 for ; Tue, 20 Jun 2023 14:57:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA3B88D0012; Tue, 20 Jun 2023 10:57:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E52ED8D0001; Tue, 20 Jun 2023 10:57:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF3F48D0012; Tue, 20 Jun 2023 10:57:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BD5548D0001 for ; Tue, 20 Jun 2023 10:57:20 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 332331410ED for ; Tue, 20 Jun 2023 14:57:20 +0000 (UTC) X-FDA: 80923429440.06.A98B103 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 5073980005 for ; Tue, 20 Jun 2023 14:57:17 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Tm0JM7GF; spf=pass (imf30.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687273038; a=rsa-sha256; cv=none; b=E9XYZEKgzSX+B3xjGe7kp6fVNpxe/yGByh5GZNKb7exhrVCfO16XNGT3t7RIHv24iSMsS9 vmy8yStgpN7jAM41ug0v11pi9jflIG3ZNjSQ310WYBN5zo6X9OfmIHzVXoQMS2ZzeN4Wnj Tx31b/7EX+BjMLFnPwxZbpWbFjUFcEQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Tm0JM7GF; spf=pass (imf30.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=1687273038; 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=bszGYXAPCfyFrCrKXBgf4DyEzlv1vS1+csO6wWtbX4c=; b=Za5JxyoLpli/dK5VaWQOhpCsJYjw8SUtin+IGCLIlvgypUp03YmF7javvbAHqBuTaiKbA3 f7WWa82kfQhmCOAnPGyyHnINc3ZcmmDfoHREebrRIMEK2Zu7n8Yw3T0czFdeAt5yd5YaI8 HgjZre8Srg15cjTAYf3pDouMq387ukU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687273037; 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=bszGYXAPCfyFrCrKXBgf4DyEzlv1vS1+csO6wWtbX4c=; b=Tm0JM7GFotiHjE80465qJxTcDuCZtVEFvbAt6v7EwsyC/iYNAP6PwKZ7YgMy6tN6+w3dJb NO1F5uHgmaMmAhJoIvSOai6fiZ35rst66OniaQruPwblUOITrqA+VJ2+jBFRSQQ1Qsv5jt RVgxkwF870LM5nnJive3zsnP/cKS5E0= 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-180-5iBq3k2zOLaeVvGBHbh90g-1; Tue, 20 Jun 2023 10:57:13 -0400 X-MC-Unique: 5iBq3k2zOLaeVvGBHbh90g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 176203C1BFD2; Tue, 20 Jun 2023 14:54:42 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E84B422B0; Tue, 20 Jun 2023 14:54:39 +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, Lee Duncan , Chris Leech , Mike Christie , Maurizio Lombardi , "James E.J. Bottomley" , "Martin K. Petersen" , Al Viro , open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH net-next v3 16/18] iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Tue, 20 Jun 2023 15:53:35 +0100 Message-ID: <20230620145338.1300897-17-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.5 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5073980005 X-Stat-Signature: btmznsn1wtf4iwikeqm1ddqpijs3bdp7 X-Rspam-User: X-HE-Tag: 1687273037-286713 X-HE-Meta: U2FsdGVkX1/YLrdpAKBLe5uHFgM+g7yHusDo9cks61NYxtyAfm81cb8NcAqI58u9aXe7Nd0MzQs/zp1X3RqIxZag+Sl982Yy4Lq2ChsXoi7Lw78cedalfUiyb+abddxhyUGrQQV76ANEAKA4VhVlXhJwPA7Jxlk4ImY2KyBleXPzb2zzbRhYGvP4m7XMARCQVoLdupDfGrKC0wCVYd/0itn6315HGvx2Y4XQUkUCuMJ4Nocbtm+9gg9t0MSX3c6ZFwRJ5HxcermeXkWRs/LUNKz7uJDBGvlZBlyh/4xVvjQPq/XbesoMC5jj8An101I+tOmUqo/b6YL/Np4i+yi+3y5Xs2vIG6DkdlfzDIVi5O0Xbr9DbceHfhX8YIHxaaPo42CO5/sDzxWDZ/V2YJabVEuD+DQaFFPTPlph61r//OuwPu4s39/XHubmDtf5FTck5K63hlrHKTverW1xB1EImX+gjzwyDjSAItgyARfKxpd6Ug1NpMNgtVJur9/OqmWafg+c/Gpk44kCnRP+HPgT3mEobPuXatr+RT8PhHAcQh8uFqrT3nZytee7XZlEkC4oEWA/pDPwce75vkuMrVYyCQuBRa1p6/b10/3ywjqWXYB2wD2MyfO+QP5Ncw0mxZrgHKYBS/o1U4Y1aXgBK5eEILaAYWOC7FMtxkrbkK/t7L9189tyJxwAKukURs+kpUrcksYDIhCq+cAZ25CxNDTd6pAZQ3Ec4DJbhlNzMOvjoX26QOQN4sXmWySTp3n1LTOblyhjvZjVodNhQzTIB+NT47IwpZzs02wjipPsTt+FSOgIrZkHuSP+wGOE2xnbmcHcKokjOy5o/8EOY2qPlgYzPBtsTnMmGQ3tGq6qNj6sFHEObYp0vVl4kTKe5lOuDBSKFOg/FdWsHgc/UhdmQzA1z6DDWKsnL8iHF4uM7cdLIejixDLST0PCaEhc9PEzQURbFnZg3a4a+DYaBlGLTCH K/0QCWB6 QZieTUdKInRVANvhz+tILteXpxSB9yjiluivJboFbYVgIwVYaZZOYqnJhIKhYMGiln7jxOrgjY/9xxPGscbS3GJG6TQ7wWYPL5bmURly/F0upwQcstjr2JW2rWeMpj/e+mCSGYwQhtoQuqrqzZPy72UHkM+zto6CR1R3WAePJf8hysuedcCfEZc0EnNxtimy+/2Rt7ndJIATdqE+T5shcT4Y4MunmW+oZ8A083VKCc+I4QMH3RY/1+mYUbeSdd+pFUBMpPu2QBUtpnNe8XZAvac2ZmwPjfT9LuigxfCfOyIzMlp1AhUx5qshY1sp3Alvxbh8fpWgifZuELcdeGibkrxSFEs84t/SyzkG0hz1pStOeG//oVVAPtvSe33zK0FtKScO3G9pj5aNzHLJDtcOYpHTXqK3twMAuJnMkBhbIwdR+ZQieObmEs5nGGCAachrWGgopbmf0Kb7GpYG35NseOi7l4FXxM9oWiccNSIzdToUNuIuJjcSjVFEOvApnjAhS/eVWLZBk3HI90EF4Pqhp7EdXxrXQWcher4CI8USuSfJUC0W6seqLLjKhtB2HHBTLHXxKhF5dB6fe54npJta2aIq4u4r7JV0sTKn6GwowL1Z0IEi8qDGBISBXtmaIgoFyQfc4bjrwUho5N4ViWtB6bnHLpqtJR5dDa6ju3g1Gsv7ZmpHd+8YuwXSz+jUH8jMgOUvFMc5Y608e3XA7gWK1W8qNCA== 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() with MSG_SPLICE_PAGES rather than sendpage. This allows multiple pages and multipage folios to be passed through. TODO: iscsit_fe_sendpage_sg() should perhaps set up a bio_vec array for the entire set of pages it's going to transfer plus two for the header and trailer and page fragments to hold the header and trailer - and then call sendmsg once for the entire message. Signed-off-by: David Howells cc: Lee Duncan cc: Chris Leech cc: Mike Christie cc: Maurizio Lombardi cc: "James E.J. Bottomley" cc: "Martin K. Petersen" cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: Al Viro cc: open-iscsi@googlegroups.com cc: linux-scsi@vger.kernel.org cc: target-devel@vger.kernel.org cc: netdev@vger.kernel.org --- Notes: ver #2) - Wrap lines at 80. drivers/scsi/iscsi_tcp.c | 26 +++++++++--------------- drivers/scsi/iscsi_tcp.h | 2 +- drivers/target/iscsi/iscsi_target_util.c | 15 ++++++++------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 9637d4bc2bc9..9ab8555180a3 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -301,35 +301,32 @@ static int iscsi_sw_tcp_xmit_segment(struct iscsi_tcp_conn *tcp_conn, while (!iscsi_tcp_segment_done(tcp_conn, segment, 0, r)) { struct scatterlist *sg; + struct msghdr msg = {}; + struct bio_vec bv; unsigned int offset, copy; - int flags = 0; r = 0; offset = segment->copied; copy = segment->size - offset; if (segment->total_copied + segment->size < segment->total_size) - flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST; + msg.msg_flags |= MSG_MORE; if (tcp_sw_conn->queue_recv) - flags |= MSG_DONTWAIT; + msg.msg_flags |= MSG_DONTWAIT; - /* Use sendpage if we can; else fall back to sendmsg */ if (!segment->data) { + if (!tcp_conn->iscsi_conn->datadgst_en) + msg.msg_flags |= MSG_SPLICE_PAGES; sg = segment->sg; offset += segment->sg_offset + sg->offset; - r = tcp_sw_conn->sendpage(sk, sg_page(sg), offset, - copy, flags); + bvec_set_page(&bv, sg_page(sg), copy, offset); } else { - struct msghdr msg = { .msg_flags = flags }; - struct kvec iov = { - .iov_base = segment->data + offset, - .iov_len = copy - }; - - r = kernel_sendmsg(sk, &msg, &iov, 1, copy); + bvec_set_virt(&bv, segment->data + offset, copy); } + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bv, 1, copy); + r = sock_sendmsg(sk, &msg); if (r < 0) { iscsi_tcp_segment_unmap(segment); return r; @@ -746,7 +743,6 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session, sock_no_linger(sk); iscsi_sw_tcp_conn_set_callbacks(conn); - tcp_sw_conn->sendpage = tcp_sw_conn->sock->ops->sendpage; /* * set receive state machine into initial state */ @@ -777,8 +773,6 @@ static int iscsi_sw_tcp_conn_set_param(struct iscsi_cls_conn *cls_conn, return -ENOTCONN; } iscsi_set_param(cls_conn, param, buf, buflen); - tcp_sw_conn->sendpage = conn->datadgst_en ? - sock_no_sendpage : tcp_sw_conn->sock->ops->sendpage; mutex_unlock(&tcp_sw_conn->sock_lock); break; case ISCSI_PARAM_MAX_R2T: diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h index 68e14a344904..d6ec08d7eb63 100644 --- a/drivers/scsi/iscsi_tcp.h +++ b/drivers/scsi/iscsi_tcp.h @@ -48,7 +48,7 @@ struct iscsi_sw_tcp_conn { uint32_t sendpage_failures_cnt; uint32_t discontiguous_hdr_cnt; - ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int); + bool can_splice_to_tcp; }; struct iscsi_sw_tcp_host { diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index b14835fcb033..6231fa4ef5c6 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -1129,6 +1129,8 @@ int iscsit_fe_sendpage_sg( struct iscsit_conn *conn) { struct scatterlist *sg = cmd->first_data_sg; + struct bio_vec bvec; + struct msghdr msghdr = { .msg_flags = MSG_SPLICE_PAGES, }; struct kvec iov; u32 tx_hdr_size, data_len; u32 offset = cmd->first_data_sg_off; @@ -1172,17 +1174,18 @@ int iscsit_fe_sendpage_sg( u32 space = (sg->length - offset); u32 sub_len = min_t(u32, data_len, space); send_pg: - tx_sent = conn->sock->ops->sendpage(conn->sock, - sg_page(sg), sg->offset + offset, sub_len, 0); + bvec_set_page(&bvec, sg_page(sg), sub_len, sg->offset + offset); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, sub_len); + + tx_sent = conn->sock->ops->sendmsg(conn->sock, &msghdr, + sub_len); if (tx_sent != sub_len) { if (tx_sent == -EAGAIN) { - pr_err("tcp_sendpage() returned" - " -EAGAIN\n"); + pr_err("sendmsg/splice returned -EAGAIN\n"); goto send_pg; } - pr_err("tcp_sendpage() failure: %d\n", - tx_sent); + pr_err("sendmsg/splice failure: %d\n", tx_sent); return -1; }