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 52F7AC76196 for ; Tue, 11 Apr 2023 16:09:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDF93900004; Tue, 11 Apr 2023 12:09:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D6728900002; Tue, 11 Apr 2023 12:09:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBA77900004; Tue, 11 Apr 2023 12:09:49 -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 A2D73900002 for ; Tue, 11 Apr 2023 12:09:49 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B1BEC04A0 for ; Tue, 11 Apr 2023 16:09:49 +0000 (UTC) X-FDA: 80669596098.03.6563533 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 4D5B1180030 for ; Tue, 11 Apr 2023 16:09:46 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gfBuvmFK; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.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=1681229387; 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=tYeoTX9B8dad49qWPHePVLYzX6oyR1jBlVymL6Q5Zsc=; b=skCZ4y1842lNLlashf6DinVASPqaGRkDYJEY41cYgZ2SD3PgQIFhpTqmJrE+63EQKfkJu4 +a0/8i2H1l+FksUq8ySzeHbI4POYJDaRHwiRd2Ga9gVQuAfMstQcc+rxbVMqDKC2Z2DkOk nSGIOkjOgkwm2jb4sOPv/jdkUa0i8jw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gfBuvmFK; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.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=1681229387; a=rsa-sha256; cv=none; b=Hs7rGHsWEfxC8ZIVIZ+SOCAA6aLUeKQlLhj4t0+EODVdMw0tL9gwbnmIFxctBiRM+8AUZp PAKfnd0BBYzD/PcmdAe9JB79gtPmqZnpyCLbW9+y5ox6Vw2Oq5ozhSkdEdmmnHE+jOxvhc 4hJkXEsWE7HTmP85ZWHAuGY3AkGJIpk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681229386; 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=tYeoTX9B8dad49qWPHePVLYzX6oyR1jBlVymL6Q5Zsc=; b=gfBuvmFKv3z1jYlUKaNFNCsekjxaS7TqinG+//1KoVR7TTxnBGOY7B2biLteXD6440bKHS N0Cy5xKV66E9O05yUfm5dhEGy/E9w3MIFLAUqWVyNhTLsZhyCdyZS81eiogrMJE2aeeZ6y WM1i7q9vqsjJL/NQq6gq93zsoedGXNY= 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-77-UXK5c0oIPSW0QoQ1NoAdzQ-1; Tue, 11 Apr 2023 12:09:42 -0400 X-MC-Unique: UXK5c0oIPSW0QoQ1NoAdzQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16E3B87B2A7; Tue, 11 Apr 2023 16:09:41 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6348847CE1; Tue, 11 Apr 2023 16:09:38 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Steffen Klassert , Herbert Xu Subject: [PATCH net-next v6 10/18] espintcp: Inline do_tcp_sendpages() Date: Tue, 11 Apr 2023 17:08:54 +0100 Message-Id: <20230411160902.4134381-11-dhowells@redhat.com> In-Reply-To: <20230411160902.4134381-1-dhowells@redhat.com> References: <20230411160902.4134381-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 4D5B1180030 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: hdx8e93k7559rjpk77m6dg93n5hkiy5n X-HE-Tag: 1681229386-994465 X-HE-Meta: U2FsdGVkX1/WOMs2giT3F/I8Yf6DreRoSUUUvTGFUlUygBorbH37YbY5tro2e7bo31f4Owy42O4iG+xNscURlQ+Fzoku05s3y7ohjXvH/cmAqbmlf+rZQOtZkEnrKo0BU2fxN11K8i7g2IrULr+P44QuZ3nUMj6j+a14D3FO4ySXBNC++9cf/RBPZyB9ders3S2W91M0ZSBosFFEcMceqb0zVBFnS2BxjAWyZfbx9f4vCNQNDCQnllylQJfgi5fVloUNiApXZ2+9QlHU73ONPRJfUWuswqYge0CYTIuVZ6osvBA1xsM0lpRoA/mw7LDHsfsc5JUgg7PDRkGRdzpHajE6F8uS+6+14QNHLTjOH1R9k8MYyw8InGuJVXJK8KUuQLli0Ohf8MGksYoJT3/LbTKv8kM/canIRCHKNhqmCUQWvFaQ33xIu1SkLVmqO9zR3s8ltx7YYKba7TUOPBQS7PX3m5UuNTX6eaYSoCy8S2vRER8Eh7Zf7XQHpuneydU0KnaSYkepCWFGo8/fsGN52Fc4cmBydKBU/QbzgAI0MSveO1H4zo+uC40hbnW0GXPBdBsQ3cKNrcgi0f6F1nNttuZ+Tg0Bv1/2S4DltTcMVxM8wSYgcwF4F6Qr77gJXXRV8rIc7W+bxiXYLt7GwFvqsOUOYZ/ozbLvD6RK1ToLaalAKhudV7CzwNLn6ZCXjbrIx9ar7ggK9qod8UPWrWAkDL4zIf+34bMcJ33FvmGukodp5ePQ3vZQ7N4zArDABfGaKKI1Uu9wp6783Pnwm+MehX5QlzPrlZqDks4XhyZj8B5KHI409S89qtPDVela1DewoqDTTRlUa3rL+7BnN0e9XfFCEX8MpRwTJaj3r9R83wUw8KJYgeOgSqw8l2evCiL/aIWRey7CQF2j7/VZkzIIG72TTYFZtFRsLTfUlFmY1iZRTI2+oA23tx5FVWhlPUFMQVb/NADilxi/Bj0/TmI qoaSyNPc J8vBxlBDlGkIjw+tCOLeflhGVZRYD+2WAs0F5bA9pLuQR1NrRqCZn2bQinkruofPETiicYLZ4m2tgXnySUq1Zjy04sMoYUp5vJrF7QG+QG/+U1vRGemgAU5Imdi0oD3rIURv6043cxt8G8J/AoDqxv9xedGOtu3mrTMRQ+riqnHDyymPN8CwVXNWKurtn1pbTsaMiII9u80X74W940IdNFOU6A34eYjOgVUnlDpXv/ef3D+4Wz+mK7XKmeihFu/DBFtVvKOQg385ppGOMk0TK3g6AxL2fycOewhSkIkHuFKMxQHdP6Af+/LdjOUDR92oeVbRq0Ltji7Z4Mw8DIlH5Gqh7i+sFWFWph6NIY37bSmzhAFPYpQPOgIL0+kCGzRadVlNsOFQpdnlfugcyjyb39VJQ5JQHxPxoJAXrXcArOk7dAyb7UbSCRxHPUxJpoiY8J1PAQuspUcp2y2H6MmfH3n1RwTBFbnvhyQXpGQWGzo4iBXc9MnPvIzicnLEfdEDJnaTZ467WBtBHUyEY3WK8vyk/b/PP/iRfbTyzV2mE5dIgbBBHu7kSmo77q+PIGI3dBuPbCBkBBOeEYP13WYtcuHGS264Jiyc6hxUZ2SatJkE/CRKsU3SLHkn7FA== 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: do_tcp_sendpages() is now just a small wrapper around tcp_sendmsg_locked(), so inline it, allowing do_tcp_sendpages() to be removed. This is part of replacing ->sendpage() with a call to sendmsg() with MSG_SPLICE_PAGES set. Signed-off-by: David Howells cc: Steffen Klassert cc: Herbert Xu cc: Eric Dumazet cc: "David S. Miller" cc: David Ahern cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/xfrm/espintcp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/xfrm/espintcp.c b/net/xfrm/espintcp.c index 872b80188e83..3504925babdb 100644 --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -205,14 +205,16 @@ static int espintcp_sendskb_locked(struct sock *sk, struct espintcp_msg *emsg, static int espintcp_sendskmsg_locked(struct sock *sk, struct espintcp_msg *emsg, int flags) { + struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, }; struct sk_msg *skmsg = &emsg->skmsg; struct scatterlist *sg; int done = 0; int ret; - flags |= MSG_SENDPAGE_NOTLAST; + msghdr.msg_flags |= MSG_SENDPAGE_NOTLAST; sg = &skmsg->sg.data[skmsg->sg.start]; do { + struct bio_vec bvec; size_t size = sg->length - emsg->offset; int offset = sg->offset + emsg->offset; struct page *p; @@ -220,11 +222,13 @@ static int espintcp_sendskmsg_locked(struct sock *sk, emsg->offset = 0; if (sg_is_last(sg)) - flags &= ~MSG_SENDPAGE_NOTLAST; + msghdr.msg_flags &= ~MSG_SENDPAGE_NOTLAST; p = sg_page(sg); retry: - ret = do_tcp_sendpages(sk, p, offset, size, flags); + bvec_set_page(&bvec, p, size, offset); + iov_iter_bvec(&msghdr.msg_iter, ITER_SOURCE, &bvec, 1, size); + ret = tcp_sendmsg_locked(sk, &msghdr, size); if (ret < 0) { emsg->offset = offset - sg->offset; skmsg->sg.start += done;