Commit ca8f4fb2 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller
Browse files

skbuff: struct ubuf_info callback type safety 



The skb struct ubuf_info callback gets passed struct ubuf_info
itself, not the arg value as the field name and the function signature
seem to imply. Rename the arg field to ctx to match usage,
add documentation and change the callback argument type
to make usage clear and to have compiler check correctness.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a5d2bd9

drivers/vhost/net.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void handle_tx(struct vhost_net *net) 


				vq->heads[vq->upend_idx].len = len;

				ubuf->callback = vhost_zerocopy_callback;

				ubuf->arg = vq->ubufs;

				ubuf->ctx = vq->ubufs;

				ubuf->desc = vq->upend_idx;

				msg.msg_control = ubuf;

				msg.msg_controllen = sizeof(ubuf);

drivers/vhost/vhost.c

+2 −3
Original line number Diff line number Diff line
@@ -1598,10 +1598,9 @@ void vhost_ubuf_put_and_wait(struct vhost_ubuf_ref *ubufs) 
	kfree(ubufs);

}



void vhost_zerocopy_callback(void *arg)

void vhost_zerocopy_callback(struct ubuf_info *ubuf)

{

	struct ubuf_info *ubuf = arg;

	struct vhost_ubuf_ref *ubufs = ubuf->arg;

	struct vhost_ubuf_ref *ubufs = ubuf->ctx;

	struct vhost_virtqueue *vq = ubufs->vq;



	/* set len = 1 to mark this desc buffers done DMA */

drivers/vhost/vhost.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ bool vhost_enable_notify(struct vhost_dev *, struct vhost_virtqueue *); 


int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,

		    unsigned int log_num, u64 len);

void vhost_zerocopy_callback(void *arg);

void vhost_zerocopy_callback(struct ubuf_info *);

int vhost_zerocopy_signal_used(struct vhost_virtqueue *vq);



#define vq_err(vq, fmt, ...) do {                                  \

include/linux/skbuff.h

+4 −3
Original line number Diff line number Diff line
@@ -238,11 +238,12 @@ enum { 
/*

 * The callback notifies userspace to release buffers when skb DMA is done in

 * lower device, the skb last reference should be 0 when calling this.

 * The desc is used to track userspace buffer index.

 * The ctx field is used to track device context.

 * The desc field is used to track userspace buffer index.

 */

struct ubuf_info {

	void (*callback)(void *);

	void *arg;

	void (*callback)(struct ubuf_info *);

	void *ctx;

	unsigned long desc;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE