From patchwork Wed Apr 5 16:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 79830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp466416vqo; Wed, 5 Apr 2023 10:14:07 -0700 (PDT) X-Google-Smtp-Source: AKy350aS2+YzWvmFzxaGXTCc9ebAQoFVq3u7vQk9ffDmtrCz4HPLkzEZo0IT7/SsBL/plACO07LC X-Received: by 2002:a05:6a20:671d:b0:d6:c92:9925 with SMTP id q29-20020a056a20671d00b000d60c929925mr5781012pzh.31.1680714847519; Wed, 05 Apr 2023 10:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680714847; cv=none; d=google.com; s=arc-20160816; b=Y+u0XCo0fyoue8q0edq1UsTOoWqOvCQ4R2CvdCvZ0+FRsReChESc/Nbk/dQjymydLK hRcz/b3wVC7EDb0RYWltgUSkDgsEGJ8+O7at17SK03KzAgjKuSSTh+wgI0l41x+XdOnW 2dwEMrPQfJtHTmxUuivgrIVpO2yhGOXf3Nyxskykq5JtIrAjLmxp9FR6C4B2/387us57 y1nn2TtaMvMzHqlZRxdG0h8NMpZIYRdjQuPjJmc9yMP3LAlf+FPC2gD+QcU4p8DiQAep hmE7KArhLurIzw0MrwudbpO2tjMxkESTzPjVB+HNbp4uVhHcXKwA16C2yzrGaj5V4qq9 j6Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DjALLcCTAkJ9GFGzQm0mxszTSA2UBcCYteYf8nsJBJs=; b=M/1/dNGd7gHrcOV2+Lz+X5lCSb+hoEetqP8abUJbxD7Zd4khR9LrD6LeVJ03ndYZ9i N55CowoTBiSwOhjGt9q6Cp7UfAokThPhQIFhrN3hHeorSEg0GtmnPzWfG+XUQFTVssQI JV9Yw8Og8s5eW0AU29cqYDVvbAL2zW3DPdmSVsoC2d45UjAw2kDpeFA4Wz90rZnjCv8d 6OmehTVWZIID2osz0C71xRbS5mUkDQJHkHQgtBvL3aDViv/aZe0hQh1awQcJZKZFqqfr 64PAWoDn9t9zbX200Hz/7oZW+lIiJtb+LAbR23NjFt+eUkruyQLM943Wkc/QDvd+zhGJ GPpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ajuQZvkL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l69-20020a638848000000b0051352239dc2si12706038pgd.839.2023.04.05.10.13.54; Wed, 05 Apr 2023 10:14:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ajuQZvkL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230307AbjDEQ4l (ORCPT + 99 others); Wed, 5 Apr 2023 12:56:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233658AbjDEQ4P (ORCPT ); Wed, 5 Apr 2023 12:56:15 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B43165B7 for ; Wed, 5 Apr 2023 09:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680713665; 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=DjALLcCTAkJ9GFGzQm0mxszTSA2UBcCYteYf8nsJBJs=; b=ajuQZvkL0V2yuCvVzAZrd7sryW1j1Ve8tkThDdH6wV8p228RRL+n236n5QaetNRs5QGJbS oxC4BiNm+AnXn0v+rmnVpl6s0RRkBhtd5MoL6YTGzaQA31d2+YPR3oa2Lg31aj4yA/uYfX wq6mrXIusVYfqc1G10zI9YxdmQtdemE= 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-561-cGYh42d-MymHRdF7Qm9tVg-1; Wed, 05 Apr 2023 12:54:23 -0400 X-MC-Unique: cGYh42d-MymHRdF7Qm9tVg-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 9C29F88904E; Wed, 5 Apr 2023 16:54:14 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C0AA18EC7; Wed, 5 Apr 2023 16:54:12 +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 , 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 v4 10/20] espintcp: Inline do_tcp_sendpages() Date: Wed, 5 Apr 2023 17:53:29 +0100 Message-Id: <20230405165339.3468808-11-dhowells@redhat.com> In-Reply-To: <20230405165339.3468808-1-dhowells@redhat.com> References: <20230405165339.3468808-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762357251681814676?= X-GMAIL-MSGID: =?utf-8?q?1762357251681814676?= 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: 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;