Commit fee9ac06 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

net: remove SOCK_SUPPORT_ZC from sockmap 



sockmap replaces ->sk_prot with its own callbacks, we should remove
SOCK_SUPPORT_ZC as the new proto doesn't support msghdr::ubuf_info.

Cc: <stable@vger.kernel.org> # 6.0
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Fixes: e993ffe3 ("net: flag sockets supporting msghdr originated zerocopy")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8f279fb0

include/net/sock.h

+7 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,13 @@ void sock_kfree_s(struct sock *sk, void *mem, int size); 
void sock_kzfree_s(struct sock *sk, void *mem, int size);

void sk_send_sigurg(struct sock *sk);



static inline void sock_replace_proto(struct sock *sk, struct proto *proto)

{

	if (sk->sk_socket)

		clear_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);

	WRITE_ONCE(sk->sk_prot, proto);

}



struct sockcm_cookie {

	u64 transmit_time;

	u32 mark;

net/ipv4/tcp_bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore) 
		} else {

			sk->sk_write_space = psock->saved_write_space;

			/* Pairs with lockless read in sk_clone_lock() */

			WRITE_ONCE(sk->sk_prot, psock->sk_proto);

			sock_replace_proto(sk, psock->sk_proto);

		}

		return 0;

	}
@@ -620,7 +620,7 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore) 
	}



	/* Pairs with lockless read in sk_clone_lock() */

	WRITE_ONCE(sk->sk_prot, &tcp_bpf_prots[family][config]);

	sock_replace_proto(sk, &tcp_bpf_prots[family][config]);

	return 0;

}

EXPORT_SYMBOL_GPL(tcp_bpf_update_proto);

net/ipv4/udp_bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -141,14 +141,14 @@ int udp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore) 


	if (restore) {

		sk->sk_write_space = psock->saved_write_space;

		WRITE_ONCE(sk->sk_prot, psock->sk_proto);

		sock_replace_proto(sk, psock->sk_proto);

		return 0;

	}



	if (sk->sk_family == AF_INET6)

		udp_bpf_check_v6_needs_rebuild(psock->sk_proto);



	WRITE_ONCE(sk->sk_prot, &udp_bpf_prots[family]);

	sock_replace_proto(sk, &udp_bpf_prots[family]);

	return 0;

}

EXPORT_SYMBOL_GPL(udp_bpf_update_proto);

net/unix/unix_bpf.c

+4 −4
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ int unix_dgram_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool re 


	if (restore) {

		sk->sk_write_space = psock->saved_write_space;

		WRITE_ONCE(sk->sk_prot, psock->sk_proto);

		sock_replace_proto(sk, psock->sk_proto);

		return 0;

	}



	unix_dgram_bpf_check_needs_rebuild(psock->sk_proto);

	WRITE_ONCE(sk->sk_prot, &unix_dgram_bpf_prot);

	sock_replace_proto(sk, &unix_dgram_bpf_prot);

	return 0;

}
@@ -158,12 +158,12 @@ int unix_stream_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool r 
{

	if (restore) {

		sk->sk_write_space = psock->saved_write_space;

		WRITE_ONCE(sk->sk_prot, psock->sk_proto);

		sock_replace_proto(sk, psock->sk_proto);

		return 0;

	}



	unix_stream_bpf_check_needs_rebuild(psock->sk_proto);

	WRITE_ONCE(sk->sk_prot, &unix_stream_bpf_prot);

	sock_replace_proto(sk, &unix_stream_bpf_prot);

	return 0;

}