From patchwork Fri Jun 23 11:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13290411 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 5303DC0015E for ; Fri, 23 Jun 2023 11:45:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC5878D0008; Fri, 23 Jun 2023 07:45:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D75F48D0001; Fri, 23 Jun 2023 07:45:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C64EB8D0008; Fri, 23 Jun 2023 07:45:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B81DE8D0001 for ; Fri, 23 Jun 2023 07:45:23 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8E91BC0ED6 for ; Fri, 23 Jun 2023 11:45:23 +0000 (UTC) X-FDA: 80933832126.13.79A0C4E 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 1D8EE1A0005 for ; Fri, 23 Jun 2023 11:45:19 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TGafjdlH; spf=pass (imf19.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=1687520720; a=rsa-sha256; cv=none; b=aOyQ2bWbry1efKPVnHKG07e5VIwLQPqgRxnwWxczrS66U5LnjYTifpoNEs9sAmdFowvoGr P9rg+NVVhVZk0yRp3vYnzvjPRt4cPCIeDt6Aj0VG72rmPh9rFrYdpJc+8vPqL7CLRqvL3m jEWLBP36/7xJ4GvSe7XswXdR8lV+zr8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TGafjdlH; spf=pass (imf19.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=1687520720; 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=fDJq6YgohECWMLRvYSaMvRBz5Nf3qARzDo2+NfjppDk=; b=XTgag5gHejCYKS2WswOl0eicHepEs+Ytir+D4Q7XVgAfijcGyBC7wuqgr2phyy1B12e83T H0u8+rDtgR3TwEA+m14UDZXeabflri0I96BBPyRjGbhjZPj0m7iw2tuonxEOWnK6ENt4jj ht4j4Sg7BF/UXVIKQMl+yESlc7B44I0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687520719; 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=fDJq6YgohECWMLRvYSaMvRBz5Nf3qARzDo2+NfjppDk=; b=TGafjdlHr7wcASnAhF0mLuPE7xam6T8akcbeN+s1BW+2pIdMwjEKtc38VeQvyf3AXLEAeK SX1smMzCkzoAFWzbeug81Qr8tjTUFYXSUOskLWP2bTbMn/ELFvjJqYXSGwUz0WRUwaoiEX MbOSIisoeXHgIeW/UXO4SfpEpwCIiwI= 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-22-hRm2Fq0zPDmOXsotSEqhiA-1; Fri, 23 Jun 2023 07:45:14 -0400 X-MC-Unique: hRm2Fq0zPDmOXsotSEqhiA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6034588D7F7; Fri, 23 Jun 2023 11:45:11 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id E750E492C13; Fri, 23 Jun 2023 11:45:08 +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 v4 11/15] iscsi: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Date: Fri, 23 Jun 2023 12:44:21 +0100 Message-ID: <20230623114425.2150536-12-dhowells@redhat.com> In-Reply-To: <20230623114425.2150536-1-dhowells@redhat.com> References: <20230623114425.2150536-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1D8EE1A0005 X-Stat-Signature: 4reriz19j5wqym1deiajfmu18xwzyg6k X-Rspam-User: X-HE-Tag: 1687520719-224135 X-HE-Meta: U2FsdGVkX1/kUTbrb92SMb3wCHXCm+mmuOA0u3/n0YJeTBBnG8jwGqao2U5NqAElPbsYfAL303avV5YK26LB+5Ne/rnOHJhfpC8CV0qv43z7KEg6HrMMEUh3ctKmlt7bjuAZ2u7zrfFxZFWgP6Mw6e2EvZc1CJNtCQCehMFk+V9NEoSBzZse2IU/+ijCOY/h3EyUYI3S16rsgV/qzl008Y7BnfhpU2n6LhZ1b1YfnmwRfSq4FVH5VtCmylBZRyyjnr0uoPMIMJHoY/F5ct7GJ9+AW8B1EJB7kDdS4j33gVK1HQGGea0eHqWFYNMZGqbXupVoCtRuIDjGf0x3mwn7wK2OUx7OjRvtCBcb975e1tPP7w/bzdBV+f6lPhZRPe+OLXBfUJco4aLngM0r5PvPpGF5P54FTaOHY2mEBJtHKknAOzvlqnl2WYxFVlXTmGOkAqeVq4IIbHISlWeqNARRMMj5CasvQzx0nGsT6Ej5mC/rcssJ/+Hx9n16f7snXvyvvpN6XXmL543EonX4ublfTcMd6sb9VRiAc9qB0sbWyYwZ0PHPFP5TrScdmP+6wEqPQkevpllFXkAw1QSyVNrqP7Wb/nUftrEjv2iquEN8i/KUuL8DSGqkGiI7yDMQGFbg8HDRfa+ZKyMKugPlaMZh5Y0TPAoWY0eSirUlyg2fsbS4407apCN1xWaAvziUzav1G4VTJZArMdnGO2d4YxVvPG/XwHXOUsCL9+ae5QyvapRZg5hCy6ayBloNR507dJx4jms6jdvhmaGTVIHc25rPleMmIQSAcjPgXFLJTLbtpLswXv9s7L5mDLWmleMVnFYkNdm5pMwQiynbR23g54G0iEZDfn3QSdSGLqryJcqi8ggT8iZGptWwKz8pCqaslb/e5aCt4o1q4xg1cOllZoCIrGjqeZuaa5MvVLMWUEJu/nWxYOnrU/bXLFHeONNisvJihhO1IpKEluDbDyEMDqY 0fDIdiD5 rwGT/7Bdl6nqtjjcaVl7mKwT3tCNpmne3C+SNhRB9gOM8vU3A0duKw1HfzVH0V1g6Oh7VZSmqTioezNqHDhgZsNtg5E2ZjELt6nsk3omLShBMffIznxUn3ECzTsNqoLQ+ENFg9DhvoKiU2uCHRudzNnwo45rNJEfEjPUVHPA/mAooI/fumaYJ9iPIL+tyIEgW3OOnIf3KPsvKBfT7RlFQy/ouiOteyDm8mI76I5vpi0seIacrAWNyCkOnIin5mPzCA8mWUg6hdJg40+FyNGSNKCuSBzLmz1IHZVd1FKcZypqvcZHoA6q7IGSz1W424OhI04nROjhMtc5eC3hFKoYkvGeMxxJaX7wLOCzRWi8MYcTxj/3ImqG5z2PuqQM4yihGzPhVdEjz1HRujpnCoCOjHTUHeDW39+39hRTmDQrP1DSpqhLx2gon6NuL10ahAohPyE+QxbpZW3QNyNnUVLURjQRqctIJGrIRpp9gdDxINP37D+JbE+wao0259bV739aU8yAbC6w1aMUg5o9cZy7GZRkSGd/fOyuh3e0Bl67m1RP+9ci0A0J2LQrx4Frq88DUBnQ8waSHuYIYRHKLB7gQHlLgnoIzgf5/U44gU1xrbGZ7GHrr+hltLdjpNimxRgtimlrVjdkb0+FbuL3Vk21YHq81Yb4KNfUTOUvoEHwxhv2cCflaQRg9wATdKqP6ysi7YlabwGWKzSNF+v5vZElNCRAiMA== 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 Reviewed-by: Mike Christie --- 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, 19 insertions(+), 24 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..89a6fc552f0b 100644 --- a/drivers/scsi/iscsi_tcp.h +++ b/drivers/scsi/iscsi_tcp.h @@ -47,8 +47,6 @@ struct iscsi_sw_tcp_conn { /* MIB custom statistics */ uint32_t sendpage_failures_cnt; uint32_t discontiguous_hdr_cnt; - - ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int); }; 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; }