From patchwork Fri Jun 23 22:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13291460 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 836C5EB64D7 for ; Fri, 23 Jun 2023 22:56:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F02B8D0011; Fri, 23 Jun 2023 18:56:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 179E38D0001; Fri, 23 Jun 2023 18:56:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F35B38D0011; Fri, 23 Jun 2023 18:56:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DFD358D0001 for ; Fri, 23 Jun 2023 18:56:11 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4914DB0EE2 for ; Fri, 23 Jun 2023 22:56:11 +0000 (UTC) X-FDA: 80935522542.15.FD0B4AE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id A520A2000C for ; Fri, 23 Jun 2023 22:56:09 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=egn52Y3i; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687560969; 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=xQVg0pnXVfTxPUpA8yd29SmocczyZN6S+xS0BIA8ljI=; b=d+ceQDUWFD1iw1W0komnCigQvz3w7xdun2mIjo6LMC/BlDonxWXEIpTmmpqFI67uUHE1AR nWcHTv9rpDB9uKVun019IAnC8FuirvhkWNcq6JZ4kXznzXefyhOFywVGebJ18lEemtSHxp QKiK6ZFF9GtWN78OykFenJtNQdSowko= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=egn52Y3i; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687560969; a=rsa-sha256; cv=none; b=sljw8v8llghGRBuncOVdq2pdGTrNfVUWzALRqwCPn8yuBEzLx+OweCgdynq4JDPECi53px iw7jt3SyMWKm7uxJ0USsTHxctL9yqq/n2EgWOlkGg+AXXAe803ba7CD/W9T3659q+/a0Oh aTjrL/ySwWTMw+ZDWO3HyBqP0s9tTF4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687560969; 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=xQVg0pnXVfTxPUpA8yd29SmocczyZN6S+xS0BIA8ljI=; b=egn52Y3iCc4T0jlkJXlN7JGbq84m7ec2h/QiterIF+76BA64CPcxAL/YUq63+B6hETzQQW Y23Nv3JgKm3XXjvwgRx1rpg8w9PHpB/JNV1Dxt/2Z3zjpGTcG6DYPahiRCM1PBT0nSPfLw IOpZNh1wPBkJqAqvVq9KVgceB6tOI9U= 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-392-ui08z6zkOsOzsb7oEUVtzw-1; Fri, 23 Jun 2023 18:56:05 -0400 X-MC-Unique: ui08z6zkOsOzsb7oEUVtzw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C7B7185A78B; Fri, 23 Jun 2023 22:56:04 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 240AF492C13; Fri, 23 Jun 2023 22:56:01 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Alexander Duyck , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, dccp@vger.kernel.org, linux-afs@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-can@vger.kernel.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-hams@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-rdma@vger.kernel.org, linux-sctp@vger.kernel.org, linux-wpan@vger.kernel.org, linux-x25@vger.kernel.org, mptcp@lists.linux.dev, rds-devel@oss.oracle.com, tipc-discussion@lists.sourceforge.net, virtualization@lists.linux-foundation.org Subject: [PATCH net-next v5 16/16] net: Kill MSG_SENDPAGE_NOTLAST Date: Fri, 23 Jun 2023 23:55:13 +0100 Message-ID: <20230623225513.2732256-17-dhowells@redhat.com> In-Reply-To: <20230623225513.2732256-1-dhowells@redhat.com> References: <20230623225513.2732256-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Queue-Id: A520A2000C X-Rspam-User: X-Stat-Signature: 8d94tsc4w687tedwui74jgydrstm5n34 X-Rspamd-Server: rspam01 X-HE-Tag: 1687560969-510534 X-HE-Meta: U2FsdGVkX1+KHYRkz4MOOQcrUtHBcyemvD8IC+9iJ8gTe/Fx598Vr2T3bypPEZ6Gib35KSz/dKK6jL5x8YRUDK4BLLoHVsfn0mO80VY1oJifBI+4fCh4lWWmznhpB6Li9gOce6qJfFJpWNz5u5YNgKdrKZCkV9azVB9m5wp14pP95yt8rK6WE01JGbm1twOLSIXilq0S6s9g/u5KxXiv/P1XUSfbyCcyciufj+POsQcgr+SkxS9Ckcp1QHlZvHk3NZ6kqfaJik+mKo7X9snPiZaDgDR9zhPugzoOf4Regv5Wd8YpOWe2la/KbFdVAA16RXm3AJrgmsQiZ7pYFnwQm+GA0o9I3EBncXgW10HY5nRlGvke+LuaIYofk04moRO7/x4M3HW2DFH8RMTZtMk6V5PwjgMg1TGpBal2xcyop1SSpjWxhDQ5D1/1IFZwdL1b+ZgeHpD36SvPqgO/dZ7KIsdXHKy/XzFQsTIfGp4ACRkDRrjW3L4Ph11DiCJHcPh/78COZwd0H7thp/H20fp2HkVgJ3qkzszBxnEZNKjNcoqDgg1aK59n2WAazwlSObSTlVgD6mmzrjPFsw26crcd3igH3rDTiDqgYB3JnH6YuZzx4NAXXh0HCqnOrW1RtH4ecCvym4AOT9Ci0KNpk23SmskWXPIqNHn5XwePaqCIrg6ac1DtKXKM6ILae5gUnKgzIaLE4a5LHxXVXDi05uXYQphrpcPeYZD/PK1X0xeJNwl5JeZKdL8ytFoW1IgwZymjCDNB4HC+eOGOI/YucpqxIP64ovwEgctu2zqMmd+Tvpg7n4ECIK8A607dsLgrkCor7GYItYRnRIQZ3ub7nN7vwi5i3qEW+bvrXnKwuUCtHslndFDZsnixi7fqlIysmNZoXBqI8BgFFuF6BWtkgYve08HYpkrwMu9Z5r7OHNu819UdHiVBhZxQY2er5axeOUpl8X8v1gvaFnYjYORvQ+g kOzeRbNL FMQPEkaEgk9MDrRz77CeUboWy+etAlRiFMbXMQavgVtRw2Cd0D9XUxYlwt+B/lwr2RKFzwvUmQzx6AQTeYWVOwkb01ce0pYZ/8R5wt7fYDrYcJugoz7RaKpt5HBNGT7tn0q1kNhUo41Au3/S9ll+7N81mysLHE69kQ2CG9TMInilSa1lZYxhjIQ4Hkvx1WSN9hP+WzN/hIWiakBxSgAFSiSwE4e5YlTDhaLEdmp1UkTnF0MzIKTMxw6ZeXeuB+ljdIwTG33JNgvC+iBS+Vv2iLiAGNULycC7qSCQHLkMGc6p5xKGkgGUee0uZvIZAEGZs9bMLPkePVRxGmwcm19RqxX7jsq2apvleJVxHauHL3eZZm8rG6Uoe72xUj6z7J5VMPzBMLMARn0d9MF2EJNo9fiJ7F6YjFqi9T4pVl6w0NUc8WNU5Ztqp407AUrefNcXIgGX8lxEeaKIpZkN3qFQcjyfuSgNyhR9fFdIF70xSA/H7qLUa9pKT3oNXCrMYSL/FdSunMyQ3ZmdhkPlaUgYmymRw5dRAL8X49vbqolxnlMCFlcRL/9OzswKsX09BYvrfmcQY/Z5EfP5WfY2MrnhkNKAWdqwoI7n52OP/ 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: Now that ->sendpage() has been removed, MSG_SENDPAGE_NOTLAST can be cleaned up. Things were converted to use MSG_MORE instead, but the protocol sendpage stubs still convert MSG_SENDPAGE_NOTLAST to MSG_MORE, which is now unnecessary. Signed-off-by: David Howells cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: bpf@vger.kernel.org cc: dccp@vger.kernel.org cc: linux-afs@lists.infradead.org cc: linux-arm-msm@vger.kernel.org cc: linux-can@vger.kernel.org cc: linux-crypto@vger.kernel.org cc: linux-doc@vger.kernel.org cc: linux-hams@vger.kernel.org cc: linux-perf-users@vger.kernel.org cc: linux-rdma@vger.kernel.org cc: linux-sctp@vger.kernel.org cc: linux-wpan@vger.kernel.org cc: linux-x25@vger.kernel.org cc: mptcp@lists.linux.dev cc: netdev@vger.kernel.org cc: rds-devel@oss.oracle.com cc: tipc-discussion@lists.sourceforge.net cc: virtualization@lists.linux-foundation.org --- Notes: ver #3) - tcp_bpf is now handled by an earlier patch. include/linux/socket.h | 4 +--- net/tls/tls_device.c | 3 +-- net/tls/tls_main.c | 2 +- net/tls/tls_sw.c | 2 +- tools/perf/trace/beauty/include/linux/socket.h | 1 - tools/perf/trace/beauty/msg_flags.c | 5 +---- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/linux/socket.h b/include/linux/socket.h index 58204700018a..39b74d83c7c4 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -319,7 +319,6 @@ struct ucred { #define MSG_MORE 0x8000 /* Sender will send more */ #define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */ #define MSG_SENDPAGE_NOPOLICY 0x10000 /* sendpage() internal : do no apply policy */ -#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */ #define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */ #define MSG_EOF MSG_FIN #define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */ @@ -341,8 +340,7 @@ struct ucred { /* Flags to be cleared on entry by sendmsg and sendmmsg syscalls */ #define MSG_INTERNAL_SENDMSG_FLAGS \ - (MSG_SPLICE_PAGES | MSG_SENDPAGE_NOPOLICY | MSG_SENDPAGE_NOTLAST | \ - MSG_SENDPAGE_DECRYPTED) + (MSG_SPLICE_PAGES | MSG_SENDPAGE_NOPOLICY | MSG_SENDPAGE_DECRYPTED) /* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */ #define SOL_IP 0 diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 840ee06f1708..2021fe557e50 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -441,8 +441,7 @@ static int tls_push_data(struct sock *sk, long timeo; if (flags & - ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SENDPAGE_NOTLAST | - MSG_SPLICE_PAGES)) + ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SPLICE_PAGES)) return -EOPNOTSUPP; if (unlikely(sk->sk_err)) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index d5ed4d47b16e..b6896126bb92 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -127,7 +127,7 @@ int tls_push_sg(struct sock *sk, { struct bio_vec bvec; struct msghdr msg = { - .msg_flags = MSG_SENDPAGE_NOTLAST | MSG_SPLICE_PAGES | flags, + .msg_flags = MSG_SPLICE_PAGES | flags, }; int ret = 0; struct page *p; diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 9b3aa89a4292..53f944e6d8ef 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1194,7 +1194,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_CMSG_COMPAT | MSG_SPLICE_PAGES | - MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY)) + MSG_SENDPAGE_NOPOLICY)) return -EOPNOTSUPP; ret = mutex_lock_interruptible(&tls_ctx->tx_lock); diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h index 13c3a237b9c9..3bef212a24d7 100644 --- a/tools/perf/trace/beauty/include/linux/socket.h +++ b/tools/perf/trace/beauty/include/linux/socket.h @@ -318,7 +318,6 @@ struct ucred { #define MSG_MORE 0x8000 /* Sender will send more */ #define MSG_WAITFORONE 0x10000 /* recvmmsg(): block until 1+ packets avail */ #define MSG_SENDPAGE_NOPOLICY 0x10000 /* sendpage() internal : do no apply policy */ -#define MSG_SENDPAGE_NOTLAST 0x20000 /* sendpage() internal : not the last page */ #define MSG_BATCH 0x40000 /* sendmmsg(): more messages coming */ #define MSG_EOF MSG_FIN #define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */ diff --git a/tools/perf/trace/beauty/msg_flags.c b/tools/perf/trace/beauty/msg_flags.c index ea68db08b8e7..5cdebd7ece7e 100644 --- a/tools/perf/trace/beauty/msg_flags.c +++ b/tools/perf/trace/beauty/msg_flags.c @@ -8,9 +8,6 @@ #ifndef MSG_WAITFORONE #define MSG_WAITFORONE 0x10000 #endif -#ifndef MSG_SENDPAGE_NOTLAST -#define MSG_SENDPAGE_NOTLAST 0x20000 -#endif #ifndef MSG_FASTOPEN #define MSG_FASTOPEN 0x20000000 #endif @@ -50,7 +47,7 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, P_MSG_FLAG(NOSIGNAL); P_MSG_FLAG(MORE); P_MSG_FLAG(WAITFORONE); - P_MSG_FLAG(SENDPAGE_NOTLAST); + P_MSG_FLAG(SPLICE_PAGES); P_MSG_FLAG(FASTOPEN); P_MSG_FLAG(CMSG_CLOEXEC); #undef P_MSG_FLAG