Skip to contentSkip to conversation

drm/vc4: replace idr_init() by idr_init_base()

PATCH In review Deepak R Varma 2 participants 3 messages Nov 5, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/vc4: replace idr_init() by idr_init_base()

idr_init() uses base 0 which is an invalid identifier for this driver. The idr_alloc for this driver uses VC4_PERFMONID_MIN as start value for ID range and it is #defined to 1. The new function idr_init_base allows IDR to set the ID lookup from base 1. This avoids all lookups that otherwise starts from 0 since 0 is always unused / available.

References: commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient")

---
 drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_perfmon.c +1 -1
index f4aa75efd16b..7d40f421d922 100644
@@ -77,7 +77,7 @@ struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id)
 void vc4_perfmon_open_file(struct vc4_file *vc4file)
 {
 	mutex_init(&vc4file->perfmon.lock);
-	idr_init(&vc4file->perfmon.idr);
+	idr_init_base(&vc4file->perfmon.idr, 1);
 }
 
 static int vc4_perfmon_idr_del(int id, void *elem, void *data)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 19 lines · Deepak R Varma

idr_init() uses base 0 which is an invalid identifier for this driver. The idr_alloc for this driver uses VC4_PERFMONID_MIN as start value for ID range and it is #defined to 1. The new function idr_init_base allows IDR to set the ID lookup from base 1. This avoids all lookups that otherwise starts from 0 since 0 is always unused / available.

References: commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient")

---
 drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_perfmon.c +0 -0
index f4aa75efd16b..7d40f421d922 100644

drivers/gpu/drm/vc4/vc4_perfmon.c struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id) · line 81

Quoted 6 lines
drivers/gpu/drm/vc4/vc4_perfmon.c +1 -1
@@ -77,7 +77,7 @@ struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id)
 void vc4_perfmon_open_file(struct vc4_file *vc4file)
 {
        mutex_init(&vc4file->perfmon.lock);
-       idr_init(&vc4file->perfmon.idr);
+       idr_init_base(&vc4file->perfmon.idr, 1);
 }

Sounds like you should use VC4_PERFMONID_MIN instead of a magic 1 here.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 15 lines · Eric Anholt
Quoted 14 lines · Deepak R Varma

idr_init() uses base 0 which is an invalid identifier for this driver. The idr_alloc for this driver uses VC4_PERFMONID_MIN as start value for ID range and it is #defined to 1. The new function idr_init_base allows IDR to set the ID lookup from base 1. This avoids all lookups that otherwise starts from 0 since 0 is always unused / available.

References: commit 6ce711f27500 ("idr: Make 1-based IDRs more efficient")

---
 drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

drivers/gpu/drm/vc4/vc4_perfmon.c struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id) · line 81

Quoted 11 lines
drivers/gpu/drm/vc4/vc4_perfmon.c +1 -1
index f4aa75efd16b..7d40f421d922 100644
@@ -77,7 +77,7 @@ struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id)
 void vc4_perfmon_open_file(struct vc4_file *vc4file)
 {
        mutex_init(&vc4file->perfmon.lock);
-       idr_init(&vc4file->perfmon.idr);
+       idr_init_base(&vc4file->perfmon.idr, 1);
 }

Sounds like you should use VC4_PERFMONID_MIN instead of a magic 1 here.

Agreed. I will update and resend v2.

Thank you,
./drv