system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 12:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost_net: introduce get_tx_bufs()

Browse source 
Factor out logic of getting tx buffer and iov iter
initialization. This will be used for reducing codes duplication in
the future.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2018-07-20 08:15:16 +08:00 committed by David S. Miller
parent 272f35cba5
commit a2a91a137a
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/vhost/net.c
View file

@ -484,6 +484,36 @@ static bool vhost_exceeds_weight(int pkts, int total_len)
pkts >= VHOST_NET_PKT_WEIGHT; pkts >= VHOST_NET_PKT_WEIGHT;
} }
static int get_tx_bufs(struct vhost_net *net,
struct vhost_net_virtqueue *nvq,
struct msghdr *msg,
unsigned int *out, unsigned int *in,
size_t *len, bool *busyloop_intr)
{
struct vhost_virtqueue *vq = &nvq->vq;
int ret;
ret = vhost_net_tx_get_vq_desc(net, vq, out, in, busyloop_intr);
if (ret < 0 || ret == vq->num)
return ret;
if (*in) {
vq_err(vq, "Unexpected descriptor format for TX: out %d, int %d\n",
*out, *in);
return -EFAULT;
}
/* Sanity check */
*len = init_iov_iter(vq, &msg->msg_iter, nvq->vhost_hlen, *out);
if (*len == 0) {
vq_err(vq, "Unexpected header len for TX: %zd expected %zd\n",
*len, nvq->vhost_hlen);
return -EFAULT;
}
return ret;
}
/* Expects to be always run from workqueue - which acts as /* Expects to be always run from workqueue - which acts as
* read-size critical section for our kind of RCU. */ * read-size critical section for our kind of RCU. */
static void handle_tx(struct vhost_net *net) static void handle_tx(struct vhost_net *net)
@ -501,7 +531,6 @@ static void handle_tx(struct vhost_net *net)
}; };
size_t len, total_len = 0; size_t len, total_len = 0;
int err; int err;
size_t hdr_size;
struct socket *sock; struct socket *sock;
struct vhost_net_ubuf_ref *uninitialized_var(ubufs); struct vhost_net_ubuf_ref *uninitialized_var(ubufs);
bool zcopy, zcopy_used; bool zcopy, zcopy_used;
@ -518,7 +547,6 @@ static void handle_tx(struct vhost_net *net)
vhost_disable_notify(&net->dev, vq); vhost_disable_notify(&net->dev, vq);
vhost_net_disable_vq(net, vq); vhost_net_disable_vq(net, vq);
hdr_size = nvq->vhost_hlen;
zcopy = nvq->ubufs; zcopy = nvq->ubufs;
for (;;) { for (;;) {
@ -529,8 +557,8 @@ static void handle_tx(struct vhost_net *net)
vhost_zerocopy_signal_used(net, vq); vhost_zerocopy_signal_used(net, vq);
busyloop_intr = false; busyloop_intr = false;
head = vhost_net_tx_get_vq_desc(net, vq, &out, &in, head = get_tx_bufs(net, nvq, &msg, &out, &in, &len,
&busyloop_intr); &busyloop_intr);
/* On error, stop handling until the next kick. */ /* On error, stop handling until the next kick. */
if (unlikely(head < 0)) if (unlikely(head < 0))
break; break;
@ -544,19 +572,6 @@ static void handle_tx(struct vhost_net *net)
} }
break; break;
} }
if (in) {
vq_err(vq, "Unexpected descriptor format for TX: "
"out %d, int %d\n", out, in);
break;
}
/* Sanity check */
len = init_iov_iter(vq, &msg.msg_iter, hdr_size, out);
if (!len) {
vq_err(vq, "Unexpected header len for TX: %zd expected %zd\n",
len, hdr_size);
break;
}
zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN zcopy_used = zcopy && len >= VHOST_GOODCOPY_LEN
&& !vhost_exceeds_maxpend(net) && !vhost_exceeds_maxpend(net)