From patchwork Thu Apr 6 09:42:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 80170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp898394vqo; Thu, 6 Apr 2023 02:54:32 -0700 (PDT) X-Google-Smtp-Source: AKy350YZdWy45WQ6inV5oRjdmL2RifSFwpCC1S3J/sPuOOYEJLzZy3carGmtykfNBWrIoY27X0Kt X-Received: by 2002:a17:906:ae9a:b0:932:40f4:5c49 with SMTP id md26-20020a170906ae9a00b0093240f45c49mr5738987ejb.67.1680774872144; Thu, 06 Apr 2023 02:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680774872; cv=none; d=google.com; s=arc-20160816; b=JsyOeZq2VcwoOeq0JgfqjyJR7nXlv+4lCX0MblC/LpWwZNH9QxhoAyFqiVbeB0Q+XD sldo76MDn01+jQM3YcTBMbc5+ZRoJhzwd4meNljnxMe0xN6bu658eN4q2Z7W0DZjB7EJ QTQUJ+bRLZviiJtgsRvRK0eEdZUEl1qWW3zltgpIsD3Emsm5CxPXHfU5adyn4NF9U3A7 ibBKQLwdwZ6juBvPBYJzfTpn25v4bWUxQXSLb0s6yDwBS96S6BniTO/WwFVfbyrfAdXy l/pDoHR7gEWYDIhkkDWRjbE+THA8GUaT4QcR8WXEpbdfDcrV02BZHPkd4Oz737vK3RBS gzIA== 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=HO5c6fWLbjU5UW9pwObE4TQgRDIF6vfHUazrp9mJO98=; b=qDiHlwLGz3RaBbWQrR+Af1n0z2C+6SkVoAqB9zlIZYyLKhIx7pojTbVYEilsd/GoxY kFobuonOFJwau1nN8ckV2HKc4FRVBgLMuZC7FdJBEV0IFH2/94bNIkqcWaPp2wzvEjdN 1NloRMnuhQQjs/xIbJ8IclpBRCgzZCr7HhfdPG0PefFdaVSM9gC+1BdMsEm3QQUom6Z6 /NsPb0hmM8Indga+mJZekTdGN08BrkkEveTJtikL3QWzXXimupjyXg5F2T98/7XAM3+o uHYr4AXOH+D8oygzfkqnj/IP3rny9T0U/vVoee/v60F7yF+zZrr3dfoEjlQ5Au+ttaBq 71QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CeqZjy+Y; 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 hs31-20020a1709073e9f00b008dfcc758d90si344381ejc.789.2023.04.06.02.54.07; Thu, 06 Apr 2023 02:54:32 -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=CeqZjy+Y; 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 S236978AbjDFJqb (ORCPT + 99 others); Thu, 6 Apr 2023 05:46:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236815AbjDFJpO (ORCPT ); Thu, 6 Apr 2023 05:45:14 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60B6B8A54 for ; Thu, 6 Apr 2023 02:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680774227; 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=HO5c6fWLbjU5UW9pwObE4TQgRDIF6vfHUazrp9mJO98=; b=CeqZjy+Y+/B5qk8ACfOsCcfRscRi/3F/bDwGhGm4UrYMOIJ0hrdoFRREMHU6svQlMh3wOV TxpU0hW9XQTalxM1WE9BJgkpYp9LteYNPlQSdnuyCqDJZoWA323SgFfxyipes7cmdy0INm shDdt4m9s8Pf5PfJVhusHuBWPvn3GxA= 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-122-QJgl81CHMCS3cOzCa4PB8g-1; Thu, 06 Apr 2023 05:43:40 -0400 X-MC-Unique: QJgl81CHMCS3cOzCa4PB8g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BC24884340; Thu, 6 Apr 2023 09:43:39 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C6221121314; Thu, 6 Apr 2023 09:43:37 +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, David Ahern Subject: [PATCH net-next v5 16/19] udp: Convert udp_sendpage() to use MSG_SPLICE_PAGES Date: Thu, 6 Apr 2023 10:42:42 +0100 Message-Id: <20230406094245.3633290-17-dhowells@redhat.com> In-Reply-To: <20230406094245.3633290-1-dhowells@redhat.com> References: <20230406094245.3633290-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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?1762420192280882445?= X-GMAIL-MSGID: =?utf-8?q?1762420192280882445?= Convert udp_sendpage() to use sendmsg() with MSG_SPLICE_PAGES rather than directly splicing in the pages itself. This allows ->sendpage() to be replaced by something that can handle multiple multipage folios in a single transaction. Signed-off-by: David Howells cc: Willem de Bruijn cc: David Ahern cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/ipv4/udp.c | 50 +++++++++----------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index aa32afd871ee..0d3e78a65f51 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1332,52 +1332,20 @@ EXPORT_SYMBOL(udp_sendmsg); int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int flags) { - struct inet_sock *inet = inet_sk(sk); - struct udp_sock *up = udp_sk(sk); + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = flags | MSG_SPLICE_PAGES | MSG_MORE + }; int ret; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; + bvec_set_page(&bvec, page, size, offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); - if (!up->pending) { - struct msghdr msg = { .msg_flags = flags|MSG_MORE }; - - /* Call udp_sendmsg to specify destination address which - * sendpage interface can't pass. - * This will succeed only when the socket is connected. - */ - ret = udp_sendmsg(sk, &msg, 0); - if (ret < 0) - return ret; - } + if (flags & MSG_SENDPAGE_NOTLAST) + msg.msg_flags |= MSG_MORE; lock_sock(sk); - - if (unlikely(!up->pending)) { - release_sock(sk); - - net_dbg_ratelimited("cork failed\n"); - return -EINVAL; - } - - ret = ip_append_page(sk, &inet->cork.fl.u.ip4, - page, offset, size, flags); - if (ret == -EOPNOTSUPP) { - release_sock(sk); - return sock_no_sendpage(sk->sk_socket, page, offset, - size, flags); - } - if (ret < 0) { - udp_flush_pending_frames(sk); - goto out; - } - - up->len += size; - if (!(READ_ONCE(up->corkflag) || (flags&MSG_MORE))) - ret = udp_push_pending_frames(sk); - if (!ret) - ret = size; -out: + ret = udp_sendmsg(sk, &msg, size); release_sock(sk); return ret; }