Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753032AbdLAO63 (ORCPT ); Fri, 1 Dec 2017 09:58:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46130 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbdLAO61 (ORCPT ); Fri, 1 Dec 2017 09:58:27 -0500 Date: Fri, 1 Dec 2017 16:58:24 +0200 From: "Michael S. Tsirkin" To: Matthew Rosato Cc: wexu@redhat.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jasowang@redhat.com, David Miller Subject: Re: [PATCH net,stable v4 0/3] vhost: fix a few skb leaks Message-ID: <20171201165635-mutt-send-email-mst@kernel.org> References: <1512123038-15773-1-git-send-email-wexu@redhat.com> <20171201164731-mutt-send-email-mst@kernel.org> <9ef31370-4042-b701-e983-90b8f20a2a39@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9ef31370-4042-b701-e983-90b8f20a2a39@linux.vnet.ibm.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 01 Dec 2017 14:58:27 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1882 Lines: 63 On Fri, Dec 01, 2017 at 09:54:02AM -0500, Matthew Rosato wrote: > On 12/01/2017 09:47 AM, Michael S. Tsirkin wrote: > > On Fri, Dec 01, 2017 at 05:10:35AM -0500, wexu@redhat.com wrote: > >> From: Wei Xu > >> > >> 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 > > > > Series > > > > Acked-by: Michael S. Tsirkin > > Tested this series on a z13 (s390x) on top of net-next using 4GB/4vcpu > guests. Verified that both the reported TCP throughput regression and > memory leak are resolved. > > net-next: 19.83 Gb/s > net-next+: 35.02 Gb/s > > Thanks all! > > Matt So we can also add Tested-by: Matthew Rosato Dave, pls take this through the net tree as most changes are in tun/tap. Thanks! > > > > > >> 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. > >> > >> Wei Xu (3): > >> vhost: fix skb leak in handle_rx() > >> tun: free skb in early errors > >> tap: free skb if flags error > >> > >> drivers/net/tap.c | 14 ++++++++++---- > >> drivers/net/tun.c | 24 ++++++++++++++++++------ > >> drivers/vhost/net.c | 20 ++++++++++---------- > >> 3 files changed, 38 insertions(+), 20 deletions(-) > >> > >> -- > >> 1.8.3.1 > >