From patchwork Thu May 18 13:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 95861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp480919vqo; Thu, 18 May 2023 06:10:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WhnPKPE65cavOaRO8R23TwcWji1sn4FupnetF7k52tuqvm2QyKJ/uqtzmgzZfZkIxM3OY X-Received: by 2002:a05:6a00:1885:b0:63b:8dcc:84de with SMTP id x5-20020a056a00188500b0063b8dcc84demr3737737pfh.4.1684415457534; Thu, 18 May 2023 06:10:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684415457; cv=none; d=google.com; s=arc-20160816; b=siXCuuIOXy4E7fVTP0k6PzsNwi9tvVPQRefSl24AXwx8ucTS1ClrcYyBcDPpcV2WjH 3GigPM2GwIcdL2uQg72tFpnWYKtIPq3L4BJWURFQHSgb8axMEDJBQ3/MeLBMsEjWJFv0 TULOcysGKYT8G7ci87ILe3iWaui1hMAEDeHAYHCOtWsh/xU5mnY0F229qCKaMnEbHAaM ZUA02WoGcoQX+ej2SV30xFFbzUGSzpPcqSEAgNVAFapfxmMuAHl6f536cRYVEH14IysG slddMoDO5WFLAaEvgZDEbq5/yiBVNHslp3Y4BBFeCdDw5aSJp1M/q44AHIspmfjD1grE UYwQ== 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=5dEuCyEYbAeTLbptDWG+lpG3TePaGyDY6iKA6gIr8Gk=; b=t9nCnUEKw93VjaLEPt6XUrBHwYAcqoZ5qS1RD3I+7XaYeyFbIJ5BeRPrAcRt6s6e+F DlA4p3Mu7oDvFZ1f+4cmtbHCButUioat2iG6FePZ4vu9gyi4O/mW1ljgaMOcZnXgGbat L9m93HoKIXH8HwmbUUDdjiB0YEX5tc7z2rF7Gll1RU6Af9YLysrBn1xq0pr/k+z+kw/D URZK2UxMSq0UR/Tav+vl3gsrPL+yzxFDYmk1WbRwmlMFWHFhNQqb0C4q3AAyVD3pZcnV NxPzzuINxq2ZD8Ng11Mx8c0MBW9uxJoNekKWWa8GD5AKUASPbaGzI8jzH/mg8Z6d1JYg 4hCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=c3wExOHS; 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 x23-20020aa78f17000000b0063b7bb98251si1575939pfr.216.2023.05.18.06.10.34; Thu, 18 May 2023 06:10:57 -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=c3wExOHS; 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 S231434AbjERNJo (ORCPT + 99 others); Thu, 18 May 2023 09:09:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbjERNJM (ORCPT ); Thu, 18 May 2023 09:09:12 -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 80960198A for ; Thu, 18 May 2023 06:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684415299; 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=5dEuCyEYbAeTLbptDWG+lpG3TePaGyDY6iKA6gIr8Gk=; b=c3wExOHSMc8Frx8NgXUiqkVRaxzvkh9VxHV/Ox9dDrs/0O3w7GCaIE0HTOij6BlXjJ/FuZ 8uOGCQxOOc1xDKumaGnjWw0zVOMIE9IUYtGLG6yl0QJ2lKeGdv6Q2YDBlU5v822Y3O7Bbc bqqdUAu0oERjvCmXwc+0djpDvpEuy7E= 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-638-lV58l2MBPkWSA52mh6FUSg-1; Thu, 18 May 2023 09:08:16 -0400 X-MC-Unique: lV58l2MBPkWSA52mh6FUSg-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 2F4D128237C8; Thu, 18 May 2023 13:08:15 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 397681121318; Thu, 18 May 2023 13:08: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 , 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 Subject: [PATCH net-next v9 12/16] ip6, udp6: Support MSG_SPLICE_PAGES Date: Thu, 18 May 2023 14:07:09 +0100 Message-Id: <20230518130713.1515729-13-dhowells@redhat.com> In-Reply-To: <20230518130713.1515729-1-dhowells@redhat.com> References: <20230518130713.1515729-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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,T_SCC_BODY_TEXT_LINE 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?1766237622921110307?= X-GMAIL-MSGID: =?utf-8?q?1766237622921110307?= Make IP6/UDP6 sendmsg() support MSG_SPLICE_PAGES. This causes pages to be spliced from the source iterator if possible, copying the data if not. 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 --- Notes: ver #6) - Use common helper. net/ipv6/ip6_output.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 9554cf46ed88..c722cb881b2d 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1589,6 +1589,14 @@ static int __ip6_append_data(struct sock *sk, skb_zcopy_set(skb, uarg, &extra_uref); } } + } else if ((flags & MSG_SPLICE_PAGES) && length) { + if (inet_sk(sk)->hdrincl) + return -EPERM; + if (rt->dst.dev->features & NETIF_F_SG) + /* We need an empty buffer to attach stuff to */ + paged = true; + else + flags &= ~MSG_SPLICE_PAGES; } /* @@ -1778,6 +1786,15 @@ static int __ip6_append_data(struct sock *sk, err = -EFAULT; goto error; } + } else if (flags & MSG_SPLICE_PAGES) { + struct msghdr *msg = from; + + err = skb_splice_from_iter(skb, &msg->msg_iter, copy, + sk->sk_allocation); + if (err < 0) + goto error; + copy = err; + wmem_alloc_delta += copy; } else if (!zc) { int i = skb_shinfo(skb)->nr_frags;