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 5367AC6FD1D for ; Thu, 30 Mar 2023 14:27:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A74D26B0072; Thu, 30 Mar 2023 10:27:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A23D7900002; Thu, 30 Mar 2023 10:27:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EC206B0078; Thu, 30 Mar 2023 10:27:12 -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 82AB76B0072 for ; Thu, 30 Mar 2023 10:27:12 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5FAC34101E for ; Thu, 30 Mar 2023 14:27:12 +0000 (UTC) X-FDA: 80625791904.21.E54EEF9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 73E3C140012 for ; Thu, 30 Mar 2023 14:27:09 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NNGs/63R"; spf=pass (imf26.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1680186429; a=rsa-sha256; cv=none; b=noIYz2TgJTX0h8f/nCt38rGpydz8rl99R4lbPNN3ffodvrNFzFtTWavUCWp2nE0mS1ZHbW pshagXlcAM5ZhB+/OlXn/Y/mIg48M7RfOnpz0L2LP2EcA4enzXIAgdUv61RJ1JL/XGH5qe 5gYyrLe0AKltolyx082A853qbfE7OTY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="NNGs/63R"; spf=pass (imf26.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1680186429; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iywXSeja+4hH/ErrL8m8CoW+J3pVfduyOhfyme6hsWE=; b=R6vW+QTpbcVhf0X26/ZE9NAJs2s7fCVvcEIyPQdJDC8OEu7rNaKf7KQGWNwGj2jdYuGL8b MXL4x+RKQCLiNk4iGYbRML8M+diY/ENoAQb5umm0EP9kWZKP491MqikO2M4f/cQ1YmqzyP 7aFhgDYpm31MK+r1BdLCiBHM+86Qv3E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680186428; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iywXSeja+4hH/ErrL8m8CoW+J3pVfduyOhfyme6hsWE=; b=NNGs/63RmJIvUeA7CTc8+3ykTcR/uR7uuK++dmG6fwbnKZX4HLdSODMX8TGuR+n+e3FggT T869WKeSCVML/i6QmqxVpaZ4Ik9C4L9nklV5vE1l5BNj7CI2GMPCx9L6gyYxQ5jBfdz+I7 AlytgjHKw4q02VYmHV0OyjhmKcVahaM= 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-599-0cvLYY7SPAuqjcSsQFN8FA-1; Thu, 30 Mar 2023 10:27:03 -0400 X-MC-Unique: 0cvLYY7SPAuqjcSsQFN8FA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9AC95100DEA9; Thu, 30 Mar 2023 14:27:02 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56203404DC50; Thu, 30 Mar 2023 14:27:00 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <3A132FA8-A764-416E-9753-08E368D6877A@oracle.com> References: <3A132FA8-A764-416E-9753-08E368D6877A@oracle.com> <812034.1680181285@warthog.procyon.org.uk> <6F2985FF-2474-4F36-BD94-5F8E97E46AC2@oracle.com> <20230329141354.516864-1-dhowells@redhat.com> <20230329141354.516864-41-dhowells@redhat.com> <812755.1680182190@warthog.procyon.org.uk> To: Chuck Lever III Cc: dhowells@redhat.com, Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Linus Torvalds , "open list:NETWORKING [GENERAL]" , linux-fsdevel , Linux Kernel Mailing List , Linux Memory Management List , Trond Myklebust , Anna Schumaker , Linux NFS Mailing List Subject: Re: [RFC PATCH v2 40/48] sunrpc: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <822316.1680186419.1@warthog.procyon.org.uk> Content-Transfer-Encoding: quoted-printable Date: Thu, 30 Mar 2023 15:26:59 +0100 Message-ID: <822317.1680186419@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Rspam-User: X-Rspamd-Queue-Id: 73E3C140012 X-Rspamd-Server: rspam01 X-Stat-Signature: q6y5m49ffn3wbgz6t4f3s6p4x4f9xfqr X-HE-Tag: 1680186429-666806 X-HE-Meta: U2FsdGVkX19FGJJ1ofgMCAyQVUu5B/H62Hh0Y4CYbXnnc8gI4iwQetHZIA90hWJ1IkYNAyWGaAyYDCLWNcvxt6XCnHXheMLo8pTfYoiLNPP2E6zNS+tx2Z8ECqERmdgKxKWF6O8okkYMH5zU98B9Fj8uchQxc+QAN4X0/rAyAvHatn3YBg12d/ox3zrD5nF3+vuU6nqpaiFyJhvk4+Gyo9NyYqyeBRQL/kcJtj9pr1myCflFr7y/eL4Tf9CqM3UMzFxToWyMivCEbfLaecq2ggQckteIC9D+wnVErgWDjhrL24GD0PEq88GT4To6yKxA95d1Oy62anv+Vwsxw8ZUuAYkhvzTUGadtNsHm192ka89yA7M0G3N2WKFUnGS4vKodVHDS4IzLyV1xDf3MI6Yu79XJYShl2BpA3slArDj/Vk3VJEhzag0QmVV52JNWr1yupl4ek0OAMuRe6auGXMsptkLxqIwGmD4KtYnMhStVkazEQZj18JFaHmV9qJpXNHhiEL7QtVnaCIRS7n9e3eAwGbKX/jgAdaP/X/psbzRWBClt/OFNyue2lhdbf49V+KS029TFmV5CX0ibNFjcbULXOeTXxXguclLE5kTMMqJa0PsQM9nNl741k+cP/2Oy6O7Ooi+xuiJQxaBm8cO1dP6Zw2S84pnV8a0QY/EM/bZ4TPqTGb261bm6AWuFM0d4P1tYRpJq6xXyQ0BQD5tV81V0sLPMZ/fcwhkp1tco3Z6d/Too/k2DBMjT1/4tMVudFpVHRwgwqGKF1l5a+knT7BquN93BLaWdU2yWxaN5h6QqzHnNQVWaAekAHg4YZ9R9oLBiNaeI+7jl0hWcgjn++TLO6sehgOhbjlpY614zAGXjAwN9vhrTrcZh/ZLpz+p33wpMjfDbtqibfNmtttHxhbUMJy49Q8j33S9sm7GBA4mHLwGezcr/FJLH63YwZOO/jXl3VYvyENfpt7wq7jR+iw fjjcj7KG eR5AU51tqhsgPQXPQS5WQFv2Z6ehVC4lTd9IZn6e7zbzXJTn2W8XHURjdDnY2FJfjHYVK2vQ4rFjGBFvDYQoNn7v307waUTK34XzhL4E7aiZZ5iTK2dGSpb5Eyqz9kc3hJ9Bzl+Lh9PwGv/5h629tR7ieuqGtY5upR8WjOFcYhZ1rCDvGMr3A0uBHR+CVKF+Hry636xK0J+mh7N18uFzqcdn9GaGW+g4QK5LZSqUix1fPI4sPwpsFZ3gGFNpP9L0Uv8vwed7l4j5pnUnZaxXlJ2seeIKN0qhLb/2xlIBgsVUNJxNaz8fkUDEUZ4mac6rsRJPYfAojte5UWae0G8mei4IwUcnuq4qGH/g/lghVgzRP5rWaYD1MTRqob++xQZik1ssk3rjImhfCI+gbmR74UaQpVR0hTZOatv9OzIkTixi3M+7O2U92AGQeKQK2Yd6x4e6fDEJIbfxHWIEFt1eKdmE28PG3Tda4r2E+K7IxCt9sAaKqL8Wz2qgeCBGjrmy4Jb00JPfY0pdOAXuWgB+TfDmhwA== 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: Chuck Lever III wrote: > Don't. Just change svc_tcp_send_kvec() to use sock_sendmsg, and > leave the marker alone for now, please. If you insist. See attached. David --- sunrpc: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage When transmitting data, call down into TCP using sendmsg with MSG_SPLICE_PAGES to indicate that content should be spliced rather than performing sendpage calls to transmit header, data pages and trailer. Signed-off-by: David Howells cc: Trond Myklebust cc: Anna Schumaker cc: Chuck Lever cc: Jeff Layton cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: linux-nfs@vger.kernel.org cc: netdev@vger.kernel.org --- include/linux/sunrpc/svc.h | 11 +++++------ net/sunrpc/svcsock.c | 40 +++++++++++++--------------------------= - 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 877891536c2f..456ae554aa11 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -161,16 +161,15 @@ static inline bool svc_put_not_last(struct svc_serv = *serv) extern u32 svc_max_payload(const struct svc_rqst *rqstp); = /* - * RPC Requsts and replies are stored in one or more pages. + * RPC Requests and replies are stored in one or more pages. * We maintain an array of pages for each server thread. * Requests are copied into these pages as they arrive. Remaining * pages are available to write the reply into. * - * Pages are sent using ->sendpage so each server thread needs to - * allocate more to replace those used in sending. To help keep track - * of these pages we have a receive list where all pages initialy live, - * and a send list where pages are moved to when there are to be part - * of a reply. + * Pages are sent using ->sendmsg with MSG_SPLICE_PAGES so each server th= read + * needs to allocate more to replace those used in sending. To help keep= track + * of these pages we have a receive list where all pages initialy live, a= nd a + * send list where pages are moved to when there are to be part of a repl= y. * * We use xdr_buf for holding responses as it fits well with NFS * read responses (that have a header, and some data pages, and possibly diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 03a4f5615086..af146e053dfc 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1059,17 +1059,18 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp= ) svc_xprt_received(rqstp->rq_xprt); return 0; /* record not complete */ } - + = static int svc_tcp_send_kvec(struct socket *sock, const struct kvec *vec, int flags) { - return kernel_sendpage(sock, virt_to_page(vec->iov_base), - offset_in_page(vec->iov_base), - vec->iov_len, flags); + struct msghdr msg =3D { .msg_flags =3D MSG_SPLICE_PAGES | flags, }; + + iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, vec, 1, vec->iov_len); + return sock_sendmsg(sock, &msg); } = /* - * kernel_sendpage() is used exclusively to reduce the number of + * MSG_SPLICE_PAGES is used exclusively to reduce the number of * copy operations in this path. Therefore the caller must ensure * that the pages backing @xdr are unchanging. * @@ -1109,28 +1110,13 @@ static int svc_tcp_sendmsg(struct socket *sock, st= ruct xdr_buf *xdr, if (ret !=3D head->iov_len) goto out; = - if (xdr->page_len) { - unsigned int offset, len, remaining; - struct bio_vec *bvec; - - bvec =3D xdr->bvec + (xdr->page_base >> PAGE_SHIFT); - offset =3D offset_in_page(xdr->page_base); - remaining =3D xdr->page_len; - while (remaining > 0) { - len =3D min(remaining, bvec->bv_len - offset); - ret =3D kernel_sendpage(sock, bvec->bv_page, - bvec->bv_offset + offset, - len, 0); - if (ret < 0) - return ret; - *sentp +=3D ret; - if (ret !=3D len) - goto out; - remaining -=3D len; - offset =3D 0; - bvec++; - } - } + msg.msg_flags =3D MSG_SPLICE_PAGES; + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, xdr->bvec, + xdr_buf_pagecount(xdr), xdr->page_len); + ret =3D sock_sendmsg(sock, &msg); + if (ret < 0) + return ret; + *sentp +=3D ret; = if (tail->iov_len) { ret =3D svc_tcp_send_kvec(sock, tail, 0);