From mboxrd@z Thu Jan 1 00:00:00 1970 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 5EBD1EB64D9 for ; Tue, 27 Jun 2023 19:03:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1B4E8D0002; Tue, 27 Jun 2023 15:03:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ACAA58D0001; Tue, 27 Jun 2023 15:03:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 991EB8D0002; Tue, 27 Jun 2023 15:03:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8A43D8D0001 for ; Tue, 27 Jun 2023 15:03:10 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 516A11401E9 for ; Tue, 27 Jun 2023 19:03:10 +0000 (UTC) X-FDA: 80949450540.07.114E11E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 1937C40020 for ; Tue, 27 Jun 2023 19:03:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ikJzfkTJ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of cleech@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=cleech@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687892588; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sCI/D1beeMuSDdc7buAbwdUV7v4DV3y3fmbUulZO5CA=; b=rkTSzber/u/JwlKenX8rrRzq/GRHmH8U34hJ0WGOGbgr0UcmMP8DNdbPsSApWzz2kRJLqk Oan5bv7JAatDE8SqZS+h2xaDl8D10zEfSEqPfq0EkuG/tCwp3UyKIA88QqtXsh3I+LOHfb a9VrJ2tXSoEEtWs3J5v2kdjax+b1GtU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ikJzfkTJ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of cleech@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=cleech@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687892588; a=rsa-sha256; cv=none; b=tPfvDKSHy8DqqEZVXIde0uSVPOn0GNOfEGykkoSbY6fm8eRBso2BnmgeQ91AabMVqiASfh xM7grvuGr9rqVfNbt1JhGpR3s09jYRCtbZPIhM/p64ITR3agUdYS/WZjQxHjSYxgaVggNT V/u6znMk7A4IJTvJzoiwYAMDjQBocYE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687892587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sCI/D1beeMuSDdc7buAbwdUV7v4DV3y3fmbUulZO5CA=; b=ikJzfkTJOd1F9vobjnDAkp0JT9yNC7CIG1xiY0nP5Kz2sGfxuEjePMQPq4T9H8ZDtbqdPN KeJJpzsllAE4IOAR+kw0L8q51fjjsWbBqfH9VEd225r1j/67Jswg33kWOn7BmxVjsGfMeR +znsUeVzF4+305TbP1+4cHNK+TazPN0= 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-6-ArLMsJJIOvWM1THfmZi-ew-1; Tue, 27 Jun 2023 15:03:04 -0400 X-MC-Unique: ArLMsJJIOvWM1THfmZi-ew-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 C760328088B1; Tue, 27 Jun 2023 19:02:44 +0000 (UTC) Received: from toolbox (unknown [10.2.17.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AEBC200A3AD; Tue, 27 Jun 2023 19:02:42 +0000 (UTC) Date: Tue, 27 Jun 2023 12:02:40 -0700 From: Chris Leech To: David Howells Cc: netdev@vger.kernel.org, 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, Mike Christie , Lee Duncan , "James E.J. Bottomley" , "Martin K. Petersen" , Al Viro , open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: Re: [PATCH net-next v5 11/16] scsi: iscsi_tcp: Use sendmsg(MSG_SPLICE_PAGES) rather than sendpage Message-ID: References: <20230623225513.2732256-1-dhowells@redhat.com> <20230623225513.2732256-12-dhowells@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230623225513.2732256-12-dhowells@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Stat-Signature: 9nq3hdshjwgw39b5ci6551xszuegnr1b X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1937C40020 X-HE-Tag: 1687892587-153699 X-HE-Meta: U2FsdGVkX1+kr0loCEifYd/7K21L+3daOLmJPEp9VlElm8Ip+0uXpAzxnMDvO+TDnYsbcT81TMa3zxxjhmYUpchHMXKMAiAqusGCFiRF+C/PfwrS2c0d4tRRTs4jRgKVCqzF/fyn5svSrR2N9q3kpq82rSdc+7hh8YuWoK9B2hkkz5LoT2Y5WmGvyY7dmsEwXNwqe0fw10Nzz+CUsRmt0Na6wzpjFfqv9Ql5Hr1DBa+KbmkAAhoIXaRUk3nFQlQ8spQ97SNHEEgEbavSO6Mms6EPLlRLu2q/Nnx0UrtOnpSfIatoQaWzMPKfW8dRHnEXzdqQ05Kx/LF+jGCR3ILi4hZtk3tXtGZtNsDHp7QzC3EmDN59SsgmwDeGsdcScmvxv5GoCGdYMF5zy35S7svnt8Exb32Wc9HGDQ1HvCmzo0hkuMR8iySHMLc6n/TPyP2Fi/MRGIS0KtV5t38U7kywM+qZQm4Pmv/4LuYDuImRg03Cs87/cchIN4mcKHXIFXpGwC2SQ5hhuwjggUBywC87KjxR07Zm4nxMsaO5rMzSvJvJr3D7WRfaZr4YAKZf7+Crgy9yF23fxWn1N+pzDbyWRWt7jZXie07f2V/FvRkVzhDpUj2qY5JZ0L7SG+twaQUBD6jXkFpj9m+U7QuI0i1TmauGQfGEr+O6Y0Y/eC6cczmP8eQAmag9N7RAeqRYiH26VIRSXdjDuuVcC4AyrcjuteD++ewFJVz3XD7V85yxUy4wlFdzrYsWavaafEeT6DY9Wcc9NG5vzuvPLGAZv9cjiZmpLoJJKCp2TKou2nJbKYXz7hyLn2UuOJWFvk0RnkCIohZds59Hx3fjgmW7oJOyDXknZQ6tgjwoGANUgtMBqGQCG+pOXVCha5331ZnnaU3DEYiUcYvyWcmFdVq80TV9s/TBp7p39G734Iegr8Qtn3InDVln9RTpMgIONNNZu+6mK4wHNSxzQ21fSCSWvlJ iFa9XIdo kygsusIrhf+Kw/oyvRCo20cZs3K9e4UBjCFCrMuiPBrfcSm8ap7AyaMj+mNIKDlhWhY6FWb4QQyLo/YI3ic/5XvYUvhaWSRswzodEVeSofYr95D+s4b3tryYBXe3ho+1hkBTP/GF3kTKtT8ZCUouclcgd2vLJNf4Fv1uQKH1saDibJWU2LF7YWsbZEjz+cHlg/+nR5SkacfSviBXmUdAOAQpPYxKAlbr3u5gy9sNuW30sCH8zF1M36cAIzm19/6osMyWDPEVOcgsXZf3L5k3vD2dzfl4qvKplJIFDA0t3Gcs9o4BADwfXkL59/kz/V56wHmoRI1J9dFvIGS/1ZYaJoIvabd0T/68DTWIklQAm5ttzZhv/KwN8yru1nb0T1M02We+iMeEXKL/6CZT828MzCUFrRmnAs42BQ0S/NWqgEK9pZxkS2FklZnJO6SdV47ozq7gG6wvS8z9XJF0d9aTNTG3oPilTNbzWHZBfiZ3YmFLkGbYhdXOulIu6sRkvfpK4LwB2a9SHLMjOIqG1z+UODcpV5D5/SMW6BSN9sSvZSgvoA12eJ1R9vyo3u493vINAIixayNxo2oSPZVv2X8DFiLyS8xogmWyoZXyF85wT2s9E18Ik6yZ44lCBmknxd54izPItCibCEQxZN5DQn5CLEjmNW+M9gXvV2JwSpOibU8kdblv9JHDBHinLcC7x3TkAa5MZ1pEfh3HQwfmlUbSPUCA8y/qLKLfZnzD7 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: On Fri, Jun 23, 2023 at 11:55:08PM +0100, David Howells wrote: > Use sendmsg() with MSG_SPLICE_PAGES rather than sendpage. This allows > multiple pages and multipage folios to be passed through. > > Signed-off-by: David Howells > Reviewed-by: Mike Christie > cc: Lee Duncan > cc: Chris Leech > 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 #5) > - Split iscsi changes into client and target patches > > drivers/scsi/iscsi_tcp.c | 26 ++++++++++---------------- > drivers/scsi/iscsi_tcp.h | 2 -- > 2 files changed, 10 insertions(+), 18 deletions(-) This seems good to me. Reviewed-by: Chris Leech > 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 { >