mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Max Zhen <max.zhen@amd.com>
To: Lizhi Hou <lizhi.hou@amd.com>, <ogabbay@kernel.org>,
	<quic_jhugo@quicinc.com>, <dri-devel@lists.freedesktop.org>,
	<mario.limonciello@amd.com>, <karol.wachowski@linux.intel.com>
Cc: <linux-kernel@vger.kernel.org>, <sonal.santan@amd.com>
Subject: Re: [PATCH V1] accel/amdxdna: Destroy the context when hwctx restart fails
Date: Tue, 17 Nov 2026 12:54:40 -0800	[thread overview]
Message-ID: <9b502657-323f-43a2-a910-67d734234814@amd.com> (raw)
In-Reply-To: <20261117165731.132261-1-lizhi.hou@amd.com>



On 11/17/2026 Tue 08:57, Lizhi Hou wrote:
> aie2_hwctx_restart() creates the firmware context first, then maps the
> host buffers and configures the CUs. When any of the later steps fails,
> the error is propagated to the caller but the context created at the
> beginning is left behind: hwctx->fw_ctx_id stays valid, the mailbox
> channel stays allocated and started, and ndev->hwctx_num is not
> decremented. The hardware context is reported as failed yet remains
> alive, and because aie2_sched_job_run() only tests hwctx->priv->mbox_chann
> the scheduler keeps submitting jobs to a context which has no host buffer
> mapped and no CU configured. Neither aie2_hwctx_resume() nor
> aie2_sched_job_timedout() looks at the return value, so the context is
> never cleaned up and the firmware context slot is leaked until the
> hardware context is destroyed.
> 
> Tear the context down on the error path.
> 
> Fixes: aac243092b70 ("accel/amdxdna: Add command execution")
> Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Reviewed-by: Max Zhen <max.zhen@amd.com>
> ---
>   drivers/accel/amdxdna/aie2_ctx.c | 10 +++++++---
>   1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
> index 74d7019268cb..11f5421e497a 100644
> --- a/drivers/accel/amdxdna/aie2_ctx.c
> +++ b/drivers/accel/amdxdna/aie2_ctx.c
> @@ -122,7 +122,7 @@ static int aie2_hwctx_restart(struct amdxdna_dev *xdna, struct amdxdna_hwctx *hw
>   				heap->mem.size);
>   	if (ret) {
>   		XDNA_ERR(xdna, "Map host buf failed, ret %d", ret);
> -		goto out;
> +		goto destroy;
>   	}
>   
>   	xa_for_each_range(&hwctx->client->dev_heap_xa, heap_id, heap, 1,
> @@ -132,16 +132,20 @@ static int aie2_hwctx_restart(struct amdxdna_dev *xdna, struct amdxdna_hwctx *hw
>   					heap->mem.size);
>   		if (ret) {
>   			XDNA_ERR(xdna, "Add heap %ld failed ret %d", heap_id, ret);
> -			goto out;
> +			goto destroy;
>   		}
>   	}
>   
>   	ret = aie2_config_cu(hwctx, NULL);
>   	if (ret) {
>   		XDNA_ERR(xdna, "Config cu failed, ret %d", ret);
> -		goto out;
> +		goto destroy;
>   	}
>   
> +	return 0;
> +
> +destroy:
> +	aie2_hwctx_stop(xdna, hwctx, NULL);
>   out:
>   	XDNA_DBG(xdna, "%s restarted, ret %d", hwctx->name, ret);
>   	return ret;


      reply	other threads:[~2026-11-17 20:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 16:57 Lizhi Hou
2026-11-17 20:54 ` Max Zhen [this message]

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=9b502657-323f-43a2-a910-67d734234814@amd.com \
    --to=max.zhen@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=karol.wachowski@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizhi.hou@amd.com \
    --cc=mario.limonciello@amd.com \
    --cc=ogabbay@kernel.org \
    --cc=quic_jhugo@quicinc.com \
    --cc=sonal.santan@amd.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

all inboxes | Powered by JetHome®