diff options
author | Jason Wang <jasowang@redhat.com> | 2016-11-30 00:17:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-11-30 15:06:02 -0500 |
commit | aa196eed3d80d4b003b04a270712b978a012a939 (patch) | |
tree | 73db65b94d0c8607ba2088178b6f00fa51bcc920 | |
parent | af1cc7a2b86ddb8668ac38097866bedd7b849a76 (diff) |
macvtap: handle ubuf refcount correctly when meet errors
We trigger uarg->callback() immediately after we decide do datacopy
even if caller want to do zerocopy. This will cause the callback
(vhost_net_zerocopy_callback) decrease the refcount. But when we meet
an error afterwards, the error handling in vhost handle_tx() will try
to decrease it again. This is wrong and fix this by delay the
uarg->callback() until we're sure there's no errors.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/macvtap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index bceca2875771..7869b0651576 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -742,13 +742,8 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, | |||
742 | 742 | ||
743 | if (zerocopy) | 743 | if (zerocopy) |
744 | err = zerocopy_sg_from_iter(skb, from); | 744 | err = zerocopy_sg_from_iter(skb, from); |
745 | else { | 745 | else |
746 | err = skb_copy_datagram_from_iter(skb, 0, from, len); | 746 | err = skb_copy_datagram_from_iter(skb, 0, from, len); |
747 | if (!err && m && m->msg_control) { | ||
748 | struct ubuf_info *uarg = m->msg_control; | ||
749 | uarg->callback(uarg, false); | ||
750 | } | ||
751 | } | ||
752 | 747 | ||
753 | if (err) | 748 | if (err) |
754 | goto err_kfree; | 749 | goto err_kfree; |
@@ -779,7 +774,11 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, | |||
779 | skb_shinfo(skb)->destructor_arg = m->msg_control; | 774 | skb_shinfo(skb)->destructor_arg = m->msg_control; |
780 | skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; | 775 | skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; |
781 | skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG; | 776 | skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG; |
777 | } else if (m && m->msg_control) { | ||
778 | struct ubuf_info *uarg = m->msg_control; | ||
779 | uarg->callback(uarg, false); | ||
782 | } | 780 | } |
781 | |||
783 | if (vlan) { | 782 | if (vlan) { |
784 | skb->dev = vlan->dev; | 783 | skb->dev = vlan->dev; |
785 | dev_queue_xmit(skb); | 784 | dev_queue_xmit(skb); |