From patchwork Fri Mar 31 16:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 77879 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp693040vqo; Fri, 31 Mar 2023 09:37:39 -0700 (PDT) X-Google-Smtp-Source: AKy350bg2ynWWC+f5wi38+QNoTvnxeDYkwTWhyObVcLNOowZP+lPIE0FS/pZXM7qeTuohKyW1LqK X-Received: by 2002:a05:6402:50a:b0:4ab:d1f4:4b88 with SMTP id m10-20020a056402050a00b004abd1f44b88mr28245935edv.41.1680280659549; Fri, 31 Mar 2023 09:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680280659; cv=none; d=google.com; s=arc-20160816; b=bd3IYOO/TXX+5OpCABTS13ZvqEar42K6sH75O5EQjNmE+xre9i9mEyysc8gji34KVz VjudBgnnikJsIqtd4fxHAosli0+xTo5OhGgrVBKZA6xKVfG/5D96Tp6nslYVltrlLiDJ 69YiynGvx8stW+Wf/zBELKFl5ntRLi6ctVwT7UgOctSLD3PxABqeDETlfnuEOVIpn0ed BoNhFgTiqMRiRvrTsDxLmuxFpNcbfGIUu91jmsJ36OXvW/r2Sovs0Q1T3x2nd7E3x0qn 5/YbyjQwBPGsFb2euaF9i7usnf9ToVmB3kQqz3eU9XWhQKa7k8CVuT2Ps6OPLqVTC0A9 dNQw== 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=2Rqs8gKWnfX7IQPFFFiE2mTLNitfAQsbWxPFIoMuGvc=; b=Jy613X0Ivf2xmPBiFqErRlOvOXck4da5TB1kghXPYvjhwKb6WPAMUGPoWqbjRCNKBd B8xO0ebe79k/8Lq5EMVa6SxeKINHovMco3ujJonqcLiv8JC0mkf6TgFIGMbPe75FWVi4 NeAqGE34fbe+xMD0ZpdZPvDwzb7el3wxsblRYhzBojdjJ7ah7bASNmsMQtWCZJ4vYLfO I/s5Z5u4Yt22IaJj13RulRcZMi/gEv+84LneSiiHApU5Z9cA39S2Wzvv3KUNMhYYSueS WJJf1vDDfolC8Mft+j5F1D2nRcmjKQ/96K8p245YI2uwE/mKp0xXdMcCqtFRKZ+Tadk2 cyfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MxqfgNLx; 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 r16-20020aa7cb90000000b004fc66bd07dbsi2349963edt.369.2023.03.31.09.37.15; Fri, 31 Mar 2023 09:37:39 -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=MxqfgNLx; 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 S232802AbjCaQKx (ORCPT + 99 others); Fri, 31 Mar 2023 12:10:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232323AbjCaQKW (ORCPT ); Fri, 31 Mar 2023 12:10:22 -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 B4F351FD39 for ; Fri, 31 Mar 2023 09:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680278974; 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=2Rqs8gKWnfX7IQPFFFiE2mTLNitfAQsbWxPFIoMuGvc=; b=MxqfgNLxMm9gKK/+p6p1teoAPP1+kLymEw+J+4pGffaKoiUuFxtSudl5M9zGcbhoV+uKND XZwehZ76Q4NK9a3izW33ygjzXw8/V5ODcbYo+FTLUxaDb4cszBbJCNe2ElcvGjJyhkn1QF Du9lPDZ1mLBrm2LQWaFgSKsT2BplOmQ= 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-543-0AgUVjoEOGGNrIUOLBBj-A-1; Fri, 31 Mar 2023 12:09:30 -0400 X-MC-Unique: 0AgUVjoEOGGNrIUOLBBj-A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4A9029ABA19; Fri, 31 Mar 2023 16:09:29 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A92CCC15BB8; Fri, 31 Mar 2023 16:09:27 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Willem de Bruijn Subject: [PATCH v3 03/55] net: Declare MSG_SPLICE_PAGES internal sendmsg() flag Date: Fri, 31 Mar 2023 17:08:22 +0100 Message-Id: <20230331160914.1608208-4-dhowells@redhat.com> In-Reply-To: <20230331160914.1608208-1-dhowells@redhat.com> References: <20230331160914.1608208-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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?1761901972916011865?= X-GMAIL-MSGID: =?utf-8?q?1761901972916011865?= Declare MSG_SPLICE_PAGES, an internal sendmsg() flag, that hints to a network protocol that it should splice pages from the source iterator rather than copying the data if it can. This flag is added to a list that is cleared by sendmsg and recvmsg syscalls on entry. This is intended as a replacement for the ->sendpage() op, allowing a way to splice in several multipage folios in one go. Signed-off-by: David Howells cc: Willem de Bruijn cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org Reviewed-by: Willem de Bruijn --- include/linux/socket.h | 3 +++ net/socket.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/linux/socket.h b/include/linux/socket.h index 13c3a237b9c9..bd1cc3238851 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -327,6 +327,7 @@ struct ucred { */ #define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */ +#define MSG_SPLICE_PAGES 0x8000000 /* Splice the pages from the iterator in sendmsg() */ #define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */ #define MSG_CMSG_CLOEXEC 0x40000000 /* Set close_on_exec for file descriptor received through @@ -337,6 +338,8 @@ struct ucred { #define MSG_CMSG_COMPAT 0 /* We never have 32 bit fixups */ #endif +/* Flags to be cleared on entry by sendmsg and sendmmsg syscalls */ +#define MSG_INTERNAL_SENDMSG_FLAGS (MSG_SPLICE_PAGES) /* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */ #define SOL_IP 0 diff --git a/net/socket.c b/net/socket.c index 6bae8ce7059e..0c39ce57d603 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2139,6 +2139,7 @@ int __sys_sendto(int fd, void __user *buff, size_t len, unsigned int flags, msg.msg_name = (struct sockaddr *)&address; msg.msg_namelen = addr_len; } + flags &= ~MSG_INTERNAL_SENDMSG_FLAGS; if (sock->file->f_flags & O_NONBLOCK) flags |= MSG_DONTWAIT; msg.msg_flags = flags; @@ -2486,6 +2487,7 @@ static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys, } msg_sys->msg_flags = flags; + flags &= ~MSG_INTERNAL_SENDMSG_FLAGS; if (sock->file->f_flags & O_NONBLOCK) msg_sys->msg_flags |= MSG_DONTWAIT; /*