Commit a94b5aae authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'sock_map: fix ->poll() and update selftests' 



Cong Wang says:

====================
This patchset fixes ->poll() for sockets in sockmap and updates
selftests accordingly with select(). Please check each patch
for more details.

Fixes: c50524ec ("Merge branch 'sockmap: add sockmap support for unix datagram socket'")
Fixes: 89d69c5d ("Merge branch 'sockmap: introduce BPF_SK_SKB_VERDICT and support UDP'")
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>

---
v4: add a comment in udp_poll()

v3: drop sk_psock_get_checked()
    reuse tcp_bpf_sock_is_readable()

v2: rename and reuse ->stream_memory_read()
    fix a compile error in sk_psock_get_checked()

Cong Wang (3):
  net: rename ->stream_memory_read to ->sock_is_readable
  skmsg: extract and reuse sk_msg_is_readable()
  net: implement ->sock_is_readable() for UDP and AF_UNIX

====================

Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents cd9733f5 67b82150

include/linux/skmsg.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from, 
			     struct sk_msg *msg, u32 bytes);

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

		   int len, int flags);

bool sk_msg_is_readable(struct sock *sk);



static inline void sk_msg_check_to_free(struct sk_msg *msg, u32 i, u32 bytes)

{

include/net/sock.h

+7 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ struct proto { 
#endif



	bool			(*stream_memory_free)(const struct sock *sk, int wake);

	bool			(*stream_memory_read)(const struct sock *sk);

	bool			(*sock_is_readable)(struct sock *sk);

	/* Memory pressure */

	void			(*enter_memory_pressure)(struct sock *sk);

	void			(*leave_memory_pressure)(struct sock *sk);
@@ -2820,4 +2820,10 @@ void sock_set_sndtimeo(struct sock *sk, s64 secs); 


int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len);



static inline bool sk_is_readable(struct sock *sk)

{

	if (sk->sk_prot->sock_is_readable)

		return sk->sk_prot->sock_is_readable(sk);

	return false;

}

#endif	/* _SOCK_H */

include/net/tls.h

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ void tls_sw_release_resources_rx(struct sock *sk); 
void tls_sw_free_ctx_rx(struct tls_context *tls_ctx);

int tls_sw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,

		   int nonblock, int flags, int *addr_len);

bool tls_sw_stream_read(const struct sock *sk);

bool tls_sw_sock_is_readable(struct sock *sk);

ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,

			   struct pipe_inode_info *pipe,

			   size_t len, unsigned int flags);

net/core/skmsg.c

+14 −0
Original line number Diff line number Diff line
@@ -474,6 +474,20 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg, 
}

EXPORT_SYMBOL_GPL(sk_msg_recvmsg);



bool sk_msg_is_readable(struct sock *sk)

{

	struct sk_psock *psock;

	bool empty = true;



	rcu_read_lock();

	psock = sk_psock(sk);

	if (likely(psock))

		empty = list_empty(&psock->ingress_msg);

	rcu_read_unlock();

	return !empty;

}

EXPORT_SYMBOL_GPL(sk_msg_is_readable);



static struct sk_msg *sk_psock_create_ingress_msg(struct sock *sk,

						  struct sk_buff *skb)

{

net/ipv4/tcp.c

+1 −4
Original line number Diff line number Diff line
@@ -486,10 +486,7 @@ static bool tcp_stream_is_readable(struct sock *sk, int target) 
{

	if (tcp_epollin_ready(sk, target))

		return true;



	if (sk->sk_prot->stream_memory_read)

		return sk->sk_prot->stream_memory_read(sk);

	return false;

	return sk_is_readable(sk);

}



/*