From: David S. Miller Date: Sun, 3 Dec 2017 02:31:04 +0000 (-0500) Subject: Merge branch 'vhost-skb-leaks' X-Git-Tag: v4.15~267^2~9 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7344ba039f4fc5fb18be5618199827e246b0c697;hp=-c;p=mirror_ubuntu-bionic-kernel.git Merge branch 'vhost-skb-leaks' Wei Xu says: ==================== vhost: fix a few skb leaks Matthew found a roughly 40% tcp throughput regression with commit c67df11f(vhost_net: try batch dequing from skb array) as discussed in the following thread: https://www.mail-archive.com/netdev@vger.kernel.org/msg187936.html v4: - fix zero iov iterator count in tap/tap_do_read()(Jason) - don't put tun in case of EBADFD(Jason) - Replace msg->msg_control with new 'skb' when calling tun/tap_do_read() v3: - move freeing skb from vhost to tun/tap recvmsg() to not confuse the callers. v2: - add Matthew as the reporter, thanks matthew. - moving zero headcount check ahead instead of defer consuming skb due to jason and mst's comment. - add freeing skb in favor of recvmsg() fails. ==================== Acked-by: Michael S. Tsirkin Tested-by: Matthew Rosato Signed-off-by: David S. Miller --- 7344ba039f4fc5fb18be5618199827e246b0c697