Commit daabfbca authored by Stefano Garzarella's avatar Stefano Garzarella Committed by David S. Miller
Browse files

vsock: add 'struct vsock_sock *' param to vsock_core_get_transport() 



Since now the 'struct vsock_sock' object contains a pointer to
the transport, this patch adds a parameter to the
vsock_core_get_transport() to return the right transport
assigned to the socket.

This patch modifies also the virtio_transport_get_ops(), that
uses the vsock_core_get_transport(), adding the
'struct vsock_sock *' parameter.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJorgen Hansen <jhansen@vmware.com>
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c7246dc

include/net/af_vsock.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static inline int vsock_core_init(const struct vsock_transport *t) 
void vsock_core_exit(void);



/* The transport may downcast this to access transport-specific functions */

const struct vsock_transport *vsock_core_get_transport(void);

const struct vsock_transport *vsock_core_get_transport(struct vsock_sock *vsk);



/**** UTILS ****/

net/vmw_vsock/af_vsock.c

+2 −5
Original line number Diff line number Diff line
@@ -1999,12 +1999,9 @@ void vsock_core_exit(void) 
}

EXPORT_SYMBOL_GPL(vsock_core_exit);



const struct vsock_transport *vsock_core_get_transport(void)

const struct vsock_transport *vsock_core_get_transport(struct vsock_sock *vsk)

{

	/* vsock_register_mutex not taken since only the transport uses this

	 * function and only while registered.

	 */

	return transport_single;

	return vsk->transport;

}

EXPORT_SYMBOL_GPL(vsock_core_get_transport);

net/vmw_vsock/virtio_transport_common.c

+5 −4
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ 
/* Threshold for detecting small packets to copy */

#define GOOD_COPY_LEN  128



static const struct virtio_transport *virtio_transport_get_ops(void)

static const struct virtio_transport *

virtio_transport_get_ops(struct vsock_sock *vsk)

{

	const struct vsock_transport *t = vsock_core_get_transport();

	const struct vsock_transport *t = vsock_core_get_transport(vsk);



	return container_of(t, struct virtio_transport, transport);

}
@@ -168,7 +169,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, 
	struct virtio_vsock_pkt *pkt;

	u32 pkt_len = info->pkt_len;



	src_cid = virtio_transport_get_ops()->transport.get_local_cid();

	src_cid = virtio_transport_get_ops(vsk)->transport.get_local_cid();

	src_port = vsk->local_addr.svm_port;

	if (!info->remote_cid) {

		dst_cid	= vsk->remote_addr.svm_cid;
@@ -201,7 +202,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, 


	virtio_transport_inc_tx_pkt(vvs, pkt);



	return virtio_transport_get_ops()->send_pkt(pkt);

	return virtio_transport_get_ops(vsk)->send_pkt(pkt);

}



static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE