Commit b848b26c authored by David Howells's avatar David Howells Committed by Jakub Kicinski
Browse files

net: Kill MSG_SENDPAGE_NOTLAST 



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: default avatarDavid Howells <dhowells@redhat.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
cc: linux-afs@lists.infradead.org
cc: mptcp@lists.linux.dev
cc: rds-devel@oss.oracle.com
cc: tipc-discussion@lists.sourceforge.net
cc: virtualization@lists.linux-foundation.org
Link: https://lore.kernel.org/r/20230623225513.2732256-17-dhowells@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dc97391e

include/linux/socket.h

+1 −3
Original line number Diff line number Diff line
@@ -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

net/tls/tls_device.c

+1 −2
Original line number Diff line number Diff line
@@ -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))

net/tls/tls_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/tls/tls_sw.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

tools/perf/trace/beauty/include/linux/socket.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */