lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[net/9p]Serialize virtqueue operations to make VirtIO transport SMP safe.

Browse Source 
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Venkateswararao Jujjuri (JV)
2010-09-29 18:06:54 -07:00
committed by Eric Van Hensbergen
parent 329176cc2c
commit 419b39561e
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
net/9p/trans_virtio.c
View File

@@ -134,16 +134,24 @@ static void req_done(struct virtqueue *vq)
struct p9_fcall *rc; struct p9_fcall *rc;
unsigned int len; unsigned int len;
struct p9_req_t *req; struct p9_req_t *req;
unsigned long flags;
P9_DPRINTK(P9_DEBUG_TRANS, ": request done\n"); P9_DPRINTK(P9_DEBUG_TRANS, ": request done\n");
while ((rc = virtqueue_get_buf(chan->vq, &len)) != NULL) { do {
P9_DPRINTK(P9_DEBUG_TRANS, ": rc %p\n", rc); spin_lock_irqsave(&chan->lock, flags);
P9_DPRINTK(P9_DEBUG_TRANS, ": lookup tag %d\n", rc->tag); rc = virtqueue_get_buf(chan->vq, &len);
req = p9_tag_lookup(chan->client, rc->tag); spin_unlock_irqrestore(&chan->lock, flags);
req->status = REQ_STATUS_RCVD;
p9_client_cb(chan->client, req); if (rc != NULL) {
} P9_DPRINTK(P9_DEBUG_TRANS, ": rc %p\n", rc);
P9_DPRINTK(P9_DEBUG_TRANS, ": lookup tag %d\n",
rc->tag);
req = p9_tag_lookup(chan->client, rc->tag);
req->status = REQ_STATUS_RCVD;
p9_client_cb(chan->client, req);
}
} while (rc != NULL);
} }
/** /**
@@ -199,23 +207,29 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
int in, out; int in, out;
struct virtio_chan *chan = client->trans; struct virtio_chan *chan = client->trans;
char *rdata = (char *)req->rc+sizeof(struct p9_fcall); char *rdata = (char *)req->rc+sizeof(struct p9_fcall);
unsigned long flags;
int err;
P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request\n"); P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request\n");
req->status = REQ_STATUS_SENT;
spin_lock_irqsave(&chan->lock, flags);
out = pack_sg_list(chan->sg, 0, VIRTQUEUE_NUM, req->tc->sdata, out = pack_sg_list(chan->sg, 0, VIRTQUEUE_NUM, req->tc->sdata,
req->tc->size); req->tc->size);
in = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM-out, rdata, in = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM-out, rdata,
client->msize); client->msize);
req->status = REQ_STATUS_SENT; err = virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc);
if (err < 0) {
if (virtqueue_add_buf(chan->vq, chan->sg, out, in, req->tc) < 0) { spin_unlock_irqrestore(&chan->lock, flags);
P9_DPRINTK(P9_DEBUG_TRANS, P9_DPRINTK(P9_DEBUG_TRANS,
"9p debug: virtio rpc add_buf returned failure"); "9p debug: virtio rpc add_buf returned failure");
return -EIO; return -EIO;
} }
virtqueue_kick(chan->vq); virtqueue_kick(chan->vq);
spin_unlock_irqrestore(&chan->lock, flags);
P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request kicked\n"); P9_DPRINTK(P9_DEBUG_TRANS, "9p debug: virtio request kicked\n");
return 0; return 0;