Commit c49661aa authored by Cong Wang's avatar Cong Wang Committed by Daniel Borkmann
Browse files

skmsg: Remove unused parameters of sk_msg_wait_data() 



'err' and 'flags' are not used, we can just get rid of them.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <song@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210517022348.50555-1-xiyou.wangcong@gmail.com
parent 119220d8

include/linux/skmsg.h

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ int sk_msg_zerocopy_from_iter(struct sock *sk, struct iov_iter *from, 
			      struct sk_msg *msg, u32 bytes);

int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,

			     struct sk_msg *msg, u32 bytes);

int sk_msg_wait_data(struct sock *sk, struct sk_psock *psock, int flags,

		     long timeo, int *err);

int sk_msg_wait_data(struct sock *sk, struct sk_psock *psock, long timeo);

int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,

		   int len, int flags);

net/core/skmsg.c

+1 −2
Original line number Diff line number Diff line
@@ -399,8 +399,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from, 
}

EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter);



int sk_msg_wait_data(struct sock *sk, struct sk_psock *psock, int flags,

		     long timeo, int *err)

int sk_msg_wait_data(struct sock *sk, struct sk_psock *psock, long timeo)

{

	DEFINE_WAIT_FUNC(wait, woken_wake_function);

	int ret = 0;

net/ipv4/tcp_bpf.c

+2 −7
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
msg_bytes_ready:

	copied = sk_msg_recvmsg(sk, psock, msg, len, flags);

	if (!copied) {

		int data, err = 0;

		long timeo;

		int data;



		timeo = sock_rcvtimeo(sk, nonblock);

		data = sk_msg_wait_data(sk, psock, flags, timeo, &err);

		data = sk_msg_wait_data(sk, psock, timeo);

		if (data) {

			if (!sk_psock_queue_empty(psock))

				goto msg_bytes_ready;
@@ -196,14 +196,9 @@ static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
			sk_psock_put(sk, psock);

			return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);

		}

		if (err) {

			ret = err;

			goto out;

		}

		copied = -EAGAIN;

	}

	ret = copied;

out:

	release_sock(sk);

	sk_psock_put(sk, psock);

	return ret;

net/ipv4/udp_bpf.c

+2 −6
Original line number Diff line number Diff line
@@ -43,21 +43,17 @@ static int udp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
msg_bytes_ready:

	copied = sk_msg_recvmsg(sk, psock, msg, len, flags);

	if (!copied) {

		int data, err = 0;

		long timeo;

		int data;



		timeo = sock_rcvtimeo(sk, nonblock);

		data = sk_msg_wait_data(sk, psock, flags, timeo, &err);

		data = sk_msg_wait_data(sk, psock, timeo);

		if (data) {

			if (!sk_psock_queue_empty(psock))

				goto msg_bytes_ready;

			ret = sk_udp_recvmsg(sk, msg, len, nonblock, flags, addr_len);

			goto out;

		}

		if (err) {

			ret = err;

			goto out;

		}

		copied = -EAGAIN;

	}

	ret = copied;