From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel =?ISO-8859-1?Q?D=E4nzer?= Subject: Re: [PATCH] drm/radeon: fix bo creation retry path Date: Tue, 21 Aug 2012 09:03:46 +0200 Message-ID: <1345532626.2924.210.camel@thor.local> References: <1342131785-12373-1-git-send-email-j.glisse@gmail.com> <1342158840.5901.257.camel@thor.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51]) by gabe.freedesktop.org (Postfix) with ESMTP id ACB569EFF4 for ; Tue, 21 Aug 2012 00:04:01 -0700 (PDT) In-Reply-To: <1342158840.5901.257.camel@thor.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: j.glisse@gmail.com Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fre, 2012-07-13 at 07:54 +0200, Michel D=E4nzer wrote: = > On Don, 2012-07-12 at 18:23 -0400, j.glisse@gmail.com wrote: = > > From: Jerome Glisse > > = > > Retry label was at wrong place in function leading to memory > > leak. > > = > > Cc: > > Signed-off-by: Jerome Glisse > > --- > > drivers/gpu/drm/radeon/radeon_object.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > = > > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/r= adeon/radeon_object.c > > index 6ecb200..f71e472 100644 > > --- a/drivers/gpu/drm/radeon/radeon_object.c > > +++ b/drivers/gpu/drm/radeon/radeon_object.c > > @@ -138,7 +138,6 @@ int radeon_bo_create(struct radeon_device *rdev, > > acc_size =3D ttm_bo_dma_acc_size(&rdev->mman.bdev, size, > > sizeof(struct radeon_bo)); > > = > > -retry: > > bo =3D kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); > > if (bo =3D=3D NULL) > > return -ENOMEM; > > @@ -152,6 +151,8 @@ retry: > > bo->surface_reg =3D -1; > > INIT_LIST_HEAD(&bo->list); > > INIT_LIST_HEAD(&bo->va); > > + > > +retry: > > radeon_ttm_placement_from_domain(bo, domain); > > /* Kernel allocation are uninterruptible */ > > down_read(&rdev->pm.mclk_lock); > = > Reviewed-by: Michel D=E4nzer Actually, this is wrong: ttm_bo_init() destroys the BO on failure. So this patch makes the retry path work with freed memory. I see on IRC that this is causing panics with some piglit tests for several people, please submit a patch to revert this. Sorry I didn't remember this when reviewing the patch. :( -- = Earthling Michel D=E4nzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer