[PATCH 6/6] drm/xe/vf: Expose SR-IOV VF attributes to GT debugfs

[Piotr Piórkowski]

Michal Wajdeczko <michal.wajdeczko at intel.com> wrote on nie [2024-maj-12 17:49:15 +0200]:
> For debug purposes we might want to view actual VF configuration
> (including GGTT range, LMEM size, number of GuC contexts IDs or
> doorbells) and the negotiated ABI versions (with GuC and PF).
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/xe/Makefile                 |  1 +
>  drivers/gpu/drm/xe/xe_gt_debugfs.c          |  3 +
>  drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 72 +++++++++++++++++++++
>  drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h | 14 ++++
>  4 files changed, 90 insertions(+)
>  create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
>  create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h
> 
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index aaa3bce7390f..04c94629b349 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -156,6 +156,7 @@ xe-$(CONFIG_HWMON) += xe_hwmon.o
>  # graphics virtualization (SR-IOV) support
>  xe-y += \
>  	xe_gt_sriov_vf.o \
> +	xe_gt_sriov_vf_debugfs.o \
>  	xe_guc_relay.o \
>  	xe_memirq.o \
>  	xe_sriov.o
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> index c5e562e143fd..66f897a9b6ca 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -16,6 +16,7 @@
>  #include "xe_gt.h"
>  #include "xe_gt_mcr.h"
>  #include "xe_gt_sriov_pf_debugfs.h"
> +#include "xe_gt_sriov_vf_debugfs.h"
>  #include "xe_gt_topology.h"
>  #include "xe_hw_engine.h"
>  #include "xe_lrc.h"
> @@ -306,4 +307,6 @@ void xe_gt_debugfs_register(struct xe_gt *gt)
>  
>  	if (IS_SRIOV_PF(xe))
>  		xe_gt_sriov_pf_debugfs_register(gt, root);
> +	else if (IS_SRIOV_VF(xe))
> +		xe_gt_sriov_vf_debugfs_register(gt, root);
>  }
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
> new file mode 100644
> index 000000000000..f3ddcbefc6bc
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
> @@ -0,0 +1,72 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2023-2024 Intel Corporation
> + */
> +
> +#include <linux/debugfs.h>
> +
> +#include <drm/drm_debugfs.h>
> +
> +#include "xe_gt_debugfs.h"
> +#include "xe_gt_sriov_vf.h"
> +#include "xe_gt_sriov_vf_debugfs.h"
> +#include "xe_gt_types.h"
> +#include "xe_sriov.h"
> +
> +/*
> + *      /sys/kernel/debug/dri/0/
> + *      ├── gt0
> + *      │   ├── vf
> + *      │   │   ├── self_config
> + *      │   │   ├── abi_versions
> + *      │   │   ├── runtime_regs
> + */
> +
> +static const struct drm_info_list vf_info[] = {
> +	{
> +		"self_config",
> +		.show = xe_gt_debugfs_simple_show,
> +		.data = xe_gt_sriov_vf_print_config,
> +	},
> +	{
> +		"abi_versions",
> +		.show = xe_gt_debugfs_simple_show,
> +		.data = xe_gt_sriov_vf_print_version,
> +	},
> +#if defined(CONFIG_DRM_XE_DEBUG) || defined(CONFIG_DRM_XE_DEBUG_SRIOV)
> +	{
> +		"runtime_regs",
> +		.show = xe_gt_debugfs_simple_show,
> +		.data = xe_gt_sriov_vf_print_runtime,
> +	},
> +#endif
> +};
> +
> +/**
> + * xe_gt_sriov_vf_debugfs_register - Register SR-IOV VF specific entries in GT debugfs.
> + * @gt: the &xe_gt to register
> + * @root: the &dentry that represents the GT directory
> + *
> + * Register SR-IOV VF entries that are GT related and must be shown under GT debugfs.
> + */
> +void xe_gt_sriov_vf_debugfs_register(struct xe_gt *gt, struct dentry *root)
> +{
> +	struct xe_device *xe = gt_to_xe(gt);
> +	struct drm_minor *minor = xe->drm.primary;
> +	struct dentry *vfdentry;
> +
> +	xe_assert(xe, IS_SRIOV_VF(xe));
> +	xe_assert(xe, root->d_inode->i_private == gt);
> +
> +	/*
> +	 *      /sys/kernel/debug/dri/0/
> +	 *      ├── gt0
> +	 *      │   ├── vf
> +	 */
> +	vfdentry = debugfs_create_dir("vf", root);
> +	if (IS_ERR(vfdentry))
> +		return;
> +	vfdentry->d_inode->i_private = gt;
> +
> +	drm_debugfs_create_files(vf_info, ARRAY_SIZE(vf_info), vfdentry, minor);
> +}
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h
> new file mode 100644
> index 000000000000..b2cff7ef5c78
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023-2024 Intel Corporation
> + */
> +
> +#ifndef _XE_GT_SRIOV_VF_DEBUGFS_H_
> +#define _XE_GT_SRIOV_VF_DEBUGFS_H_
> +
> +struct xe_gt;
> +struct dentry;
> +
> +void xe_gt_sriov_vf_debugfs_register(struct xe_gt *gt, struct dentry *root);
> +
> +#endif


LGTM:
Reviewed-by: Piotr Piórkowski <piotr.piorkowski at intel.com>

> -- 
> 2.43.0
> 

--