Message ID | 20210307174853.28273-1-imirkin@alum.mit.edu (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/nouveau/kms/nv04: use vzalloc for nv04_display | expand |
On Mon, 8 Mar 2021 at 03:49, Ilia Mirkin <imirkin@alum.mit.edu> wrote: > > The struct is giant, and triggers an order-7 allocation (512K). There is > no reason for this to be kmalloc-type memory, so switch to vmalloc. This > should help loading nouveau on low-memory and/or long-running systems. > > Reported-by: Nathan E. Egge <unlord@xiph.org> > Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> > Cc: stable@vger.kernel.org Thanks! > --- > drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c > index 7739f46470d3..99fee4d8cd31 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c > @@ -205,7 +205,7 @@ nv04_display_destroy(struct drm_device *dev) > nvif_notify_dtor(&disp->flip); > > nouveau_display(dev)->priv = NULL; > - kfree(disp); > + vfree(disp); > > nvif_object_unmap(&drm->client.device.object); > } > @@ -223,7 +223,7 @@ nv04_display_create(struct drm_device *dev) > struct nv04_display *disp; > int i, ret; > > - disp = kzalloc(sizeof(*disp), GFP_KERNEL); > + disp = vzalloc(sizeof(*disp)); > if (!disp) > return -ENOMEM; > > -- > 2.26.2 > > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c index 7739f46470d3..99fee4d8cd31 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c @@ -205,7 +205,7 @@ nv04_display_destroy(struct drm_device *dev) nvif_notify_dtor(&disp->flip); nouveau_display(dev)->priv = NULL; - kfree(disp); + vfree(disp); nvif_object_unmap(&drm->client.device.object); } @@ -223,7 +223,7 @@ nv04_display_create(struct drm_device *dev) struct nv04_display *disp; int i, ret; - disp = kzalloc(sizeof(*disp), GFP_KERNEL); + disp = vzalloc(sizeof(*disp)); if (!disp) return -ENOMEM;
The struct is giant, and triggers an order-7 allocation (512K). There is no reason for this to be kmalloc-type memory, so switch to vmalloc. This should help loading nouveau on low-memory and/or long-running systems. Reported-by: Nathan E. Egge <unlord@xiph.org> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: stable@vger.kernel.org --- drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)