Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread StDenis, Tom 
Ok no worries I'll fix it up and push it later today.

Btw I didn't use an inline cast because the macro kept breaking. I tried 
variants of parentheses and nothing worked Odd...


Thanks,
Tom

On June 17, 2019 3:32:03 PM EDT, "Kuehling, Felix"  
wrote:

On 2019-06-17 3:28 p.m., Christian König wrote:
Am 17.06.19 um 21:15 schrieb Kuehling, Felix:
 Looks good to me. One cosmetic comment inline. With that fixed this
 patch is Reviewed-by:  Felix Kuehling 

 On 2019-06-14 12:51 p.m., StDenis, Tom wrote:
 On 32-bit hosts mem->num_pages is 32-bits and can overflow
 when shifted.  Add a cast to avoid this.

 Signed-off-by: Tom St Denis 

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)

 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
 b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
 index c963ad86072e..31895d3c33de 100644
 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
 @@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct
 ttm_mem_type_manager *man,
uint64_t vis_usage = 0;
unsigned i;
int r;
 +uint64_t mem_bytes;
Christian likes the "upside-down christmas tree" to help readability of
local variable declarations.

 Ah, yeah. Thanks for the note.

 I actually don't care about that much, but I always get rejects from
 upstream subsystem maintainers if I don't do this.

 It's most likely not even documented somewhere,

Right. The fact that I even noticed it probably means that I have a mild
case of OCD myself. If it was a strict requirement, it should be caught
by checkpatch.pl.

Cheers,
   Felix


 Christian.



  lpfn = place->lpfn;
   if (!lpfn)
   lpfn = man->size;
  /* bail out quickly if there's likely not enough VRAM for
this BO */
-if (atomic64_add_return(mem->num_pages << PAGE_SHIFT,
>usage) > adev->gmc.mc_vram_size) {
-atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
+if (atomic64_add_return(mem_bytes, >usage) >
adev->gmc.mc_vram_size) {
+atomic64_sub(mem_bytes, >usage);
   mem->mm_node = NULL;
   return 0;
   }
@@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct
ttm_mem_type_manager *man,
   nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
  GFP_KERNEL | __GFP_ZERO);
   if (!nodes) {
-atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+atomic64_sub(mem_bytes, >usage);
   return -ENOMEM;
   }

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

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

Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread Kuehling, Felix 
On 2019-06-17 3:28 p.m., Christian König wrote:
> Am 17.06.19 um 21:15 schrieb Kuehling, Felix:
>> Looks good to me. One cosmetic comment inline. With that fixed this
>> patch is Reviewed-by:  Felix Kuehling 
>>
>> On 2019-06-14 12:51 p.m., StDenis, Tom wrote:
>>> On 32-bit hosts mem->num_pages is 32-bits and can overflow
>>> when shifted.  Add a cast to avoid this.
>>>
>>> Signed-off-by: Tom St Denis 
>>> ---
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
>>>    1 file changed, 5 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>>> index c963ad86072e..31895d3c33de 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>>> @@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct 
>>> ttm_mem_type_manager *man,
>>>    uint64_t vis_usage = 0;
>>>    unsigned i;
>>>    int r;
>>> +    uint64_t mem_bytes;
>> Christian likes the "upside-down christmas tree" to help readability of
>> local variable declarations.
>
> Ah, yeah. Thanks for the note.
>
> I actually don't care about that much, but I always get rejects from 
> upstream subsystem maintainers if I don't do this.
>
> It's most likely not even documented somewhere,

Right. The fact that I even noticed it probably means that I have a mild 
case of OCD myself. If it was a strict requirement, it should be caught 
by checkpatch.pl.

Cheers,
   Felix


