[PATCH 1/2] drm/amdgpu: use irq-safe lock for kiq->ring_lock

[PATCH 1/2] drm/amdgpu: use irq-safe lock for kiq->ring_lock

[Pixel Ding]

From: pding <Pixel.Ding@amd.com>

This lock is used during register accessing in SRIOV guest.
The register accessing could happen both in irq enabled and
irq disabled cases. Always use irq-safe lock.

Signed-off-by: pding <Pixel.Ding@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 9a73918..733c64c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -120,18 +120,19 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
 uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 {
 	signed long r;
+	unsigned long flags;
 	uint32_t val, seq;
 	struct amdgpu_kiq *kiq = &adev->gfx.kiq;
 	struct amdgpu_ring *ring = &kiq->ring;
 
 	BUG_ON(!ring->funcs->emit_rreg);
 
-	spin_lock(&kiq->ring_lock);
+	spin_lock_irqsave(&kiq->ring_lock, flags);
 	amdgpu_ring_alloc(ring, 32);
 	amdgpu_ring_emit_rreg(ring, reg);
 	amdgpu_fence_emit_polling(ring, &seq);
 	amdgpu_ring_commit(ring);
-	spin_unlock(&kiq->ring_lock);
+	spin_unlock_irqrestore(&kiq->ring_lock, flags);
 
 	r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
 	if (r < 1) {
@@ -146,18 +147,19 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
 {
 	signed long r;
+	unsigned long flags;
 	uint32_t seq;
 	struct amdgpu_kiq *kiq = &adev->gfx.kiq;
 	struct amdgpu_ring *ring = &kiq->ring;
 
 	BUG_ON(!ring->funcs->emit_wreg);
 
-	spin_lock(&kiq->ring_lock);
+	spin_lock_irqsave(&kiq->ring_lock, flags);
 	amdgpu_ring_alloc(ring, 32);
 	amdgpu_ring_emit_wreg(ring, reg, v);
 	amdgpu_fence_emit_polling(ring, &seq);
 	amdgpu_ring_commit(ring);
-	spin_unlock(&kiq->ring_lock);
+	spin_unlock_irqrestore(&kiq->ring_lock, flags);
 
 	r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
 	if (r < 1)
-- 
2.9.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amdgpu: use irq-safe lock for adev->ring_lru_list_lock

[Pixel Ding]

From: pding <Pixel.Ding@amd.com>

This lock is used during register accessing in SRIOV guest
since KIQ uses general ring submission (amdgpu_ring_commit).
The register accessing could happen both in irq enabled and
irq disabled cases. Always use irq-safe lock.

Signed-off-by: pding <Pixel.Ding@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index e5ece1f..d7997b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -401,11 +401,12 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
 			bool lru_pipe_order, struct amdgpu_ring **ring)
 {
 	struct amdgpu_ring *entry;
+	unsigned long flags;
 
 	/* List is sorted in LRU order, find first entry corresponding
 	 * to the desired HW IP */
 	*ring = NULL;
-	spin_lock(&adev->ring_lru_list_lock);
+	spin_lock_irqsave(&adev->ring_lru_list_lock, flags);
 	list_for_each_entry(entry, &adev->ring_lru_list, lru_list) {
 		if (entry->funcs->type != type)
 			continue;
@@ -430,7 +431,7 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
 	if (*ring)
 		amdgpu_ring_lru_touch_locked(adev, *ring);
 
-	spin_unlock(&adev->ring_lru_list_lock);
+	spin_unlock_irqrestore(&adev->ring_lru_list_lock, flags);
 
 	if (!*ring) {
 		DRM_ERROR("Ring LRU contains no entries for ring type:%d\n", type);
@@ -450,9 +451,11 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
  */
 void amdgpu_ring_lru_touch(struct amdgpu_device *adev, struct amdgpu_ring *ring)
 {
-	spin_lock(&adev->ring_lru_list_lock);
+	unsigned long flags;
+
+	spin_lock_irqsave(&adev->ring_lru_list_lock, flags);
 	amdgpu_ring_lru_touch_locked(adev, ring);
-	spin_unlock(&adev->ring_lru_list_lock);
+	spin_unlock_irqrestore(&adev->ring_lru_list_lock, flags);
 }
 
 /*
-- 
2.9.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu: use irq-safe lock for adev->ring_lru_list_lock

[Christian König]

Am 07.11.2017 um 08:26 schrieb Pixel Ding:
> From: pding <Pixel.Ding@amd.com>
>
> This lock is used during register accessing in SRIOV guest
> since KIQ uses general ring submission (amdgpu_ring_commit).
> The register accessing could happen both in irq enabled and
> irq disabled cases. Always use irq-safe lock.

I would rather completely skip calling amdgpu_ring_lru_touch() for the 
KIQ ring.

That is completely unused in this case anyway and just additional overhead.

Regards,
Christian.

>
> Signed-off-by: pding <Pixel.Ding@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index e5ece1f..d7997b5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -401,11 +401,12 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
>   			bool lru_pipe_order, struct amdgpu_ring **ring)
>   {
>   	struct amdgpu_ring *entry;
> +	unsigned long flags;
>   
>   	/* List is sorted in LRU order, find first entry corresponding
>   	 * to the desired HW IP */
>   	*ring = NULL;
> -	spin_lock(&adev->ring_lru_list_lock);
> +	spin_lock_irqsave(&adev->ring_lru_list_lock, flags);
>   	list_for_each_entry(entry, &adev->ring_lru_list, lru_list) {
>   		if (entry->funcs->type != type)
>   			continue;
> @@ -430,7 +431,7 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
>   	if (*ring)
>   		amdgpu_ring_lru_touch_locked(adev, *ring);
>   
> -	spin_unlock(&adev->ring_lru_list_lock);
> +	spin_unlock_irqrestore(&adev->ring_lru_list_lock, flags);
>   
>   	if (!*ring) {
>   		DRM_ERROR("Ring LRU contains no entries for ring type:%d\n", type);
> @@ -450,9 +451,11 @@ int amdgpu_ring_lru_get(struct amdgpu_device *adev, int type,
>    */
>   void amdgpu_ring_lru_touch(struct amdgpu_device *adev, struct amdgpu_ring *ring)
>   {
> -	spin_lock(&adev->ring_lru_list_lock);
> +	unsigned long flags;
> +
> +	spin_lock_irqsave(&adev->ring_lru_list_lock, flags);
>   	amdgpu_ring_lru_touch_locked(adev, ring);
> -	spin_unlock(&adev->ring_lru_list_lock);
> +	spin_unlock_irqrestore(&adev->ring_lru_list_lock, flags);
>   }
>   
>   /*


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: use irq-safe lock for kiq->ring_lock

[Christian König]

Am 07.11.2017 um 08:26 schrieb Pixel Ding:
> From: pding <Pixel.Ding@amd.com>
>
> This lock is used during register accessing in SRIOV guest.
> The register accessing could happen both in irq enabled and
> irq disabled cases. Always use irq-safe lock.
>
> Signed-off-by: pding <Pixel.Ding@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index 9a73918..733c64c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -120,18 +120,19 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
>   uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
>   {
>   	signed long r;
> +	unsigned long flags;
>   	uint32_t val, seq;
>   	struct amdgpu_kiq *kiq = &adev->gfx.kiq;
>   	struct amdgpu_ring *ring = &kiq->ring;
>   
>   	BUG_ON(!ring->funcs->emit_rreg);
>   
> -	spin_lock(&kiq->ring_lock);
> +	spin_lock_irqsave(&kiq->ring_lock, flags);
>   	amdgpu_ring_alloc(ring, 32);
>   	amdgpu_ring_emit_rreg(ring, reg);
>   	amdgpu_fence_emit_polling(ring, &seq);
>   	amdgpu_ring_commit(ring);
> -	spin_unlock(&kiq->ring_lock);
> +	spin_unlock_irqrestore(&kiq->ring_lock, flags);
>   
>   	r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
>   	if (r < 1) {
> @@ -146,18 +147,19 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
>   void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
>   {
>   	signed long r;
> +	unsigned long flags;
>   	uint32_t seq;
>   	struct amdgpu_kiq *kiq = &adev->gfx.kiq;
>   	struct amdgpu_ring *ring = &kiq->ring;
>   
>   	BUG_ON(!ring->funcs->emit_wreg);
>   
> -	spin_lock(&kiq->ring_lock);
> +	spin_lock_irqsave(&kiq->ring_lock, flags);
>   	amdgpu_ring_alloc(ring, 32);
>   	amdgpu_ring_emit_wreg(ring, reg, v);
>   	amdgpu_fence_emit_polling(ring, &seq);
>   	amdgpu_ring_commit(ring);
> -	spin_unlock(&kiq->ring_lock);
> +	spin_unlock_irqrestore(&kiq->ring_lock, flags);
>   
>   	r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
>   	if (r < 1)


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: use irq-safe lock for kiq->ring_lock

[Grazvydas Ignotas]

On Tue, Nov 7, 2017 at 9:26 AM, Pixel Ding <Pixel.Ding@amd.com> wrote:
> From: pding <Pixel.Ding@amd.com>
>
> ...
>
> Signed-off-by: pding <Pixel.Ding@amd.com>

You need to fix your git config user.name.


Gražvydas
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx