On Thu, Jul 03, 2025 at 01:23:29PM +0200, Stefano Garzarella wrote:
> From: Stefano Garzarella <sgarzare@xxxxxxxxxx>
>
> >From commit 634f1a7110b4 ("vsock: support sockmap"), `struct proto
> vsock_proto`, defined in af_vsock.c, is not static anymore, since it's
> used by vsock_bpf.c.
>
> If CONFIG_BPF_SYSCALL is not defined, `make C=2` will print a warning:
> $ make O=build C=2 W=1 net/vmw_vsock/
> ...
> CC [M] net/vmw_vsock/af_vsock.o
> CHECK ../net/vmw_vsock/af_vsock.c
> ../net/vmw_vsock/af_vsock.c:123:14: warning: symbol 'vsock_proto' was not declared. Should it be static?
>
> Declare `vsock_proto` regardless of CONFIG_BPF_SYSCALL, since it's defined
> in af_vsock.c, which is built regardless of CONFIG_BPF_SYSCALL.
>
> Fixes: 634f1a7110b4 ("vsock: support sockmap")
> Signed-off-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>
Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
> ---
> include/net/af_vsock.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
> index d56e6e135158..d40e978126e3 100644
> --- a/include/net/af_vsock.h
> +++ b/include/net/af_vsock.h
> @@ -243,8 +243,8 @@ int __vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
> int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
> size_t len, int flags);
>
> -#ifdef CONFIG_BPF_SYSCALL
> extern struct proto vsock_proto;
> +#ifdef CONFIG_BPF_SYSCALL
> int vsock_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);
> void __init vsock_bpf_build_proto(void);
> #else
> --
> 2.50.0
