[PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[Jens Axboe]

The only user of these was io_uring, and it's not using them anymore.
Make them static and remove them from the socket header file.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

recvmsg_copy_msghdr() hasn't been used in a while, sendmsg_copy_msghdr()
went away in this merge window.

diff --git a/include/linux/socket.h b/include/linux/socket.h
index cfcb7e2c3813..139c330ccf2c 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
 			       struct user_msghdr __user *umsg,
 			       struct sockaddr __user *uaddr,
 			       unsigned int flags);
-extern int sendmsg_copy_msghdr(struct msghdr *msg,
-			       struct user_msghdr __user *umsg, unsigned flags,
-			       struct iovec **iov);
-extern int recvmsg_copy_msghdr(struct msghdr *msg,
-			       struct user_msghdr __user *umsg, unsigned flags,
-			       struct sockaddr __user **uaddr,
-			       struct iovec **iov);
 extern int __copy_msghdr(struct msghdr *kmsg,
 			 struct user_msghdr *umsg,
 			 struct sockaddr __user **save_addr);
diff --git a/net/socket.c b/net/socket.c
index ed3df2f749bf..0f5d5079fd91 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2600,9 +2600,9 @@ static int ____sys_sendmsg(struct socket *sock, struct msghdr *msg_sys,
 	return err;
 }
 
-int sendmsg_copy_msghdr(struct msghdr *msg,
-			struct user_msghdr __user *umsg, unsigned flags,
-			struct iovec **iov)
+static int sendmsg_copy_msghdr(struct msghdr *msg,
+			       struct user_msghdr __user *umsg, unsigned flags,
+			       struct iovec **iov)
 {
 	int err;
 
@@ -2753,10 +2753,10 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
 	return __sys_sendmmsg(fd, mmsg, vlen, flags, true);
 }
 
-int recvmsg_copy_msghdr(struct msghdr *msg,
-			struct user_msghdr __user *umsg, unsigned flags,
-			struct sockaddr __user **uaddr,
-			struct iovec **iov)
+static int recvmsg_copy_msghdr(struct msghdr *msg,
+			       struct user_msghdr __user *umsg, unsigned flags,
+			       struct sockaddr __user **uaddr,
+			       struct iovec **iov)
 {
 	ssize_t err;
 
diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h
index cfcb7e2c3813..139c330ccf2c 100644
--- a/tools/perf/trace/beauty/include/linux/socket.h
+++ b/tools/perf/trace/beauty/include/linux/socket.h
@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
 			       struct user_msghdr __user *umsg,
 			       struct sockaddr __user *uaddr,
 			       unsigned int flags);
-extern int sendmsg_copy_msghdr(struct msghdr *msg,
-			       struct user_msghdr __user *umsg, unsigned flags,
-			       struct iovec **iov);
-extern int recvmsg_copy_msghdr(struct msghdr *msg,
-			       struct user_msghdr __user *umsg, unsigned flags,
-			       struct sockaddr __user **uaddr,
-			       struct iovec **iov);
 extern int __copy_msghdr(struct msghdr *kmsg,
 			 struct user_msghdr *umsg,
 			 struct sockaddr __user **save_addr);

-- 
Jens Axboe

Re: [PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[Paolo Abeni]

On Tue, 2024-03-12 at 09:55 -0600, Jens Axboe wrote:
> The only user of these was io_uring, and it's not using them anymore.
> Make them static and remove them from the socket header file.
> 
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
## Form letter - net-next-closed

The merge window for v6.9 has begun and we have already posted our pull
request. Therefore net-next is closed for new drivers, features, code
refactoring and optimizations. We are currently accepting bug fixes
only.

Please repost when net-next reopens after March 25th.

RFC patches sent for review only are obviously welcome at any time.

See:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle

-- 
pw-bot: defer

Re: [PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[Paolo Abeni]

On Thu, 2024-03-14 at 11:46 +0100, Paolo Abeni wrote:
> On Tue, 2024-03-12 at 09:55 -0600, Jens Axboe wrote:
> > The only user of these was io_uring, and it's not using them anymore.
> > Make them static and remove them from the socket header file.
> > 
> > Signed-off-by: Jens Axboe <axboe@kernel.dk>
> ## Form letter - net-next-closed
> 
> The merge window for v6.9 has begun and we have already posted our pull
> request. Therefore net-next is closed for new drivers, features, code
> refactoring and optimizations. We are currently accepting bug fixes
> only.
> 
> Please repost when net-next reopens after March 25th.
> 
> RFC patches sent for review only are obviously welcome at any time.
> 
> See:
> https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle

Jakub noted that waiting another cycle just to do a very safe cleanup
would be a pity. I guess we can do a one-off exception here for good
reason.

Cheers,

Paolo

Re: [PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[Jens Axboe]

On 3/14/24 9:16 AM, Paolo Abeni wrote:
> On Thu, 2024-03-14 at 11:46 +0100, Paolo Abeni wrote:
>> On Tue, 2024-03-12 at 09:55 -0600, Jens Axboe wrote:
>>> The only user of these was io_uring, and it's not using them anymore.
>>> Make them static and remove them from the socket header file.
>>>
>>> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>> ## Form letter - net-next-closed
>>
>> The merge window for v6.9 has begun and we have already posted our pull
>> request. Therefore net-next is closed for new drivers, features, code
>> refactoring and optimizations. We are currently accepting bug fixes
>> only.
>>
>> Please repost when net-next reopens after March 25th.
>>
>> RFC patches sent for review only are obviously welcome at any time.
>>
>> See:
>> https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle
> 
> Jakub noted that waiting another cycle just to do a very safe cleanup
> would be a pity. I guess we can do a one-off exception here for good
> reason.

Thanks, seemed pretty silly to defer, and given the nature of the patch,
there's no way it could've been sent "in time" anyway as the io_uring
pull needed to go in first.

Besides, I would never remember to resend the cleanup and hence it
would've been lost.

-- 
Jens Axboe

Re: [PATCH] net: remove {revc,send}msg_copy_msghdr() from exports

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 12 Mar 2024 09:55:45 -0600 you wrote:
> The only user of these was io_uring, and it's not using them anymore.
> Make them static and remove them from the socket header file.
> 
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
> 
> ---
> 
> [...]

Here is the summary with links:
  - net: remove {revc,send}msg_copy_msghdr() from exports
    https://git.kernel.org/netdev/net/c/e54e09c05c00

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html