> Christian.
>
>>
>>
>>>       lpfn = place->lpfn;
>>>    if (!lpfn)
>>>    lpfn = man->size;
>>>       /* bail out quickly if there's likely not enough VRAM for 
>>> this BO */
>>> -    if (atomic64_add_return(mem->num_pages << PAGE_SHIFT, 
>>> >usage) > adev->gmc.mc_vram_size) {
>>> -    atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
>>> +    mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
>>> +    if (atomic64_add_return(mem_bytes, >usage) > 
>>> adev->gmc.mc_vram_size) {
>>> +    atomic64_sub(mem_bytes, >usage);
>>>    mem->mm_node = NULL;
>>>    return 0;
>>>    }
>>> @@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct 
>>> ttm_mem_type_manager *man,
>>>    nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
>>>   GFP_KERNEL | __GFP_ZERO);
>>>    if (!nodes) {
>>> -    atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
>>> +    atomic64_sub(mem_bytes, >usage);
>>>    return -ENOMEM;
>>>    }
>> ___
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread Christian König 

Am 17.06.19 um 21:15 schrieb Kuehling, Felix:

Looks good to me. One cosmetic comment inline. With that fixed this
patch is Reviewed-by:  Felix Kuehling 

On 2019-06-14 12:51 p.m., StDenis, Tom wrote:

On 32-bit hosts mem->num_pages is 32-bits and can overflow
when shifted.  Add a cast to avoid this.

Signed-off-by: Tom St Denis 
---
   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
   1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index c963ad86072e..31895d3c33de 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct 
ttm_mem_type_manager *man,
uint64_t vis_usage = 0;
unsigned i;
int r;
+   uint64_t mem_bytes;

Christian likes the "upside-down christmas tree" to help readability of
local variable declarations.


Ah, yeah. Thanks for the note.

I actually don't care about that much, but I always get rejects from 
upstream subsystem maintainers if I don't do this.


It's most likely not even documented somewhere,
Christian.




   
   	lpfn = place->lpfn;

if (!lpfn)
lpfn = man->size;
   
   	/* bail out quickly if there's likely not enough VRAM for this BO */

-   if (atomic64_add_return(mem->num_pages << PAGE_SHIFT, >usage) > 
adev->gmc.mc_vram_size) {
-   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+   mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
+   if (atomic64_add_return(mem_bytes, >usage) > 
adev->gmc.mc_vram_size) {
+   atomic64_sub(mem_bytes, >usage);
mem->mm_node = NULL;
return 0;
}
@@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager 
*man,
nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
   GFP_KERNEL | __GFP_ZERO);
if (!nodes) {
-   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+   atomic64_sub(mem_bytes, >usage);
return -ENOMEM;
}
   

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


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

Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread Christian König 

Reviewed-by: Christian König 

Am 17.06.19 um 20:21 schrieb Tom St Denis:

ping?

On Fri, Jun 14, 2019 at 12:51 PM StDenis, Tom > wrote:


On 32-bit hosts mem->num_pages is 32-bits and can overflow
when shifted.  Add a cast to avoid this.

Signed-off-by: Tom St Denis mailto:tom.stde...@amd.com>>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index c963ad86072e..31895d3c33de 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct
ttm_mem_type_manager *man,
        uint64_t vis_usage = 0;
        unsigned i;
        int r;
+       uint64_t mem_bytes;

        lpfn = place->lpfn;
        if (!lpfn)
                lpfn = man->size;

        /* bail out quickly if there's likely not enough VRAM for
this BO */
-       if (atomic64_add_return(mem->num_pages << PAGE_SHIFT,
>usage) > adev->gmc.mc_vram_size) {
-               atomic64_sub(mem->num_pages << PAGE_SHIFT,
>usage);
+       mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
+       if (atomic64_add_return(mem_bytes, >usage) >
adev->gmc.mc_vram_size) {
+               atomic64_sub(mem_bytes, >usage);
                mem->mm_node = NULL;
                return 0;
        }
@@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct
ttm_mem_type_manager *man,
        nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
                               GFP_KERNEL | __GFP_ZERO);
        if (!nodes) {
-               atomic64_sub(mem->num_pages << PAGE_SHIFT,
>usage);
+               atomic64_sub(mem_bytes, >usage);
                return -ENOMEM;
        }

-- 
2.21.0


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


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


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

Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread Kuehling, Felix 
Looks good to me. One cosmetic comment inline. With that fixed this 
patch is Reviewed-by:  Felix Kuehling 

