Commit 87444254 authored by Roy Sun's avatar Roy Sun Committed by Christian König
Browse files

drm/amdgpu: Add show_fdinfo() interface 



Tracking devices, process info and fence info using
/proc/pid/fdinfo

Signed-off-by: default avatarDavid M Nieto <David.Nieto@amd.com>
Signed-off-by: default avatarRoy Sun <Roy.Sun@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210426062701.39732-2-Roy.Sun@amd.com
parent 1774baa6

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o



amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o



amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o



# add asic specific block

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#include "amdgpu_gfxhub.h"

#include "amdgpu_df.h"

#include "amdgpu_smuio.h"

#include "amdgpu_fdinfo.h"



#define MAX_GPU_INSTANCE		16

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

+61 −0
Original line number Diff line number Diff line
@@ -651,3 +651,64 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr) 
	idr_destroy(&mgr->ctx_handles);

	mutex_destroy(&mgr->lock);

}



void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx, struct amdgpu_ctx_entity *centity,

		ktime_t *total, ktime_t *max)

{

	ktime_t now, t1;

	uint32_t i;



	now = ktime_get();

	for (i = 0; i < amdgpu_sched_jobs; i++) {

		struct dma_fence *fence;

		struct drm_sched_fence *s_fence;



		spin_lock(&ctx->ring_lock);

		fence = dma_fence_get(centity->fences[i]);

		spin_unlock(&ctx->ring_lock);

		if (!fence)

			continue;

		s_fence = to_drm_sched_fence(fence);

		if (!dma_fence_is_signaled(&s_fence->scheduled))

			continue;

		t1 = s_fence->scheduled.timestamp;

		if (t1 >= now)

			continue;

		if (dma_fence_is_signaled(&s_fence->finished) &&

			s_fence->finished.timestamp < now)

			*total += ktime_sub(s_fence->finished.timestamp, t1);

		else

			*total += ktime_sub(now, t1);

		t1 = ktime_sub(now, t1);

		dma_fence_put(fence);

		*max = max(t1, *max);

	}

}



ktime_t amdgpu_ctx_mgr_fence_usage(struct amdgpu_ctx_mgr *mgr, uint32_t hwip,

		uint32_t idx, uint64_t *elapsed)

{

	struct idr *idp;

	struct amdgpu_ctx *ctx;

	uint32_t id;

	struct amdgpu_ctx_entity *centity;

	ktime_t total = 0, max = 0;



	if (idx >= AMDGPU_MAX_ENTITY_NUM)

		return 0;

	idp = &mgr->ctx_handles;

	mutex_lock(&mgr->lock);

	idr_for_each_entry(idp, ctx, id) {

		if (!ctx->entities[hwip][idx])

			continue;



		centity = ctx->entities[hwip][idx];

		amdgpu_ctx_fence_time(ctx, centity, &total, &max);

	}



	mutex_unlock(&mgr->lock);

	if (elapsed)

		*elapsed = max;



	return total;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h

+4 −1
Original line number Diff line number Diff line
@@ -87,5 +87,8 @@ void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr); 
void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr);

long amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr, long timeout);

void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);



ktime_t amdgpu_ctx_mgr_fence_usage(struct amdgpu_ctx_mgr *mgr, uint32_t hwip,

		uint32_t idx, uint64_t *elapsed);

void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx, struct amdgpu_ctx_entity *centity,

		ktime_t *total, ktime_t *max);

#endif

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "amdgpu_irq.h"

#include "amdgpu_dma_buf.h"

#include "amdgpu_sched.h"



#include "amdgpu_fdinfo.h"

#include "amdgpu_amdkfd.h"



#include "amdgpu_ras.h"
@@ -1692,6 +1692,9 @@ static const struct file_operations amdgpu_driver_kms_fops = { 
#ifdef CONFIG_COMPAT

	.compat_ioctl = amdgpu_kms_compat_ioctl,

#endif

#ifdef CONFIG_PROC_FS

	.show_fdinfo = amdgpu_show_fdinfo

#endif

};



int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)