Am 2021-12-02 um 2:19 p.m. schrieb Alex Deucher:
> This adds a new IOCTL currently used to implement querying
> and setting the stable power state for GPU profiling. The
> stable pstates use fixed clocks and disable certain power
> features in order to get accurate pipeline profiling.
>
> Currently this is handled via sysfs, and that is still
> available, but this makes it easier for applications
> to utilize. Note that the power state is global so
> setting it will affect all applications. There are currently
> no checks in place to prevent multiple applications from
> using this interface, but it doesn't make sense to do
> profiling while you have multiple applications running in the
> first place, so it's up to the user to ensure this in order
> to get good results.
>
> This patch add an interface to query what profiling mode is
> currently active and to set enable a profiling mode.
I was expecting this to be some exclusive mode that only one client
could use at a time. If someone is already using it, other users should
get -EBUSY. When the client terminates, the default mode should be
restored automatically.
It would also be nice to coordinate with the existing sysfs interface in
some defined way. E.g. the ioctl could override the mode chosen in sysfs
and client termination would restore the mode chosen in sysfs. Or a
non-default mode in sysfs could block the ioctl (return -EBUSY), sysfs
writes fail if there is an ioctl client, and sysfs faithfully reports
the current mode chosen by the ioctl.
Regards,
Felix
>
> Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c | 112 ++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h | 30 ++++++
> include/uapi/drm/amdgpu_drm.h | 28 +++++
> 5 files changed, 173 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
> b/drivers/gpu/drm/amd/amdgpu/Makefile
> index 7fedbb725e17..4cf5bf637a9e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -58,7 +58,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
> amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \
> amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \
> amdgpu_fw_attestation.o amdgpu_securedisplay.o amdgpu_hdp.o \
> - amdgpu_eeprom.o amdgpu_mca.o
> + amdgpu_eeprom.o amdgpu_mca.o amdgpu_profile.o
>
> amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index bc1355c6248d..0e27f9673f8f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -46,6 +46,7 @@
> #include "amdgpu_sched.h"
> #include "amdgpu_fdinfo.h"
> #include "amdgpu_amdkfd.h"
> +#include "amdgpu_profile.h"
>
> #include "amdgpu_ras.h"
> #include "amdgpu_xgmi.h"
> @@ -2467,6 +2468,7 @@ const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {
> DRM_IOCTL_DEF_DRV(AMDGPU_GEM_VA, amdgpu_gem_va_ioctl,
> DRM_AUTH|DRM_RENDER_ALLOW),
> DRM_IOCTL_DEF_DRV(AMDGPU_GEM_OP, amdgpu_gem_op_ioctl,
> DRM_AUTH|DRM_RENDER_ALLOW),
> DRM_IOCTL_DEF_DRV(AMDGPU_GEM_USERPTR, amdgpu_gem_userptr_ioctl,
> DRM_AUTH|DRM_RENDER_ALLOW),
> + DRM_IOCTL_DEF_DRV(AMDGPU_PROFILE, amdgpu_profile_ioctl,
> DRM_AUTH|DRM_RENDER_ALLOW),
> };
>
> static const struct drm_driver amdgpu_kms_driver = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c
> new file mode 100644
> index 000000000000..94fe408e810f
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c
> @@ -0,0 +1,112 @@
> +/*
> + * Copyright 2021 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#include <drm/amdgpu_drm.h>
> +#include "amdgpu.h"
> +
> +/**
> + * amdgpu_profile_ioctl - Manages settings for profiling.
> + *
> + * @dev: drm device pointer
> + * @data: drm_amdgpu_vm
> + * @filp: drm file pointer
> + *
> + * Returns:
> + * 0 for success, -errno for errors.
> + */
> +int amdgpu_profile_ioctl(struct drm_device *dev, void *data,
> + struct drm_file *filp)
> +{
> + union drm_amdgpu_profile *args = data;
> + struct amdgpu_device *adev = drm_to_adev(dev);
> + const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
> + enum amd_dpm_forced_level current_level, requested_level;
> + int r;
> +
> + if (pp_funcs->get_performance_level)
> + current_level = amdgpu_dpm_get_performance_level(adev);
> + else
> + current_level = adev->pm.dpm.forced_level;
> +
> + switch (args->in.op) {
> + case AMDGPU_PROFILE_OP_GET_STABLE_PSTATE:
> + if (args->in.flags)
> + return -EINVAL;
> + switch (current_level) {
> + case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
> + args->out.flags =
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_STANDARD;
> + break;
> + case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
> + args->out.flags =
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_SCLK;
> + break;
> + case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
> + args->out.flags =
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_MCLK;
> + break;
> + case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
> + args->out.flags =
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_PEAK;
> + break;
> + default:
> + args->out.flags =
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_NONE;
> + break;
> + }
> + break;
> + case AMDGPU_PROFILE_OP_SET_STABLE_PSTATE:
> + if (args->in.flags & ~AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MASK)
> + return -EINVAL;
> + switch (args->in.flags &
> AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MASK) {
> + case AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_STANDARD:
> + requested_level = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD;
> + break;
> + case AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_SCLK:
> + requested_level = AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK;
> + break;
> + case AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_MCLK:
> + requested_level = AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK;
> + break;
> + case AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_PEAK:
> + requested_level = AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
> + break;
> + case AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_NONE:
> + requested_level = AMD_DPM_FORCED_LEVEL_AUTO;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + if ((current_level != requested_level) &&
> pp_funcs->force_performance_level) {
> + mutex_lock(&adev->pm.mutex);
> + r = amdgpu_dpm_force_performance_level(adev,
> requested_level);
> + if (!r)
> + adev->pm.dpm.forced_level = requested_level;
> + mutex_unlock(&adev->pm.mutex);
> + if (r)
> + return r;
> + }
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h
> new file mode 100644
> index 000000000000..cd1c597bae11
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright 2021 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef __AMDGPU_PROFILE_H__
> +#define __AMDGPU_PROFILE_H__
> +
> +int amdgpu_profile_ioctl(struct drm_device *dev, void *data,
> + struct drm_file *filp);
> +
> +#endif
> diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> index 26e45fc5eb1a..b6edf4a826f9 100644
> --- a/include/uapi/drm/amdgpu_drm.h
> +++ b/include/uapi/drm/amdgpu_drm.h
> @@ -54,6 +54,7 @@ extern "C" {
> #define DRM_AMDGPU_VM 0x13
> #define DRM_AMDGPU_FENCE_TO_HANDLE 0x14
> #define DRM_AMDGPU_SCHED 0x15
> +#define DRM_AMDGPU_PROFILE 0x16
>
> #define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE +
> DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
> #define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE +
> DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
> @@ -71,6 +72,7 @@ extern "C" {
> #define DRM_IOCTL_AMDGPU_VM DRM_IOWR(DRM_COMMAND_BASE +
> DRM_AMDGPU_VM, union drm_amdgpu_vm)
> #define DRM_IOCTL_AMDGPU_FENCE_TO_HANDLE DRM_IOWR(DRM_COMMAND_BASE +
> DRM_AMDGPU_FENCE_TO_HANDLE, union drm_amdgpu_fence_to_handle)
> #define DRM_IOCTL_AMDGPU_SCHED DRM_IOW(DRM_COMMAND_BASE +
> DRM_AMDGPU_SCHED, union drm_amdgpu_sched)
> +#define DRM_IOCTL_AMDGPU_PROFILE DRM_IOW(DRM_COMMAND_BASE +
> DRM_AMDGPU_PROFILE, union drm_amdgpu_profile)
>
> /**
> * DOC: memory domains
> @@ -1120,6 +1122,32 @@ struct drm_amdgpu_info_video_caps {
> struct drm_amdgpu_info_video_codec_info
> codec_info[AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT];
> };
>
> +/* profile ioctl */
> +#define AMDGPU_PROFILE_OP_GET_STABLE_PSTATE 1
> +#define AMDGPU_PROFILE_OP_SET_STABLE_PSTATE 2
> +
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MASK 0xf
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_NONE 0
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_STANDARD 1
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_SCLK 2
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_MIN_MCLK 3
> +#define AMDGPU_PROFILE_FLAGS_STABLE_PSTATE_PEAK 4
> +
> +struct drm_amdgpu_profile_in {
> + /** AMDGPU_PROFILE_OP_* */
> + __u32 op;
> + __u32 flags;
> +};
> +
> +struct drm_amdgpu_profile_out {
> + __u64 flags;
> +};
> +
> +union drm_amdgpu_profile {
> + struct drm_amdgpu_profile_in in;
> + struct drm_amdgpu_profile_out out;
> +};
> +
> /*
> * Supported GPU families
> */
