From patchwork Sat Jun 17 12:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13283555 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 C8A9BEB64D9 for ; Sat, 17 Jun 2023 12:13:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F15A6B0089; Sat, 17 Jun 2023 08:13:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A21B8E0003; Sat, 17 Jun 2023 08:13:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 452496B008C; Sat, 17 Jun 2023 08:13:01 -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 331886B0089 for ; Sat, 17 Jun 2023 08:13:01 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0E427140146 for ; Sat, 17 Jun 2023 12:13:01 +0000 (UTC) X-FDA: 80912128962.23.18F7BA7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 5885CC0002 for ; Sat, 17 Jun 2023 12:12:59 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZH3uQ90Q; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1687003979; 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=OHKQtK2bBtYGXNNMUQEosjMY8OAQ8RY4spygVM+GbCFzePp6o/+9NWqr+50STvQ+aH8LJW zzqkmL3jVJwVGbXGpNNHAjun0890Iil6N2lsP/B/vJLfdAnm5g09gPYnmEe42EuJcmXWP5 wzhTrJg0DKMLQEorpWQ0FrUpikmw0TA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZH3uQ90Q; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1687003979; a=rsa-sha256; cv=none; b=EdvUtGctreKl4xvSZou0F/K7gbChNT7KsdvIESzuVxqyJauhqzY3ezS4LLhFDxx12hkfdr 0jQZIXMK6JgTv4tY/23mbuw2Bk4SiG3D2SE+DT6xUsZMRRK0JOjrOsqfCXREM28UYEhTYq QIsxpZrBAFaATx/Ln03AoqJ4oa4O7RU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687003978; 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=ZH3uQ90QaWYZ91CERbG+c63lDgnvZVv5e3+xwOWM3lR06+s5upuNOWRO+fpv9AndENqu93 fL/YV2dhBpzftUiBB4NDJh8OLH3ValjIivB4g1YQygx8PXktcCWRt/l0EPCQl8ktgcWLoj TYIF1qqXbbGfQQqIsZ+kwE1DeEmnr/M= 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-436-185vvMv5PdOOlfFYb8ORMQ-1; Sat, 17 Jun 2023 08:12:55 -0400 X-MC-Unique: 185vvMv5PdOOlfFYb8ORMQ-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 192423C11C6A; Sat, 17 Jun 2023 12:12:54 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 903F92026D49; Sat, 17 Jun 2023 12:12:51 +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 v2 15/17] iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Sat, 17 Jun 2023 13:11:44 +0100 Message-ID: <20230617121146.716077-16-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.4 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5885CC0002 X-Stat-Signature: 6ooqiioxrq1o8yrm59fqce5syhiesbyn X-Rspam-User: X-HE-Tag: 1687003979-797780 X-HE-Meta: U2FsdGVkX1/6Gol7QEvzbQ44h6S0Cqh4uFx0TZo1Q4uGDgUUElTxYpaSYoTPC23PBY8ZbeDXUpUvQJp/kFE22QD7wFtW5GoLBhHeT0crfQlj9h1t8boOqg9uY9x1aEMz3mUNeB/WJ+u0Pc1N0+WG+XX0LR7Z4eKLDck6U2nSoGOTFBOjwrtTnHpqiyOd6p0uVYcjikPaxV2tniTJi67QdoLmfrV7mfbLYtRc+xGovx7RaXd9ggZUzs6I11GSRZic/jVsI446ClB5cIkxsWFhABRliRtBgO5QMlWbYCPFnGC1r+dBwNobghheAViNHYegUx9RsSgL4bPwNRDJ/YwjWSmbZwczNcIr3+te1jjNSgUI9hGzsBjMZQBqaFNLYv0GS5Fq/porTGECuN9oN52WNyb7j40kVeBGpACkzDyY/09rPVldXA1aYLIWl9NfXXf6zaOtCd5qG7LZlZkDvAA4NZZG4XssyDyb1Fa6FFcjVIYhJRHZDexEfBJUBSZbZyK9sjmUlJ0WtQeaNUogqBPFfdzVc5iMB0gqzj1Bo1z9uml+IXydyhR3Rp3W27XxrhvFO0B2x8iTaI5esu5NiQJ+4gfpXH5AArDoAopNkDuwTo5bdz0Zjw18JEdmsbJTln97Vgk5s37EK02CirY0NsRMHQndrMwiwrXoz2Y4zQnYJjFiILTHqZUSA9TWCiO5rOM92S8KVfFoVo5zeY1xcH+xFGMSomRWCMvvBAR53hlOi8UGjIM5V4JL3+adaB5EEZnmNaGNROtSa7P7tTHTYYegXqVD/WO7WvDlQO3zU9QLMb31jto3Kb+E+BzZNKTr7j4ixVaNv/iWGSgq8lYcyoZNLFQh7ngbGG5mmcT5MGJHyvFPbeVF9YXtztyOEXqPxSQQs2jKuGmcL13S4jnGcDpC5fjaeKx2MQIX9dnreJCqWsvvhIIBL9xaK2xs0WEIdKLwf0ej+bX8uc4JKaq1Kgs osbhDeHY 0ZxvLj1obzMagwqPPgkdvYsdBiJ8Lyc/bx11H5j7usk00eLdW8m291drXlvaNXbGWW4kdBgH8o7y3m7S22TpDS76n9s/mZnpK6ELgn4y4G4vqVUGRnFbwHAtbmX+j6Vjzf2w9Gxjgi+S+lmgiSjRFnqEKnouoT32J5nMkrFJ8z0D8cx6Doil6SIRFyDnc6fWfVrntGm+nM4UAbUrTW2HUBw/+fGwA+faHk1ZGxu7CP45ZaHB+n3PmlXbtp6JHhVOZKu/5nlTRV9Wu2OFQjBWeN3Bpo0BMUyCDD60DckxHzFtdjLAnoDwGgYWy89wUwGcPbLjUZrQRvK4K2CvCyh0dAp46nyBty4i3xaz4ZNvQ2VJgYmQtQXddF4DtKr2EdOnlFjxhjiDugjhXgCxyqq3Y99qeWFC6mslY755hd6ipA8eFPZ1wQWo6HQewlZ3Ly05u9pnO969RAgpeJmMdbqXOOc9tLWNcIGX7J8iva0I/DFtqIufPpHsFHfOLaqh0Ovv8NIymFPIwWITjcXPJeVWK3rBOlbCNqmgzfYfIfG3RxMuOGmDLArg9UcuroYfOtNaisY7e6nfKTIiQCDcaReSIZhchN3T4SHqgj/zom3Hti90432P4+5bMPT5shX7WADt7WpQnM7X9MiuAPSPCOgsU506sx+UrvX4/vN/KX1gjqlKykF3fggN0+VhmPUfYd2LvnWYIKaLiRspQEqHRxxxoZDjbmg== 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; }