ACPI: scan: Use unique number for instance_no
Subsystems (2)
PATCH v3 1/1 ACPI: scan: Use unique number for instance_no
The decrementation of acpi_device_bus_id->instance_no in acpi_device_del() is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the same acpi_device_bus_id is added.
Replace above mentioned approach by using IDA framework.
---
v3: rewrote commit message once again as proposed by Rafael in v1
drivers/acpi/internal.h | 4 +++- drivers/acpi/scan.c | 32 +++++++++++++++++++++++++++----- include/acpi/acpi_bus.h | 1 + 3 files changed, 31 insertions(+), 6 deletions(-)
drivers/acpi/internal.h +3 -1
@@ -9,6 +9,8 @@#ifndef _ACPI_INTERNAL_H_#define _ACPI_INTERNAL_H_ +#include <linux/idr.h> +#define PREFIX "ACPI: "int early_acpi_osi_init (void );
@@ -98,7 +100,7 @@ extern struct list_head acpi_bus_id_list;struct acpi_device_bus_id {const char *bus_id; -unsigned int instance_no; +struct ida instance_ida;struct list_head node; };
drivers/acpi/scan.c +27 -5
@@ -479,9 +479,8 @@ static void acpi_device_del(struct acpi_device *device)list_for_each_entry (acpi_device_bus_id, &acpi_bus_id_list, node)if (!strcmp (acpi_device_bus_id->bus_id,acpi_device_hid (device))) { -if (acpi_device_bus_id->instance_no >0 ) - acpi_device_bus_id->instance_no--; -else { +ida_simple_remove (&acpi_device_bus_id->instance_ida, device->pnp.instance_no); +if (ida_is_empty (&acpi_device_bus_id->instance_ida)) {list_del (&acpi_device_bus_id->node);kfree_const (acpi_device_bus_id->bus_id);kfree (acpi_device_bus_id);
@@ -631,6 +630,20 @@ static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id)return NULL ; } +static int acpi_device_set_name (struct acpi_device *device, +struct acpi_device_bus_id *acpi_device_bus_id) +{ +int result; + + result =ida_simple_get (&acpi_device_bus_id->instance_ida,0 ,255 ,GFP_KERNEL ); +if (result <0 ) +return result; + + device->pnp.instance_no = result; +dev_set_name (&device->dev,"%s:%02x" , acpi_device_bus_id->bus_id, result); +return 0 ; +} +int acpi_device_add (struct acpi_device *device,void (*release)(struct device *)) {
@@ -665,7 +678,9 @@ int acpi_device_add(struct acpi_device *device, acpi_device_bus_id =acpi_device_bus_id_match (acpi_device_hid (device));if (acpi_device_bus_id) { - acpi_device_bus_id->instance_no++; + result =acpi_device_set_name (device, acpi_device_bus_id); +if (result) + goto err_unlock; }else { acpi_device_bus_id =kzalloc (sizeof (*acpi_device_bus_id),GFP_KERNEL );
@@ -681,9 +696,16 @@ int acpi_device_add(struct acpi_device *device, goto err_unlock; } +ida_init (&acpi_device_bus_id->instance_ida); + + result =acpi_device_set_name (device, acpi_device_bus_id); +if (result) { +kfree (acpi_device_bus_id); + goto err_unlock; + } +list_add_tail (&acpi_device_bus_id->node, &acpi_bus_id_list); } -dev_set_name (&device->dev,"%s:%02x" , acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);if (device->parent)list_add_tail (&device->node, &device->parent->children);
include/acpi/acpi_bus.h +1 -0
@@ -233,6 +233,7 @@ struct acpi_pnp_type {struct acpi_device_pnp {acpi_bus_id bus_id;/* Object name */ +int instance_no;/* Instance number of this object */ struct acpi_pnp_type type;/* ID type */ acpi_bus_address bus_address;/* _ADR */ char *unique_id;/* _UID */
Signature · 1 line
2.30.2
Rafael J. Wysocki
maintainerQuoted 57 lines · Andy Shevchenko
The decrementation of
acpi_device_bus_id->instance_noinacpi_device_del()is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the sameacpi_device_bus_idis added.Replace above mentioned approach by using IDA framework.
Fixes e49bd2dd5a50 ("ACPI: use PNPID:instance_no as bus_id of ACPI device")Fixes ca9dc8d42b30 ("ACPI / scan: Fix acpi_bus_id_list bookkeeping")Signed-off-by Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>---
v3: rewrote commit message once again as proposed by Rafael in v1drivers/acpi/internal.h | 4 +++- drivers/acpi/scan.c | 32 +++++++++++++++++++++++++++----- include/acpi/acpi_bus.h | 1 + 3 files changed, 31 insertions(+), 6 deletions(-)drivers/acpi/internal.h +3
-1@@ -9,6 +9,8 @@#ifndef _ACPI_INTERNAL_H_#define _ACPI_INTERNAL_H_ +#include <linux/idr.h> +#define PREFIX "ACPI: "int early_acpi_osi_init (void );@@ -98,7 +100,7 @@ extern struct list_head acpi_bus_id_list;struct acpi_device_bus_id {const char *bus_id; -unsigned int instance_no; +struct ida instance_ida;struct list_head node; };drivers/acpi/scan.c +2
-3@@ -479,9 +479,8 @@ static void acpi_device_del(struct acpi_device *device)list_for_each_entry (acpi_device_bus_id, &acpi_bus_id_list, node)if (!strcmp (acpi_device_bus_id->bus_id,acpi_device_hid (device))) { -if (acpi_device_bus_id->instance_no >0 ) - acpi_device_bus_id->instance_no--; -else { +ida_simple_remove (&acpi_device_bus_id->instance_ida, device->pnp.instance_no); +if (ida_is_empty (&acpi_device_bus_id->instance_ida)) {list_del (&acpi_device_bus_id->node);kfree_const (acpi_device_bus_id->bus_id);kfree (acpi_device_bus_id);
drivers/acpi/scan.c static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id) · line 638
Quoted 9 lines
drivers/acpi/scan.c +6
-0@@ -631,6 +630,20 @@ static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id)return NULL ; } +static int acpi_device_set_name (struct acpi_device *device, +struct acpi_device_bus_id *acpi_device_bus_id) +{ +int result; + + result =ida_simple_get (&acpi_device_bus_id->instance_ida,0 ,255 ,GFP_KERNEL );
This is ida_alloc_range(ida, start, (end) - 1, gfp), so I think it should be 256 above, instead of 255.
While at it, though, there can be more than 256 CPU devices easily on contemporary systems, so I would use a greater number here. Maybe 4096 and define a symbol for it?
Quoted 10 lines · Rafael J. Wysocki
Quoted 7 lines · Andy Shevchenko
The decrementation of
acpi_device_bus_id->instance_noinacpi_device_del()is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the sameacpi_device_bus_idis added.Replace above mentioned approach by using IDA framework.
...
Quoted 4 lines
Quoted 1 line
+ result =
ida_simple_get(&acpi_device_bus_id->instance_ida, 0, 255, GFP_KERNEL);This is
ida_alloc_range(ida, start, (end) - 1, gfp), so I think it should be 256 above, instead of 255.
Ah, good catch!
Quoted 3 lines
While at it, though, there can be more than 256 CPU devices easily on contemporary systems, so I would use a greater number here. Maybe 4096 and define a symbol for it?
I was thinking about it, but there is a problem with the device name, since it will break a lot of code,
And taking into account that currently we don't change the behaviour it is good enough per se as a fix.
That said, we may extend by an additional patch with a logic like this:
res = ida_get(4096)
if (res < 0)
return res;
if (res >= 256)
use %04x
else
use %02x
Would it make sense to you?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rafael J. Wysocki
maintainerQuoted 23 lines · Andy Shevchenko
Quoted 10 lines · Rafael J. Wysocki
Quoted 7 lines · Andy Shevchenko
The decrementation of
acpi_device_bus_id->instance_noinacpi_device_del()is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the sameacpi_device_bus_idis added.Replace above mentioned approach by using IDA framework.
...
Quoted 4 lines
Quoted 1 line
+ result =
ida_simple_get(&acpi_device_bus_id->instance_ida, 0, 255, GFP_KERNEL);This is
ida_alloc_range(ida, start, (end) - 1, gfp), so I think it should be 256 above, instead of 255.Ah, good catch!
Quoted 6 lines
Quoted 3 lines
While at it, though, there can be more than 256 CPU devices easily on contemporary systems, so I would use a greater number here. Maybe 4096 and define a symbol for it?
I was thinking about it, but there is a problem with the device name, since it will break a lot of code,
What problem is there?
Quoted 13 lines
And taking into account that currently we don't change the behaviour it is good enough per se as a fix.
That said, we may extend by an additional patch with a logic like this:
res =
ida_get(4096)
if (res < 0)
return res;
if (res >= 256)
use %04x
else
use %02x
Quoted 1 line
Would it make sense to you?
I'm not sure why not to always use %02x ? It doesn't truncate numbers longer than 2 digits AFAICS.
Quoted 23 lines · Rafael J. Wysocki
Quoted 21 lines · Andy Shevchenko
Quoted 9 lines · Rafael J. Wysocki
Quoted 7 lines · Andy Shevchenko
The decrementation of
acpi_device_bus_id->instance_noinacpi_device_del()is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the sameacpi_device_bus_idis added.Replace above mentioned approach by using IDA framework.
...
Quoted 4 lines
Quoted 1 line
+ result =
ida_simple_get(&acpi_device_bus_id->instance_ida, 0, 255, GFP_KERNEL);This is
ida_alloc_range(ida, start, (end) - 1, gfp), so I think it should be 256 above, instead of 255.Ah, good catch!
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
While at it, though, there can be more than 256 CPU devices easily on contemporary systems, so I would use a greater number here. Maybe 4096 and define a symbol for it?
I was thinking about it, but there is a problem with the device name, since it will break a lot of code,
What problem is there?
If we have only 2 digits, but you are right, we have _at least_ two digits.
Quoted 13 lines
Quoted 13 lines
And taking into account that currently we don't change the behaviour it is good enough per se as a fix.
That said, we may extend by an additional patch with a logic like this:
res =
ida_get(4096)
if (res < 0)
return res;
if (res >= 256)
use %04x
else
use %02x
Quoted 4 lines
Quoted 1 line
Would it make sense to you?
I'm not sure why not to always use %02x ? It doesn't truncate numbers longer than 2 digits AFAICS.
Yeah, should work. Thanks for review, I'll send a new version soon.
Signature · 2 lines
With Best Regards, Andy Shevchenko