From: Dan Carpenter <dan.carpenter@oracle.com> To: Christian Koenig <christian.koenig@amd.com>, Thomas Hellstr <C3@mwanda>, B6@mwanda, m <thomas.hellstrom@linux.intel.com> Cc: Huang Rui <ray.huang@amd.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/ttm: fix error handling in ttm_bo_handle_move_mem() Date: Wed, 16 Jun 2021 09:30:12 +0300 [thread overview] Message-ID: <YMmadPwv8C+Ut1+o@mwanda> (raw) In-Reply-To: <20210610154113.GJ1955@kadam> There are three bugs here: 1) We need to call unpopulate() if ttm_tt_populate() succeeds. 2) The "new_man = ttm_manager_type(bdev, bo->mem.mem_type);" assignment was wrong and it was really assigning "new_mem = old_mem;". There is no need for this assignment anyway as we already have the value for "new_mem". 3) The (!new_man->use_tt) condition is reversed. Fixes: ba4e7d973dd0 ("drm: Add the TTM GPU memory manager subsystem.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- This is from reading the code and I can't swear that I have understood it correctly. My nouveau driver is currently unusable and this patch has not helped. But hopefully if I fix enough bugs eventually it will start to work. drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ebcffe794adb..72dde093f754 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -180,12 +180,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, */ ret = ttm_tt_create(bo, old_man->use_tt); if (ret) - goto out_err; + return ret; if (mem->mem_type != TTM_PL_SYSTEM) { ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx); if (ret) - goto out_err; + goto err_destroy; } } @@ -193,15 +193,17 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, if (ret) { if (ret == -EMULTIHOP) return ret; - goto out_err; + goto err_unpopulate; } ctx->bytes_moved += bo->base.size; return 0; -out_err: - new_man = ttm_manager_type(bdev, bo->mem.mem_type); - if (!new_man->use_tt) +err_unpopulate: + if (new_man->use_tt) + ttm_tt_unpopulate(bo->bdev, bo->ttm); +err_destroy: + if (new_man->use_tt) ttm_bo_tt_destroy(bo); return ret; -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com> To: Christian Koenig <christian.koenig@amd.com>, Thomas Hellstr <C3@mwanda>, B6@mwanda, m <thomas.hellstrom@linux.intel.com> Cc: David Airlie <airlied@linux.ie>, Huang Rui <ray.huang@amd.com>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/ttm: fix error handling in ttm_bo_handle_move_mem() Date: Wed, 16 Jun 2021 09:30:12 +0300 [thread overview] Message-ID: <YMmadPwv8C+Ut1+o@mwanda> (raw) In-Reply-To: <20210610154113.GJ1955@kadam> There are three bugs here: 1) We need to call unpopulate() if ttm_tt_populate() succeeds. 2) The "new_man = ttm_manager_type(bdev, bo->mem.mem_type);" assignment was wrong and it was really assigning "new_mem = old_mem;". There is no need for this assignment anyway as we already have the value for "new_mem". 3) The (!new_man->use_tt) condition is reversed. Fixes: ba4e7d973dd0 ("drm: Add the TTM GPU memory manager subsystem.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- This is from reading the code and I can't swear that I have understood it correctly. My nouveau driver is currently unusable and this patch has not helped. But hopefully if I fix enough bugs eventually it will start to work. drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ebcffe794adb..72dde093f754 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -180,12 +180,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, */ ret = ttm_tt_create(bo, old_man->use_tt); if (ret) - goto out_err; + return ret; if (mem->mem_type != TTM_PL_SYSTEM) { ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx); if (ret) - goto out_err; + goto err_destroy; } } @@ -193,15 +193,17 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, if (ret) { if (ret == -EMULTIHOP) return ret; - goto out_err; + goto err_unpopulate; } ctx->bytes_moved += bo->base.size; return 0; -out_err: - new_man = ttm_manager_type(bdev, bo->mem.mem_type); - if (!new_man->use_tt) +err_unpopulate: + if (new_man->use_tt) + ttm_tt_unpopulate(bo->bdev, bo->ttm); +err_destroy: + if (new_man->use_tt) ttm_bo_tt_destroy(bo); return ret; -- 2.30.2
next prev parent reply other threads:[~2021-06-16 6:30 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-10 15:41 question about error handling in ttm_bo_handle_move_mem() Dan Carpenter 2021-06-16 6:30 ` Dan Carpenter [this message] 2021-06-16 6:30 ` [PATCH] drm/ttm: fix " Dan Carpenter 2021-06-16 6:46 ` Christian König 2021-06-16 6:46 ` Christian König 2021-06-16 8:37 ` Dan Carpenter 2021-06-16 8:37 ` Dan Carpenter 2021-06-16 8:47 ` Christian König 2021-06-16 8:47 ` Christian König 2021-06-16 9:36 ` Dan Carpenter 2021-06-16 9:36 ` Dan Carpenter 2021-06-16 11:00 ` Christian König 2021-06-16 11:00 ` Christian König 2021-06-16 19:19 ` Dan Carpenter 2021-06-16 19:19 ` Dan Carpenter 2021-06-17 7:41 ` Christian König 2021-06-17 7:41 ` Christian König 2021-06-17 16:54 ` Daniel Vetter 2021-06-17 16:54 ` Daniel Vetter
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=YMmadPwv8C+Ut1+o@mwanda \ --to=dan.carpenter@oracle.com \ --cc=B6@mwanda \ --cc=C3@mwanda \ --cc=airlied@linux.ie \ --cc=christian.koenig@amd.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ray.huang@amd.com \ --cc=thomas.hellstrom@linux.intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.