diff mbox

[8/8] drm/amdgpu: use the new TTM bytes moved counter v2

Message ID 20171117104935.4150-9-christian.koenig@amd.com (mailing list archive)
State New, archived
Headers show

Commit Message

Christian König Nov. 17, 2017, 10:49 a.m. UTC 
Instead of the global statistics use the per context bytes moved counter.

v2: rebased

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  9 +++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

Comments

Chunming Zhou Nov. 20, 2017, 2:38 a.m. UTC | #1 
Reviewed-by: Chunming Zhou <david1.zhou@amd.com> for the series.


btw: any new patch based on this for enabling eviction and swapout for 
per-vm-bo?

Regards,
David Zhou
On 2017年11月17日 18:49, Christian König wrote:
> Instead of the global statistics use the per context bytes moved counter.
>
> v2: rebased
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     |  9 +++------
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +++-------
>   2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 41994b87c76e..bea5bc64bf7b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -344,7 +344,6 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
>   {
>   	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
>   	struct ttm_operation_ctx ctx = { true, false };
> -	u64 initial_bytes_moved, bytes_moved;
>   	uint32_t domain;
>   	int r;
>   
> @@ -374,15 +373,13 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
>   
>   retry:
>   	amdgpu_ttm_placement_from_domain(bo, domain);
> -	initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);
>   	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
> -	bytes_moved = atomic64_read(&adev->num_bytes_moved) -
> -		      initial_bytes_moved;
> -	p->bytes_moved += bytes_moved;
> +
> +	p->bytes_moved += ctx.bytes_moved;
>   	if (adev->mc.visible_vram_size < adev->mc.real_vram_size &&
>   	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&
>   	    bo->tbo.mem.start < adev->mc.visible_vram_size >> PAGE_SHIFT)
> -		p->bytes_moved_vis += bytes_moved;
> +		p->bytes_moved_vis += ctx.bytes_moved;
>   
>   	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
>   		domain = bo->allowed_domains;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 15027f751e07..dc0a8be98043 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -331,7 +331,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
>   	struct amdgpu_bo *bo;
>   	enum ttm_bo_type type;
>   	unsigned long page_align;
> -	u64 initial_bytes_moved, bytes_moved;
>   	size_t acc_size;
>   	int r;
>   
> @@ -406,22 +405,19 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
>   	bo->tbo.bdev = &adev->mman.bdev;
>   	amdgpu_ttm_placement_from_domain(bo, domain);
>   
> -	initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);
> -	/* Kernel allocation are uninterruptible */
>   	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
>   				 &bo->placement, page_align, &ctx, NULL,
>   				 acc_size, sg, resv, &amdgpu_ttm_bo_destroy);
>   	if (unlikely(r != 0))
>   		return r;
>   
> -	bytes_moved = atomic64_read(&adev->num_bytes_moved) -
> -		      initial_bytes_moved;
>   	if (adev->mc.visible_vram_size < adev->mc.real_vram_size &&
>   	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&
>   	    bo->tbo.mem.start < adev->mc.visible_vram_size >> PAGE_SHIFT)
> -		amdgpu_cs_report_moved_bytes(adev, bytes_moved, bytes_moved);
> +		amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved,
> +					     ctx.bytes_moved);
>   	else
> -		amdgpu_cs_report_moved_bytes(adev, bytes_moved, 0);
> +		amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved, 0);
>   
>   	if (kernel)
>   		bo->tbo.priority = 1;
diff mbox

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 41994b87c76e..bea5bc64bf7b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -344,7 +344,6 @@  static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
 {
 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 	struct ttm_operation_ctx ctx = { true, false };
-	u64 initial_bytes_moved, bytes_moved;
 	uint32_t domain;
 	int r;
 
@@ -374,15 +373,13 @@  static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
 
 retry:
 	amdgpu_ttm_placement_from_domain(bo, domain);
-	initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);
 	r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-	bytes_moved = atomic64_read(&adev->num_bytes_moved) -
-		      initial_bytes_moved;
-	p->bytes_moved += bytes_moved;
+
+	p->bytes_moved += ctx.bytes_moved;
 	if (adev->mc.visible_vram_size < adev->mc.real_vram_size &&
 	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&
 	    bo->tbo.mem.start < adev->mc.visible_vram_size >> PAGE_SHIFT)
-		p->bytes_moved_vis += bytes_moved;
+		p->bytes_moved_vis += ctx.bytes_moved;
 
 	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
 		domain = bo->allowed_domains;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 15027f751e07..dc0a8be98043 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -331,7 +331,6 @@  static int amdgpu_bo_do_create(struct amdgpu_device *adev,
 	struct amdgpu_bo *bo;
 	enum ttm_bo_type type;
 	unsigned long page_align;
-	u64 initial_bytes_moved, bytes_moved;
 	size_t acc_size;
 	int r;
 
@@ -406,22 +405,19 @@  static int amdgpu_bo_do_create(struct amdgpu_device *adev,
 	bo->tbo.bdev = &adev->mman.bdev;
 	amdgpu_ttm_placement_from_domain(bo, domain);
 
-	initial_bytes_moved = atomic64_read(&adev->num_bytes_moved);
-	/* Kernel allocation are uninterruptible */
 	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
 				 &bo->placement, page_align, &ctx, NULL,
 				 acc_size, sg, resv, &amdgpu_ttm_bo_destroy);
 	if (unlikely(r != 0))
 		return r;
 
-	bytes_moved = atomic64_read(&adev->num_bytes_moved) -
-		      initial_bytes_moved;
 	if (adev->mc.visible_vram_size < adev->mc.real_vram_size &&
 	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&
 	    bo->tbo.mem.start < adev->mc.visible_vram_size >> PAGE_SHIFT)
-		amdgpu_cs_report_moved_bytes(adev, bytes_moved, bytes_moved);
+		amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved,
+					     ctx.bytes_moved);
 	else
-		amdgpu_cs_report_moved_bytes(adev, bytes_moved, 0);
+		amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved, 0);
 
 	if (kernel)
 		bo->tbo.priority = 1;