From: "Michael S. Tsirkin" <mst@redhat.com>
To: Romain Francoise <romain@orebokech.com>
Cc: kvm@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] vhost-net: fall back to vmalloc if high-order allocation fails
Date: Wed, 23 Jan 2013 23:04:11 +0200 [thread overview]
Message-ID: <20130123210411.GA9055@redhat.com> (raw)
In-Reply-To: <87k3r31vbc.fsf@silenus.orebokech.com>
On Wed, Jan 23, 2013 at 09:46:47PM +0100, Romain Francoise wrote:
> Creating a vhost-net device allocates an object large enough (34320 bytes
> on x86-64) to trigger an order-4 allocation, which may fail if memory if
> fragmented:
>
> libvirtd: page allocation failure: order:4, mode:0x2000d0
> ...
> SLAB: Unable to allocate memory on node 0 (gfp=0xd0)
> cache: size-65536, object size: 65536, order: 4
> node 0: slabs: 8/8, objs: 8/8, free: 0
>
> In that situation, rather than forcing the caller to use regular
> virtio-net, try to allocate the descriptor with vmalloc().
>
> Signed-off-by: Romain Francoise <romain@orebokech.com>
Thanks for the patch.
Hmm, I haven't seen this.
Maybe we should try and reduce our memory usage,
I will look into this.
> ---
> drivers/vhost/net.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
> index ebd08b2..1ded79b 100644
> --- a/drivers/vhost/net.c
> +++ b/drivers/vhost/net.c
> @@ -18,6 +18,7 @@
> #include <linux/rcupdate.h>
> #include <linux/file.h>
> #include <linux/slab.h>
> +#include <linux/vmalloc.h>
>
> #include <linux/net.h>
> #include <linux/if_packet.h>
> @@ -603,12 +604,23 @@ static void handle_rx_net(struct vhost_work *work)
> handle_rx(net);
> }
>
> +static void vhost_net_kvfree(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 = kmalloc(sizeof *n, GFP_KERNEL);
> + struct vhost_net *n;
> struct vhost_dev *dev;
> int r;
>
> + n = kmalloc(sizeof *n, GFP_KERNEL | __GFP_NOWARN);
> + if (!n)
> + n = vmalloc(sizeof *n);
> if (!n)
> return -ENOMEM;
>
> @@ -617,7 +629,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
> n->vqs[VHOST_NET_VQ_RX].handle_kick = handle_rx_kick;
> r = vhost_dev_init(dev, n->vqs, VHOST_NET_VQ_MAX);
> if (r < 0) {
> - kfree(n);
> + vhost_net_kvfree(n);
> return r;
> }
>
> @@ -719,7 +731,7 @@ static int vhost_net_release(struct inode *inode, struct file *f)
> /* We do an extra flush before freeing memory,
> * since jobs can re-queue themselves. */
> vhost_net_flush(n);
> - kfree(n);
> + vhost_net_kvfree(n);
> return 0;
> }
>
> --
> 1.8.1.1
next prev parent reply other threads:[~2013-01-23 21:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 20:46 [PATCH] vhost-net: fall back to vmalloc if high-order allocation fails Romain Francoise
2013-01-23 21:04 ` Michael S. Tsirkin [this message]
2013-01-28 3:11 ` David Miller
2013-01-28 9:23 ` Romain Francoise
2013-06-28 7:16 ` Romain Francoise
2013-01-24 9:45 ` David Laight
2013-01-24 10:06 ` Michael S. Tsirkin
2013-01-24 10:37 ` David Laight
2013-01-25 3:03 ` Cong Wang
2013-01-25 5:15 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130123210411.GA9055@redhat.com \
--to=mst@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=romain@orebokech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).