From patchwork Wed Mar 29 14:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13192540 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 35107C6FD18 for ; Wed, 29 Mar 2023 14:15:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C279F6B00A3; Wed, 29 Mar 2023 10:15:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD7196B00A4; Wed, 29 Mar 2023 10:15:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A78926B00A5; Wed, 29 Mar 2023 10:15:35 -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 981D16B00A3 for ; Wed, 29 Mar 2023 10:15:35 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 760D9140941 for ; Wed, 29 Mar 2023 14:15:35 +0000 (UTC) X-FDA: 80622133830.19.8F4503A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id AE73740024 for ; Wed, 29 Mar 2023 14:15:32 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=B1w1ZF3S; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.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=1680099332; 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=gZm+OH3nuU2w5lgBIDJ5zMpRPGFGHnStb+oddo8E9cs=; b=a+KQTzURRCTjBEnYl6Sgyzr37WB64NVKoykkkWZpCTnHT7CLSH82Mcg1bbHOq3Rvxb4nZL iXOblTxY27rrFnKpCspCG4kC+A3rZaOcrT4Vp/KzlRFq0AN7aq9DjZr0AWB+MIr5I5NV/J PowYm+bSc8RiHDGiFSarhuKfKDOv2uc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=B1w1ZF3S; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.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=1680099332; a=rsa-sha256; cv=none; b=RNYbBLSXGLeh4lA4BYxXtcGjfHsz1nKZbX7jtrN92ag1m1wDfReb6sQudqJkI8OZIEhy/r FdBijsZ9x7TyjsFutEYZEPN9b3xiFHvIWQfT3NE0Gsgz2E2z7PfySNNkYK4Pm3NlDAH8Ru 0oOi5S/53CJSqBeZ8rytJ74lFSlfXOU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099332; 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=gZm+OH3nuU2w5lgBIDJ5zMpRPGFGHnStb+oddo8E9cs=; b=B1w1ZF3SQs4MDgmV4lwaw3FWVXtS6Y/9MnGgEPsIsOHEBzPYfhMsofVK88/qj8oLlBUw1+ /FDWk2yr8YKB8103wGfVQRcCLRac0YGAo0nENfkWwGWL2ozmIuxowh3g6uQN6y1fiNUf/t UqDB+mUJsR4d3Baj6sDGIm0IpXDzX5s= 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-427-ZeMxTUzWPHqK1lFKrZJGyg-1; Wed, 29 Mar 2023 10:15:27 -0400 X-MC-Unique: ZeMxTUzWPHqK1lFKrZJGyg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB5A61C0758C; Wed, 29 Mar 2023 14:15:26 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2C022166B33; Wed, 29 Mar 2023 14:15: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 , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Martin K. Petersen" , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [RFC PATCH v2 32/48] iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Wed, 29 Mar 2023 15:13:38 +0100 Message-Id: <20230329141354.516864-33-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: AE73740024 X-Stat-Signature: kprs81fg8z93r76nxwsapaxdrrqhkywn X-HE-Tag: 1680099332-63669 X-HE-Meta: U2FsdGVkX196KnaP30444eD2Zi4NdFKWGaGNuyv0VYlPvjFT18UlUdSu2XsNXEtm+uZ61JfDPp8OxsfSNsJFdu7B/6fGCjy/9KS0gvALFQDpfl7wcMiFOF4Mb+zRX15WmmFAP3pWlgGmZUijGNyocxiicu2sfypdOk8wBvyNU0bXO5x9L4Caf4H1qbN/zR8M0K4c19VBYRpP4nU2SzmrOLWGdjqsTv2ujsnVxhEi8rfacgRntfwIItVidysWyzngiyor6+WA1mxAPWwDJvvgF7ih9VIVYOKR4YJKyWYqNpNirEIVa8EXGuZrfnTAE5IEYkek2ZkT6C5MNxNRdYoggnVuZmDEHnylXeipx8PHu5UCBQK9lwyhyx6vtMqldZ9NWnvV/VeZs7O/yZONFfDW14jR/W16KlIAn3O7beneGiS4pYL3QSjYwMtKERaPRSoGeqgVqN5BpDFDtfynU7PNkrgZfvplYeKvQu/DXEuc+j5bGrAiM8Fw5FA4YW4LQFdiUaPVJrl+PiwgI0ZppAyXIs3BUuK0nKc4MzRpkeRKn1QEyoCCt/PzVhHS/3wynFEC1ZBpJRAodTJA+pqlF6PjoFTZXRoevP9TuCiaO0GsaxjjryMaLN3y2Y8a5RqSRC7dPYn2A8q536rPg1qVjCIPFaWI2QNeiFqTHzGhQGifp61tlHKADEtQnbGOnd4TIQh/5XLtfCZ+8vcUF3KrjQVGaR6DLS9gS6/8nipBVuT2r19ZEfIvJ23ru4JxS6n5PosLSV5BiY8QJ8q6+9SXAwy3r47s4kQhoE3+s0ropgFuXbm0XjmctLIDyFWGSuoD+n9z74jgPSVumCMLBqHpBC7pumWO2zmh2/ZNl/bGmogAvDwWkyW0vVEZ90Vg5C/eBTItwa37Gx2lZau3qN0bMMlLryCHFRLJcEx4DzvzZzx6nixhcEKZVAQai1YWgc1kZ0lz+pD53S8Zd2q0oWwAxcF 3eCLAkUG WnC23V9skVZFeoDFtJaQL2Dx5HXO853yoIZZ118ven1yCVV9O6mtu4sR5RpXH7niUgneyR8upqt7Wh14SccMBGF8HNY89tWLyF35zYKaYSw5xFiKVJ8vKig6D+paw+4Pvl3CUtLUX8Mm5wgJlhK6yQ2XVsd0FTnh/D5JHyv+56jfYxaMqwcZMQus/ukFt6P9haXH3U1hNNiO/RcjFJcYpcJQC4o0h9QLG2m/jrmRnuew6zP6iKOemj/aA7BrusHb9IacgkDaPfPPLjCyTQZJVkbRGvr4q4tH6fsFpn+RXsIZdlNkNP4rrt+HrI2ajXtrO0Z114ya5ftMGX2zaUKHyecpsS5AvdzlWu6vzlZ6oKFV4fFS9gyCCCBc6TSaJezJCYaeBFHNHVBlUubJ5edgD+eoPWgw98rMYtqYYOhaSsMdwRfNUKqo82ukGJQ6tyqu19DnPttaUlCb6nekWuikoMs+V/g== 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: "Martin K. Petersen" cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-scsi@vger.kernel.org cc: target-devel@vger.kernel.org cc: netdev@vger.kernel.org --- drivers/scsi/iscsi_tcp.c | 31 ++++++++++++------------ drivers/scsi/iscsi_tcp.h | 2 +- drivers/target/iscsi/iscsi_target_util.c | 14 ++++++----- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index c76f82fb8b63..cf3eb55d2a76 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -301,35 +301,37 @@ 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 = {}; + union { + struct kvec kv; + struct bio_vec bv; + } vec; 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 | MSG_SENDPAGE_NOTLAST; 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(&vec.bv, sg_page(sg), copy, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &vec.bv, 1, copy); } 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); + vec.kv.iov_base = segment->data + offset; + vec.kv.iov_len = copy; + iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, &vec.kv, 1, copy); } + r = sock_sendmsg(sk, &msg); if (r < 0) { iscsi_tcp_segment_unmap(segment); return r; @@ -746,7 +748,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 */ @@ -778,8 +779,6 @@ static int iscsi_sw_tcp_conn_set_param(struct iscsi_cls_conn *cls_conn, mutex_unlock(&tcp_sw_conn->sock_lock); return -ENOTCONN; } - 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 26dc8ed3045b..c7d58e41ac3b 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -1078,6 +1078,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; @@ -1121,17 +1123,17 @@ 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; }