* [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-28 16:45 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-28 16:45 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: Christophe JAILLET, kernel-janitors, dri-devel, amd-gfx, linux-kernel
'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
code, improve the semantic and avoid some open-coded arithmetic in
allocator arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
consistency.
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index e1294fba0c26..c5a0ce44a295 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -1252,8 +1252,6 @@ int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
unsigned int chunk_size)
{
- unsigned int num_of_longs;
-
if (WARN_ON(buf_size < chunk_size))
return -EINVAL;
if (WARN_ON(buf_size == 0))
@@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
kfd->gtt_sa_chunk_size = chunk_size;
kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
- num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
- BITS_PER_LONG;
-
- kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long), GFP_KERNEL);
-
+ kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
+ GFP_KERNEL);
if (!kfd->gtt_sa_bitmap)
return -ENOMEM;
@@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
mutex_init(&kfd->gtt_sa_lock);
return 0;
-
}
static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
{
mutex_destroy(&kfd->gtt_sa_lock);
- kfree(kfd->gtt_sa_bitmap);
+ bitmap_free(kfd->gtt_sa_bitmap);
}
static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-28 16:45 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-28 16:45 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors, Christophe JAILLET
'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
code, improve the semantic and avoid some open-coded arithmetic in
allocator arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
consistency.
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index e1294fba0c26..c5a0ce44a295 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -1252,8 +1252,6 @@ int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
unsigned int chunk_size)
{
- unsigned int num_of_longs;
-
if (WARN_ON(buf_size < chunk_size))
return -EINVAL;
if (WARN_ON(buf_size == 0))
@@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
kfd->gtt_sa_chunk_size = chunk_size;
kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
- num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
- BITS_PER_LONG;
-
- kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long), GFP_KERNEL);
-
+ kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
+ GFP_KERNEL);
if (!kfd->gtt_sa_bitmap)
return -ENOMEM;
@@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
mutex_init(&kfd->gtt_sa_lock);
return 0;
-
}
static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
{
mutex_destroy(&kfd->gtt_sa_lock);
- kfree(kfd->gtt_sa_bitmap);
+ bitmap_free(kfd->gtt_sa_bitmap);
}
static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/2] drm/amdkfd: Use non-atomic bitmap functions when possible
2021-11-28 16:45 ` Christophe JAILLET
@ 2021-11-28 16:46 ` Christophe JAILLET
-1 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-28 16:46 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: Christophe JAILLET, kernel-janitors, dri-devel, amd-gfx, linux-kernel
All uses of the 'kfd->gtt_sa_bitmap' bitmap are protected with the
'kfd->gtt_sa_lock' mutex.
So:
- prefer the non-atomic '__set_bit()' function
- use the non-atomic 'bitmap_[set|clear]()' functions instead of
equivalent 'for' loops. These functions can work on several bits at a
time
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index c5a0ce44a295..c4d868a5dd97 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -1346,7 +1346,7 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
/* If we need only one chunk, mark it as allocated and get out */
if (size <= kfd->gtt_sa_chunk_size) {
pr_debug("Single bit\n");
- set_bit(found, kfd->gtt_sa_bitmap);
+ __set_bit(found, kfd->gtt_sa_bitmap);
goto kfd_gtt_out;
}
@@ -1384,10 +1384,8 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
(*mem_obj)->range_start, (*mem_obj)->range_end);
/* Mark the chunks as allocated */
- for (found = (*mem_obj)->range_start;
- found <= (*mem_obj)->range_end;
- found++)
- set_bit(found, kfd->gtt_sa_bitmap);
+ bitmap_set(kfd->gtt_sa_bitmap, (*mem_obj)->range_start,
+ (*mem_obj)->range_end - (*mem_obj)->range_start + 1);
kfd_gtt_out:
mutex_unlock(&kfd->gtt_sa_lock);
@@ -1402,8 +1400,6 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
int kfd_gtt_sa_free(struct kfd_dev *kfd, struct kfd_mem_obj *mem_obj)
{
- unsigned int bit;
-
/* Act like kfree when trying to free a NULL object */
if (!mem_obj)
return 0;
@@ -1414,10 +1410,8 @@ int kfd_gtt_sa_free(struct kfd_dev *kfd, struct kfd_mem_obj *mem_obj)
mutex_lock(&kfd->gtt_sa_lock);
/* Mark the chunks as free */
- for (bit = mem_obj->range_start;
- bit <= mem_obj->range_end;
- bit++)
- clear_bit(bit, kfd->gtt_sa_bitmap);
+ bitmap_clear(kfd->gtt_sa_bitmap, mem_obj->range_start,
+ mem_obj->range_end - mem_obj->range_start + 1);
mutex_unlock(&kfd->gtt_sa_lock);
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/2] drm/amdkfd: Use non-atomic bitmap functions when possible
@ 2021-11-28 16:46 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-28 16:46 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors, Christophe JAILLET
All uses of the 'kfd->gtt_sa_bitmap' bitmap are protected with the
'kfd->gtt_sa_lock' mutex.
So:
- prefer the non-atomic '__set_bit()' function
- use the non-atomic 'bitmap_[set|clear]()' functions instead of
equivalent 'for' loops. These functions can work on several bits at a
time
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index c5a0ce44a295..c4d868a5dd97 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -1346,7 +1346,7 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
/* If we need only one chunk, mark it as allocated and get out */
if (size <= kfd->gtt_sa_chunk_size) {
pr_debug("Single bit\n");
- set_bit(found, kfd->gtt_sa_bitmap);
+ __set_bit(found, kfd->gtt_sa_bitmap);
goto kfd_gtt_out;
}
@@ -1384,10 +1384,8 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
(*mem_obj)->range_start, (*mem_obj)->range_end);
/* Mark the chunks as allocated */
- for (found = (*mem_obj)->range_start;
- found <= (*mem_obj)->range_end;
- found++)
- set_bit(found, kfd->gtt_sa_bitmap);
+ bitmap_set(kfd->gtt_sa_bitmap, (*mem_obj)->range_start,
+ (*mem_obj)->range_end - (*mem_obj)->range_start + 1);
kfd_gtt_out:
mutex_unlock(&kfd->gtt_sa_lock);
@@ -1402,8 +1400,6 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
int kfd_gtt_sa_free(struct kfd_dev *kfd, struct kfd_mem_obj *mem_obj)
{
- unsigned int bit;
-
/* Act like kfree when trying to free a NULL object */
if (!mem_obj)
return 0;
@@ -1414,10 +1410,8 @@ int kfd_gtt_sa_free(struct kfd_dev *kfd, struct kfd_mem_obj *mem_obj)
mutex_lock(&kfd->gtt_sa_lock);
/* Mark the chunks as free */
- for (bit = mem_obj->range_start;
- bit <= mem_obj->range_end;
- bit++)
- clear_bit(bit, kfd->gtt_sa_bitmap);
+ bitmap_clear(kfd->gtt_sa_bitmap, mem_obj->range_start,
+ mem_obj->range_end - mem_obj->range_start + 1);
mutex_unlock(&kfd->gtt_sa_lock);
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
2021-11-28 16:45 ` Christophe JAILLET
@ 2022-04-26 18:01 ` Felix Kuehling
-1 siblings, 0 replies; 16+ messages in thread
From: Felix Kuehling @ 2022-04-26 18:01 UTC (permalink / raw)
To: Christophe JAILLET, alexander.deucher, christian.koenig,
Xinhui.Pan, airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors
Hi Christophe,
I just stumbled over this patch series while cleaning up my inbox. Sorry
for dropping it back in November. I'm about to apply it but I noticed
that patch 1 is missing a Signed-off-by. Is it OK to add that in your name?
Thanks,
Felix
Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
> code, improve the semantic and avoid some open-coded arithmetic in
> allocator arguments.
>
> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
> consistency.
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index e1294fba0c26..c5a0ce44a295 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -1252,8 +1252,6 @@ int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> unsigned int chunk_size)
> {
> - unsigned int num_of_longs;
> -
> if (WARN_ON(buf_size < chunk_size))
> return -EINVAL;
> if (WARN_ON(buf_size == 0))
> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> kfd->gtt_sa_chunk_size = chunk_size;
> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>
> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
> - BITS_PER_LONG;
> -
> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long), GFP_KERNEL);
> -
> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
> + GFP_KERNEL);
> if (!kfd->gtt_sa_bitmap)
> return -ENOMEM;
>
> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> mutex_init(&kfd->gtt_sa_lock);
>
> return 0;
> -
> }
>
> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
> {
> mutex_destroy(&kfd->gtt_sa_lock);
> - kfree(kfd->gtt_sa_bitmap);
> + bitmap_free(kfd->gtt_sa_bitmap);
> }
>
> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2022-04-26 18:01 ` Felix Kuehling
0 siblings, 0 replies; 16+ messages in thread
From: Felix Kuehling @ 2022-04-26 18:01 UTC (permalink / raw)
To: Christophe JAILLET, alexander.deucher, christian.koenig,
Xinhui.Pan, airlied, daniel
Cc: kernel-janitors, dri-devel, amd-gfx, linux-kernel
Hi Christophe,
I just stumbled over this patch series while cleaning up my inbox. Sorry
for dropping it back in November. I'm about to apply it but I noticed
that patch 1 is missing a Signed-off-by. Is it OK to add that in your name?
Thanks,
Felix
Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
> code, improve the semantic and avoid some open-coded arithmetic in
> allocator arguments.
>
> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
> consistency.
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index e1294fba0c26..c5a0ce44a295 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -1252,8 +1252,6 @@ int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> unsigned int chunk_size)
> {
> - unsigned int num_of_longs;
> -
> if (WARN_ON(buf_size < chunk_size))
> return -EINVAL;
> if (WARN_ON(buf_size == 0))
> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> kfd->gtt_sa_chunk_size = chunk_size;
> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>
> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
> - BITS_PER_LONG;
> -
> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long), GFP_KERNEL);
> -
> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
> + GFP_KERNEL);
> if (!kfd->gtt_sa_bitmap)
> return -ENOMEM;
>
> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> mutex_init(&kfd->gtt_sa_lock);
>
> return 0;
> -
> }
>
> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
> {
> mutex_destroy(&kfd->gtt_sa_lock);
> - kfree(kfd->gtt_sa_bitmap);
> + bitmap_free(kfd->gtt_sa_bitmap);
> }
>
> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2022-04-26 18:47 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2022-04-26 18:47 UTC (permalink / raw)
To: Felix Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors
Le 26/04/2022 à 20:01, Felix Kuehling a écrit :
> Hi Christophe,
>
> I just stumbled over this patch series while cleaning up my inbox. Sorry
> for dropping it back in November. I'm about to apply it but I noticed
> that patch 1 is missing a Signed-off-by. Is it OK to add that in your name?
Hi,
No problem for me if you can add it. Thanks.
But if you prefer a v2, it is also fine for me.
BTW sorry for missing the SoB tag. This definitively means that I forgot
the checkpatch.pl step for this patch, which is bad.
CJ
>
> Thanks,
> Felix
>
>
> Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
>> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
>> code, improve the semantic and avoid some open-coded arithmetic in
>> allocator arguments.
>>
>> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
>> consistency.
>> ---
>> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> index e1294fba0c26..c5a0ce44a295 100644
>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> @@ -1252,8 +1252,6 @@ int
>> kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
>> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
>> unsigned int chunk_size)
>> {
>> - unsigned int num_of_longs;
>> -
>> if (WARN_ON(buf_size < chunk_size))
>> return -EINVAL;
>> if (WARN_ON(buf_size == 0))
>> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd,
>> unsigned int buf_size,
>> kfd->gtt_sa_chunk_size = chunk_size;
>> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
>> - BITS_PER_LONG;
>> -
>> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long),
>> GFP_KERNEL);
>> -
>> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
>> + GFP_KERNEL);
>> if (!kfd->gtt_sa_bitmap)
>> return -ENOMEM;
>> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev
>> *kfd, unsigned int buf_size,
>> mutex_init(&kfd->gtt_sa_lock);
>> return 0;
>> -
>> }
>> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
>> {
>> mutex_destroy(&kfd->gtt_sa_lock);
>> - kfree(kfd->gtt_sa_bitmap);
>> + bitmap_free(kfd->gtt_sa_bitmap);
>> }
>> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2022-04-26 18:47 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2022-04-26 18:47 UTC (permalink / raw)
To: kernel-janitors; +Cc: amd-gfx, dri-devel, linux-kernel
Le 26/04/2022 à 20:01, Felix Kuehling a écrit :
> Hi Christophe,
>
> I just stumbled over this patch series while cleaning up my inbox. Sorry
> for dropping it back in November. I'm about to apply it but I noticed
> that patch 1 is missing a Signed-off-by. Is it OK to add that in your name?
Hi,
No problem for me if you can add it. Thanks.
But if you prefer a v2, it is also fine for me.
BTW sorry for missing the SoB tag. This definitively means that I forgot
the checkpatch.pl step for this patch, which is bad.
CJ
>
> Thanks,
> Felix
>
>
> Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
>> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
>> code, improve the semantic and avoid some open-coded arithmetic in
>> allocator arguments.
>>
>> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
>> consistency.
>> ---
>> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> index e1294fba0c26..c5a0ce44a295 100644
>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> @@ -1252,8 +1252,6 @@ int
>> kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
>> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
>> unsigned int chunk_size)
>> {
>> - unsigned int num_of_longs;
>> -
>> if (WARN_ON(buf_size < chunk_size))
>> return -EINVAL;
>> if (WARN_ON(buf_size == 0))
>> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd,
>> unsigned int buf_size,
>> kfd->gtt_sa_chunk_size = chunk_size;
>> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
>> - BITS_PER_LONG;
>> -
>> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long),
>> GFP_KERNEL);
>> -
>> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
>> + GFP_KERNEL);
>> if (!kfd->gtt_sa_bitmap)
>> return -ENOMEM;
>> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev
>> *kfd, unsigned int buf_size,
>> mutex_init(&kfd->gtt_sa_lock);
>> return 0;
>> -
>> }
>> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
>> {
>> mutex_destroy(&kfd->gtt_sa_lock);
>> - kfree(kfd->gtt_sa_bitmap);
>> + bitmap_free(kfd->gtt_sa_bitmap);
>> }
>> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2022-04-26 18:47 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2022-04-26 18:47 UTC (permalink / raw)
To: Felix Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: kernel-janitors, dri-devel, amd-gfx, linux-kernel
Le 26/04/2022 à 20:01, Felix Kuehling a écrit :
> Hi Christophe,
>
> I just stumbled over this patch series while cleaning up my inbox. Sorry
> for dropping it back in November. I'm about to apply it but I noticed
> that patch 1 is missing a Signed-off-by. Is it OK to add that in your name?
Hi,
No problem for me if you can add it. Thanks.
But if you prefer a v2, it is also fine for me.
BTW sorry for missing the SoB tag. This definitively means that I forgot
the checkpatch.pl step for this patch, which is bad.
CJ
>
> Thanks,
> Felix
>
>
> Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
>> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
>> code, improve the semantic and avoid some open-coded arithmetic in
>> allocator arguments.
>>
>> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
>> consistency.
>> ---
>> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> index e1294fba0c26..c5a0ce44a295 100644
>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>> @@ -1252,8 +1252,6 @@ int
>> kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
>> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
>> unsigned int chunk_size)
>> {
>> - unsigned int num_of_longs;
>> -
>> if (WARN_ON(buf_size < chunk_size))
>> return -EINVAL;
>> if (WARN_ON(buf_size == 0))
>> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd,
>> unsigned int buf_size,
>> kfd->gtt_sa_chunk_size = chunk_size;
>> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
>> - BITS_PER_LONG;
>> -
>> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long),
>> GFP_KERNEL);
>> -
>> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
>> + GFP_KERNEL);
>> if (!kfd->gtt_sa_bitmap)
>> return -ENOMEM;
>> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev
>> *kfd, unsigned int buf_size,
>> mutex_init(&kfd->gtt_sa_lock);
>> return 0;
>> -
>> }
>> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
>> {
>> mutex_destroy(&kfd->gtt_sa_lock);
>> - kfree(kfd->gtt_sa_bitmap);
>> + bitmap_free(kfd->gtt_sa_bitmap);
>> }
>> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
2022-04-26 18:47 ` Christophe JAILLET
@ 2022-04-26 20:54 ` Felix Kuehling
-1 siblings, 0 replies; 16+ messages in thread
From: Felix Kuehling @ 2022-04-26 20:54 UTC (permalink / raw)
To: Christophe JAILLET, alexander.deucher, christian.koenig,
Xinhui.Pan, airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors
Am 2022-04-26 um 14:47 schrieb Christophe JAILLET:
> Le 26/04/2022 à 20:01, Felix Kuehling a écrit :
>> Hi Christophe,
>>
>> I just stumbled over this patch series while cleaning up my inbox.
>> Sorry for dropping it back in November. I'm about to apply it but I
>> noticed that patch 1 is missing a Signed-off-by. Is it OK to add that
>> in your name?
>
> Hi,
>
> No problem for me if you can add it. Thanks.
> But if you prefer a v2, it is also fine for me.
No need. I submitted the patches to amd-staging-drm-next.
Regards,
Felix
>
> BTW sorry for missing the SoB tag. This definitively means that I
> forgot the checkpatch.pl step for this patch, which is bad.
>
> CJ
>
>>
>> Thanks,
>> Felix
>>
>>
>> Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
>>> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
>>> code, improve the semantic and avoid some open-coded arithmetic in
>>> allocator arguments.
>>>
>>> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
>>> consistency.
>>> ---
>>> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
>>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> index e1294fba0c26..c5a0ce44a295 100644
>>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> @@ -1252,8 +1252,6 @@ int
>>> kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
>>> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int
>>> buf_size,
>>> unsigned int chunk_size)
>>> {
>>> - unsigned int num_of_longs;
>>> -
>>> if (WARN_ON(buf_size < chunk_size))
>>> return -EINVAL;
>>> if (WARN_ON(buf_size == 0))
>>> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev
>>> *kfd, unsigned int buf_size,
>>> kfd->gtt_sa_chunk_size = chunk_size;
>>> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>>> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
>>> - BITS_PER_LONG;
>>> -
>>> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long),
>>> GFP_KERNEL);
>>> -
>>> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
>>> + GFP_KERNEL);
>>> if (!kfd->gtt_sa_bitmap)
>>> return -ENOMEM;
>>> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev
>>> *kfd, unsigned int buf_size,
>>> mutex_init(&kfd->gtt_sa_lock);
>>> return 0;
>>> -
>>> }
>>> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
>>> {
>>> mutex_destroy(&kfd->gtt_sa_lock);
>>> - kfree(kfd->gtt_sa_bitmap);
>>> + bitmap_free(kfd->gtt_sa_bitmap);
>>> }
>>> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
>>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2022-04-26 20:54 ` Felix Kuehling
0 siblings, 0 replies; 16+ messages in thread
From: Felix Kuehling @ 2022-04-26 20:54 UTC (permalink / raw)
To: Christophe JAILLET, alexander.deucher, christian.koenig,
Xinhui.Pan, airlied, daniel
Cc: kernel-janitors, dri-devel, amd-gfx, linux-kernel
Am 2022-04-26 um 14:47 schrieb Christophe JAILLET:
> Le 26/04/2022 à 20:01, Felix Kuehling a écrit :
>> Hi Christophe,
>>
>> I just stumbled over this patch series while cleaning up my inbox.
>> Sorry for dropping it back in November. I'm about to apply it but I
>> noticed that patch 1 is missing a Signed-off-by. Is it OK to add that
>> in your name?
>
> Hi,
>
> No problem for me if you can add it. Thanks.
> But if you prefer a v2, it is also fine for me.
No need. I submitted the patches to amd-staging-drm-next.
Regards,
Felix
>
> BTW sorry for missing the SoB tag. This definitively means that I
> forgot the checkpatch.pl step for this patch, which is bad.
>
> CJ
>
>>
>> Thanks,
>> Felix
>>
>>
>> Am 2021-11-28 um 11:45 schrieb Christophe JAILLET:
>>> 'kfd->gtt_sa_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify
>>> code, improve the semantic and avoid some open-coded arithmetic in
>>> allocator arguments.
>>>
>>> Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
>>> consistency.
>>> ---
>>> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +++---------
>>> 1 file changed, 3 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> index e1294fba0c26..c5a0ce44a295 100644
>>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
>>> @@ -1252,8 +1252,6 @@ int
>>> kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
>>> static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int
>>> buf_size,
>>> unsigned int chunk_size)
>>> {
>>> - unsigned int num_of_longs;
>>> -
>>> if (WARN_ON(buf_size < chunk_size))
>>> return -EINVAL;
>>> if (WARN_ON(buf_size == 0))
>>> @@ -1264,11 +1262,8 @@ static int kfd_gtt_sa_init(struct kfd_dev
>>> *kfd, unsigned int buf_size,
>>> kfd->gtt_sa_chunk_size = chunk_size;
>>> kfd->gtt_sa_num_of_chunks = buf_size / chunk_size;
>>> - num_of_longs = (kfd->gtt_sa_num_of_chunks + BITS_PER_LONG - 1) /
>>> - BITS_PER_LONG;
>>> -
>>> - kfd->gtt_sa_bitmap = kcalloc(num_of_longs, sizeof(long),
>>> GFP_KERNEL);
>>> -
>>> + kfd->gtt_sa_bitmap = bitmap_zalloc(kfd->gtt_sa_num_of_chunks,
>>> + GFP_KERNEL);
>>> if (!kfd->gtt_sa_bitmap)
>>> return -ENOMEM;
>>> @@ -1278,13 +1273,12 @@ static int kfd_gtt_sa_init(struct kfd_dev
>>> *kfd, unsigned int buf_size,
>>> mutex_init(&kfd->gtt_sa_lock);
>>> return 0;
>>> -
>>> }
>>> static void kfd_gtt_sa_fini(struct kfd_dev *kfd)
>>> {
>>> mutex_destroy(&kfd->gtt_sa_lock);
>>> - kfree(kfd->gtt_sa_bitmap);
>>> + bitmap_free(kfd->gtt_sa_bitmap);
>>> }
>>> static inline uint64_t kfd_gtt_sa_calc_gpu_addr(uint64_t start_addr,
>>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
2021-11-21 17:41 ` Christophe JAILLET
(?)
@ 2021-11-22 22:10 ` kernel test robot
-1 siblings, 0 replies; 16+ messages in thread
From: kernel test robot @ 2021-11-22 22:10 UTC (permalink / raw)
To: Christophe JAILLET, Felix.Kuehling, alexander.deucher,
christian.koenig, Xinhui.Pan, airlied, daniel
Cc: llvm, kbuild-all, Christophe JAILLET, kernel-janitors, dri-devel,
amd-gfx
[-- Attachment #1: Type: text/plain, Size: 3269 bytes --]
Hi Christophe,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v5.16-rc2 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
base: git://anongit.freedesktop.org/drm/drm drm-next
config: x86_64-randconfig-a015-20211121 (attached as .config)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0f65744094ce515a9dfe6b5e655ad59861eca35b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
git checkout 0f65744094ce515a9dfe6b5e655ad59861eca35b
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:1438:11: error: called object type 'int' is not a function or function pointer
GFP_KERNEL);
^
include/linux/gfp.h:324:20: note: expanded from macro 'GFP_KERNEL'
#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
^
1 error generated.
vim +/int +1438 drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c
1426
1427 static int init_doorbell_bitmap(struct qcm_process_device *qpd,
1428 struct kfd_dev *dev)
1429 {
1430 unsigned int i;
1431 int range_start = dev->shared_resources.non_cp_doorbells_start;
1432 int range_end = dev->shared_resources.non_cp_doorbells_end;
1433
1434 if (!KFD_IS_SOC15(dev->device_info->asic_family))
1435 return 0;
1436
1437 qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS
> 1438 GFP_KERNEL);
1439 if (!qpd->doorbell_bitmap)
1440 return -ENOMEM;
1441
1442 /* Mask out doorbells reserved for SDMA, IH, and VCN on SOC15. */
1443 pr_debug("reserved doorbell 0x%03x - 0x%03x\n", range_start, range_end);
1444 pr_debug("reserved doorbell 0x%03x - 0x%03x\n",
1445 range_start + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1446 range_end + KFD_QUEUE_DOORBELL_MIRROR_OFFSET);
1447
1448 for (i = 0; i < KFD_MAX_NUM_OF_QUEUES_PER_PROCESS / 2; i++) {
1449 if (i >= range_start && i <= range_end) {
1450 set_bit(i, qpd->doorbell_bitmap);
1451 set_bit(i + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1452 qpd->doorbell_bitmap);
1453 }
1454 }
1455
1456 return 0;
1457 }
1458
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 36177 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-22 22:10 ` kernel test robot
0 siblings, 0 replies; 16+ messages in thread
From: kernel test robot @ 2021-11-22 22:10 UTC (permalink / raw)
To: Christophe JAILLET, Felix.Kuehling, alexander.deucher,
christian.koenig, Xinhui.Pan, airlied, daniel
Cc: kbuild-all, llvm, kernel-janitors, amd-gfx, Christophe JAILLET,
dri-devel
[-- Attachment #1: Type: text/plain, Size: 3269 bytes --]
Hi Christophe,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v5.16-rc2 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
base: git://anongit.freedesktop.org/drm/drm drm-next
config: x86_64-randconfig-a015-20211121 (attached as .config)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0f65744094ce515a9dfe6b5e655ad59861eca35b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
git checkout 0f65744094ce515a9dfe6b5e655ad59861eca35b
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:1438:11: error: called object type 'int' is not a function or function pointer
GFP_KERNEL);
^
include/linux/gfp.h:324:20: note: expanded from macro 'GFP_KERNEL'
#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
^
1 error generated.
vim +/int +1438 drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c
1426
1427 static int init_doorbell_bitmap(struct qcm_process_device *qpd,
1428 struct kfd_dev *dev)
1429 {
1430 unsigned int i;
1431 int range_start = dev->shared_resources.non_cp_doorbells_start;
1432 int range_end = dev->shared_resources.non_cp_doorbells_end;
1433
1434 if (!KFD_IS_SOC15(dev->device_info->asic_family))
1435 return 0;
1436
1437 qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS
> 1438 GFP_KERNEL);
1439 if (!qpd->doorbell_bitmap)
1440 return -ENOMEM;
1441
1442 /* Mask out doorbells reserved for SDMA, IH, and VCN on SOC15. */
1443 pr_debug("reserved doorbell 0x%03x - 0x%03x\n", range_start, range_end);
1444 pr_debug("reserved doorbell 0x%03x - 0x%03x\n",
1445 range_start + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1446 range_end + KFD_QUEUE_DOORBELL_MIRROR_OFFSET);
1447
1448 for (i = 0; i < KFD_MAX_NUM_OF_QUEUES_PER_PROCESS / 2; i++) {
1449 if (i >= range_start && i <= range_end) {
1450 set_bit(i, qpd->doorbell_bitmap);
1451 set_bit(i + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1452 qpd->doorbell_bitmap);
1453 }
1454 }
1455
1456 return 0;
1457 }
1458
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 36177 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-22 22:10 ` kernel test robot
0 siblings, 0 replies; 16+ messages in thread
From: kernel test robot @ 2021-11-22 22:10 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3348 bytes --]
Hi Christophe,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on v5.16-rc2 next-20211118]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
base: git://anongit.freedesktop.org/drm/drm drm-next
config: x86_64-randconfig-a015-20211121 (attached as .config)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0f65744094ce515a9dfe6b5e655ad59861eca35b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Christophe-JAILLET/drm-amdkfd-Use-bitmap_zalloc-when-applicable/20211122-014305
git checkout 0f65744094ce515a9dfe6b5e655ad59861eca35b
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:1438:11: error: called object type 'int' is not a function or function pointer
GFP_KERNEL);
^
include/linux/gfp.h:324:20: note: expanded from macro 'GFP_KERNEL'
#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
^
1 error generated.
vim +/int +1438 drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c
1426
1427 static int init_doorbell_bitmap(struct qcm_process_device *qpd,
1428 struct kfd_dev *dev)
1429 {
1430 unsigned int i;
1431 int range_start = dev->shared_resources.non_cp_doorbells_start;
1432 int range_end = dev->shared_resources.non_cp_doorbells_end;
1433
1434 if (!KFD_IS_SOC15(dev->device_info->asic_family))
1435 return 0;
1436
1437 qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS
> 1438 GFP_KERNEL);
1439 if (!qpd->doorbell_bitmap)
1440 return -ENOMEM;
1441
1442 /* Mask out doorbells reserved for SDMA, IH, and VCN on SOC15. */
1443 pr_debug("reserved doorbell 0x%03x - 0x%03x\n", range_start, range_end);
1444 pr_debug("reserved doorbell 0x%03x - 0x%03x\n",
1445 range_start + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1446 range_end + KFD_QUEUE_DOORBELL_MIRROR_OFFSET);
1447
1448 for (i = 0; i < KFD_MAX_NUM_OF_QUEUES_PER_PROCESS / 2; i++) {
1449 if (i >= range_start && i <= range_end) {
1450 set_bit(i, qpd->doorbell_bitmap);
1451 set_bit(i + KFD_QUEUE_DOORBELL_MIRROR_OFFSET,
1452 qpd->doorbell_bitmap);
1453 }
1454 }
1455
1456 return 0;
1457 }
1458
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 36177 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-21 17:41 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-21 17:41 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: amd-gfx, dri-devel, linux-kernel, kernel-janitors, Christophe JAILLET
'doorbell_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify code,
improve the semantic and avoid some open-coded arithmetic in allocator
arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
consistency.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index f29b3932e3dc..172ee8763523 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1011,7 +1011,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
free_pages((unsigned long)pdd->qpd.cwsr_kaddr,
get_order(KFD_CWSR_TBA_TMA_SIZE));
- kfree(pdd->qpd.doorbell_bitmap);
+ bitmap_free(pdd->qpd.doorbell_bitmap);
idr_destroy(&pdd->alloc_idr);
kfd_free_process_doorbells(pdd->dev, pdd->doorbell_index);
@@ -1434,9 +1434,8 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd,
if (!KFD_IS_SOC15(dev->device_info->asic_family))
return 0;
- qpd->doorbell_bitmap =
- kzalloc(DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS,
- BITS_PER_BYTE), GFP_KERNEL);
+ qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS
+ GFP_KERNEL);
if (!qpd->doorbell_bitmap)
return -ENOMEM;
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable
@ 2021-11-21 17:41 ` Christophe JAILLET
0 siblings, 0 replies; 16+ messages in thread
From: Christophe JAILLET @ 2021-11-21 17:41 UTC (permalink / raw)
To: Felix.Kuehling, alexander.deucher, christian.koenig, Xinhui.Pan,
airlied, daniel
Cc: Christophe JAILLET, kernel-janitors, dri-devel, amd-gfx, linux-kernel
'doorbell_bitmap' is a bitmap. So use 'bitmap_zalloc()' to simplify code,
improve the semantic and avoid some open-coded arithmetic in allocator
arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep
consistency.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index f29b3932e3dc..172ee8763523 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1011,7 +1011,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)
free_pages((unsigned long)pdd->qpd.cwsr_kaddr,
get_order(KFD_CWSR_TBA_TMA_SIZE));
- kfree(pdd->qpd.doorbell_bitmap);
+ bitmap_free(pdd->qpd.doorbell_bitmap);
idr_destroy(&pdd->alloc_idr);
kfd_free_process_doorbells(pdd->dev, pdd->doorbell_index);
@@ -1434,9 +1434,8 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd,
if (!KFD_IS_SOC15(dev->device_info->asic_family))
return 0;
- qpd->doorbell_bitmap =
- kzalloc(DIV_ROUND_UP(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS,
- BITS_PER_BYTE), GFP_KERNEL);
+ qpd->doorbell_bitmap = bitmap_zalloc(KFD_MAX_NUM_OF_QUEUES_PER_PROCESS
+ GFP_KERNEL);
if (!qpd->doorbell_bitmap)
return -ENOMEM;
--
2.30.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-04-26 20:54 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-28 16:45 [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable Christophe JAILLET
2021-11-28 16:45 ` Christophe JAILLET
2021-11-28 16:46 ` [PATCH 2/2] drm/amdkfd: Use non-atomic bitmap functions when possible Christophe JAILLET
2021-11-28 16:46 ` Christophe JAILLET
2022-04-26 18:01 ` [PATCH 1/2] drm/amdkfd: Use bitmap_zalloc() when applicable Felix Kuehling
2022-04-26 18:01 ` Felix Kuehling
2022-04-26 18:47 ` Christophe JAILLET
2022-04-26 18:47 ` Christophe JAILLET
2022-04-26 18:47 ` Christophe JAILLET
2022-04-26 20:54 ` Felix Kuehling
2022-04-26 20:54 ` Felix Kuehling
-- strict thread matches above, loose matches on Subject: below --
2021-11-21 17:41 Christophe JAILLET
2021-11-21 17:41 ` Christophe JAILLET
2021-11-22 22:10 ` kernel test robot
2021-11-22 22:10 ` kernel test robot
2021-11-22 22:10 ` kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.