From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: Re: WARNING: at drivers/gpu/drm/nouveau/core/core/mm.c:242 Date: Mon, 17 Jun 2013 10:45:05 +0200 Message-ID: <51BECC91.90809@suse.cz> References: <5122021F.1060207@suse.cz> <20130218232335.GA9730@joi.lan> <5122BC8A.6040503@suse.cz> <20130219070744.GA3032@joi.lan> <20130219223255.GA13522@joi.lan> <514056C8.3040702@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <514056C8.3040702@suse.cz> Sender: stable-owner@vger.kernel.org To: Marcin Slusarz , bskeggs@redhat.com Cc: Jiri Slaby , dri-devel@lists.freedesktop.org, LKML , stable List-Id: dri-devel@lists.freedesktop.org On 03/13/2013 11:36 AM, Jiri Slaby wrote: > On 02/19/2013 11:32 PM, Marcin Slusarz wrote: >> On Tue, Feb 19, 2013 at 08:07:44AM +0100, Marcin Slusarz wrote: >>> On Tue, Feb 19, 2013 at 12:43:06AM +0100, Jiri Slaby wrote: >>>> On 02/19/2013 12:23 AM, Marcin Slusarz wrote: >>>>> Tomorrow I'll post a patch for page allocation failure. >>>> >>>> What do you mean -- what kind of patch? >>> >>> A patch which will change pgt allocation to use vmalloc. > > It's still not in -next. Any plans on this? Ping... >> --- >> From: Marcin Slusarz >> Subject: [PATCH] drm/nouveau: use vmalloc for pgt allocation >> >> Page tables on nv50 take 48kB, which can be hard to allocate in one piece. >> Let's use vmalloc. >> >> Signed-off-by: Marcin Slusarz >> Cc: stable@vger.kernel.org >> --- >> drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c >> index 77c67fc..e66fb77 100644 >> --- a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c >> +++ b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c >> @@ -362,7 +362,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, >> vm->fpde = offset >> (vmm->pgt_bits + 12); >> vm->lpde = (offset + length - 1) >> (vmm->pgt_bits + 12); >> >> - vm->pgt = kcalloc(vm->lpde - vm->fpde + 1, sizeof(*vm->pgt), GFP_KERNEL); >> + vm->pgt = vzalloc((vm->lpde - vm->fpde + 1) * sizeof(*vm->pgt)); >> if (!vm->pgt) { >> kfree(vm); >> return -ENOMEM; >> @@ -371,7 +371,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, >> ret = nouveau_mm_init(&vm->mm, mm_offset >> 12, mm_length >> 12, >> block >> 12); >> if (ret) { >> - kfree(vm->pgt); >> + vfree(vm->pgt); >> kfree(vm); >> return ret; >> } >> @@ -446,7 +446,7 @@ nouveau_vm_del(struct nouveau_vm *vm) >> } >> >> nouveau_mm_fini(&vm->mm); >> - kfree(vm->pgt); >> + vfree(vm->pgt); >> kfree(vm); >> } >> >> > > -- js suse labs