From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: Alex Deucher <alexander.deucher@amd.com>, amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/amdgpu: change the default timeout for kernel compute queues
Date: Wed, 5 May 2021 08:34:57 +0200 [thread overview]
Message-ID: <b2b83b47-2e7b-02ea-0591-daae4dc0d3e6@gmail.com> (raw)
In-Reply-To: <20210504150358.1719088-1-alexander.deucher@amd.com>
Am 04.05.21 um 17:03 schrieb Alex Deucher:
> Change to 60s. This matches what we already do in virtualization.
> Infinite timeout can lead to deadlocks in the kernel.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +++-----
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++--
> 2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 357f9405f1aa..1b60f8205f15 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -3167,8 +3167,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
> int ret = 0;
>
> /*
> - * By default timeout for non compute jobs is 10000.
> - * And there is no timeout enforced on compute jobs.
> + * By default timeout for non compute jobs is 10000
> + * and 60000 for compute jobs.
> * In SR-IOV or passthrough mode, timeout for compute
> * jobs are 60000 by default.
> */
> @@ -3177,10 +3177,8 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
> if (amdgpu_sriov_vf(adev))
> adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?
> msecs_to_jiffies(60000) : msecs_to_jiffies(10000);
> - else if (amdgpu_passthrough(adev))
> - adev->compute_timeout = msecs_to_jiffies(60000);
> else
> - adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
> + adev->compute_timeout = msecs_to_jiffies(60000);
>
> if (strnlen(input, AMDGPU_MAX_TIMEOUT_PARAM_LENGTH)) {
> while ((timeout_setting = strsep(&input, ",")) &&
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index ad8a2c391bbd..d3d756585db4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -287,9 +287,9 @@ module_param_named(msi, amdgpu_msi, int, 0444);
> * for SDMA and Video.
> *
> * By default(with no lockup_timeout settings), the timeout for all non-compute(GFX, SDMA and Video)
> - * jobs is 10000. And there is no timeout enforced on compute jobs.
> + * jobs is 10000. The timeout for compute is 60000.
> */
> -MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (default: for bare metal 10000 for non-compute jobs and infinity timeout for compute jobs; "
> +MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (default: for bare metal 10000 for non-compute jobs and 60000 for compute jobs; "
> "for passthrough or sriov, 10000 for all jobs."
> " 0: keep default value. negative: infinity timeout), "
> "format: for bare metal [Non-Compute] or [GFX,Compute,SDMA,Video]; "
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2021-05-05 6:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 15:03 [PATCH] drm/amdgpu: change the default timeout for kernel compute queues Alex Deucher
2021-05-05 6:34 ` Christian König [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=b2b83b47-2e7b-02ea-0591-daae4dc0d3e6@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).