Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933007AbaFLJjI (ORCPT ); Thu, 12 Jun 2014 05:39:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50873 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932740AbaFLJjD (ORCPT ); Thu, 12 Jun 2014 05:39:03 -0400 Date: Thu, 12 Jun 2014 12:39:15 +0300 From: "Michael S. Tsirkin" To: Romain Francoise Cc: Linus Torvalds , nab@daterainc.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, sfr@canb.auug.org.au, linux-scsi@vger.kernel.org, Al Viro Subject: Re: [PULL] vhost: infrastructure changes for 3.16 Message-ID: <20140612093915.GD22230@redhat.com> References: <20140611134447.GA8208@redhat.com> <87mwdiwmbp.fsf@kima.orebokech.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87mwdiwmbp.fsf@kima.orebokech.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 12, 2014 at 10:42:34AM +0200, Romain Francoise wrote: > "Michael S. Tsirkin" writes: > > > Memory allocation for vhost-net now supports fallback on vmalloc (same > > as for vhost-scsi) this makes it possible to create the device on > > systems where memory is very fragmented, with slightly lower > > performance. > > Thanks Michael, I'm glad to see that this change made its way into > mainline after all! Would you be willing to take the following on top? > > > From: Romain Francoise > Date: Thu, 12 Jun 2014 10:26:40 +0200 > Subject: [PATCH] vhost-net: don't open-code kvfree > > Commit 23cc5a991c ("vhost-net: extend device allocation to vmalloc") > added another open-coded version of kvfree (which is available since > v3.15-rc5), nuke it. > > Signed-off-by: Romain Francoise > --- Absolutely, I'll queue this up, thanks! > drivers/vhost/net.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index 971a760..8dae2f7 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -700,14 +700,6 @@ static void handle_rx_net(struct vhost_work *work) > handle_rx(net); > } > > -static void vhost_net_free(void *addr) > -{ > - if (is_vmalloc_addr(addr)) > - vfree(addr); > - else > - kfree(addr); > -} > - > static int vhost_net_open(struct inode *inode, struct file *f) > { > struct vhost_net *n; > @@ -723,7 +715,7 @@ static int vhost_net_open(struct inode *inode, struct file *f) > } > vqs = kmalloc(VHOST_NET_VQ_MAX * sizeof(*vqs), GFP_KERNEL); > if (!vqs) { > - vhost_net_free(n); > + kvfree(n); > return -ENOMEM; > } > > @@ -840,7 +832,7 @@ static int vhost_net_release(struct inode *inode, struct file *f) > * since jobs can re-queue themselves. */ > vhost_net_flush(n); > kfree(n->dev.vqs); > - vhost_net_free(n); > + kvfree(n); > return 0; > } > > -- > 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/