On 2019-06-14 12:51 p.m., StDenis, Tom wrote:
> On 32-bit hosts mem->num_pages is 32-bits and can overflow
> when shifted.  Add a cast to avoid this.
>
> Signed-off-by: Tom St Denis 
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index c963ad86072e..31895d3c33de 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct 
> ttm_mem_type_manager *man,
>   uint64_t vis_usage = 0;
>   unsigned i;
>   int r;
> + uint64_t mem_bytes;

Christian likes the "upside-down christmas tree" to help readability of 
local variable declarations.


>   
>   lpfn = place->lpfn;
>   if (!lpfn)
>   lpfn = man->size;
>   
>   /* bail out quickly if there's likely not enough VRAM for this BO */
> - if (atomic64_add_return(mem->num_pages << PAGE_SHIFT, >usage) > 
> adev->gmc.mc_vram_size) {
> - atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
> + mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
> + if (atomic64_add_return(mem_bytes, >usage) > 
> adev->gmc.mc_vram_size) {
> + atomic64_sub(mem_bytes, >usage);
>   mem->mm_node = NULL;
>   return 0;
>   }
> @@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct 
> ttm_mem_type_manager *man,
>   nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
>  GFP_KERNEL | __GFP_ZERO);
>   if (!nodes) {
> - atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
> + atomic64_sub(mem_bytes, >usage);
>   return -ENOMEM;
>   }
>   
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-17 Thread Tom St Denis 
ping?

On Fri, Jun 14, 2019 at 12:51 PM StDenis, Tom  wrote:

> On 32-bit hosts mem->num_pages is 32-bits and can overflow
> when shifted.  Add a cast to avoid this.
>
> Signed-off-by: Tom St Denis 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index c963ad86072e..31895d3c33de 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct
> ttm_mem_type_manager *man,
> uint64_t vis_usage = 0;
> unsigned i;
> int r;
> +   uint64_t mem_bytes;
>
> lpfn = place->lpfn;
> if (!lpfn)
> lpfn = man->size;
>
> /* bail out quickly if there's likely not enough VRAM for this BO
> */
> -   if (atomic64_add_return(mem->num_pages << PAGE_SHIFT, >usage)
> > adev->gmc.mc_vram_size) {
> -   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
> +   mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
> +   if (atomic64_add_return(mem_bytes, >usage) >
> adev->gmc.mc_vram_size) {
> +   atomic64_sub(mem_bytes, >usage);
> mem->mm_node = NULL;
> return 0;
> }
> @@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct
> ttm_mem_type_manager *man,
> nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
>GFP_KERNEL | __GFP_ZERO);
> if (!nodes) {
> -   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
> +   atomic64_sub(mem_bytes, >usage);
> return -ENOMEM;
> }
>
> --
> 2.21.0
>
> ___
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] drm/amd/amdgpu: cast mem->num_pages to 64-bits when shifting

2019-06-14 Thread StDenis, Tom 
On 32-bit hosts mem->num_pages is 32-bits and can overflow
when shifted.  Add a cast to avoid this.

Signed-off-by: Tom St Denis 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index c963ad86072e..31895d3c33de 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -279,14 +279,16 @@ static int amdgpu_vram_mgr_new(struct 
ttm_mem_type_manager *man,
uint64_t vis_usage = 0;
unsigned i;
int r;
+   uint64_t mem_bytes;
 
lpfn = place->lpfn;
if (!lpfn)
lpfn = man->size;
 
/* bail out quickly if there's likely not enough VRAM for this BO */
-   if (atomic64_add_return(mem->num_pages << PAGE_SHIFT, >usage) > 
adev->gmc.mc_vram_size) {
-   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+   mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
+   if (atomic64_add_return(mem_bytes, >usage) > 
adev->gmc.mc_vram_size) {
+   atomic64_sub(mem_bytes, >usage);
mem->mm_node = NULL;
return 0;
}
@@ -308,7 +310,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager 
*man,
nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
   GFP_KERNEL | __GFP_ZERO);
if (!nodes) {
-   atomic64_sub(mem->num_pages << PAGE_SHIFT, >usage);
+   atomic64_sub(mem_bytes, >usage);
return -ENOMEM;
}
 
-- 
2.21.0

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