Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44f20980 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by David S. Miller
Browse files

VSOCK: export socket tables for sock_diag interface 



The socket table symbols need to be exported from vsock.ko so that the
vsock_diag.ko module will be able to traverse sockets.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53954cf8

include/net/af_vsock.h

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 


#define LAST_RESERVED_PORT 1023



#define VSOCK_HASH_SIZE         251

extern struct list_head vsock_bind_table[VSOCK_HASH_SIZE + 1];

extern struct list_head vsock_connected_table[VSOCK_HASH_SIZE];

extern spinlock_t vsock_table_lock;



#define vsock_sk(__sk)    ((struct vsock_sock *)__sk)

#define sk_vsock(__vsk)   (&(__vsk)->sk)

net/vmw_vsock/af_vsock.c

+6 −4
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ EXPORT_SYMBOL_GPL(vm_sockets_get_local_cid); 
 * vsock_bind_table[VSOCK_HASH_SIZE] is for unbound sockets.  The hash function

 * mods with VSOCK_HASH_SIZE to ensure this.

 */

#define VSOCK_HASH_SIZE         251

#define MAX_PORT_RETRIES        24



#define VSOCK_HASH(addr)        ((addr)->svm_port % VSOCK_HASH_SIZE)
@@ -168,9 +167,12 @@ EXPORT_SYMBOL_GPL(vm_sockets_get_local_cid); 
#define vsock_connected_sockets_vsk(vsk)				\

	vsock_connected_sockets(&(vsk)->remote_addr, &(vsk)->local_addr)



static struct list_head vsock_bind_table[VSOCK_HASH_SIZE + 1];

static struct list_head vsock_connected_table[VSOCK_HASH_SIZE];

static DEFINE_SPINLOCK(vsock_table_lock);

struct list_head vsock_bind_table[VSOCK_HASH_SIZE + 1];

EXPORT_SYMBOL_GPL(vsock_bind_table);

struct list_head vsock_connected_table[VSOCK_HASH_SIZE];

EXPORT_SYMBOL_GPL(vsock_connected_table);

DEFINE_SPINLOCK(vsock_table_lock);

EXPORT_SYMBOL_GPL(vsock_table_lock);



/* Autobind this socket to the local address if necessary. */

static int vsock_auto_bind(struct vsock_sock *vsk)