platform/chrome: Resolve kb_wake_angle visibility race
Subsystems (2)
Tzung-Bi Shih
maintainerPATCH v4 1/1 platform/chrome: Resolve kb_wake_angle visibility race
A race condition exists between the probe of cros-ec-sysfs and cros-ec-sensorhub.
The kb_wake_angle attribute should only be visible if the sensor hub detects two or more accelerometers. If cros_ec_sysfs_probe() runs before cros_ec_sensorhub_register() completes sensor enumeration, the sysfs attributes are created while has_kb_wake_angle is still false, hiding kb_wake_angle incorrectly.
Store the created attribute group pointer in ec_dev->group. When the sensor hub completes sensor enumeration, it checks for this group and calls sysfs_update_group() to notify the sysfs core to re-evaluate attribute visibility. This ensures the kb_wake_angle attribute visibility is correctly updated regardless of the driver probe order.
---
This is an old patch and we still need it. Revive the patch.
v4:
- Update the warning message if it fails to update the sysfs.
- Fix kernel-doc error groups -> group per
https://lore.kernel.org/all/Y3bnYT6TXGXhkh%[email protected]/.
- Rephrase the commit message.
v3: https://lore.kernel.org/all/[email protected]/
drivers/platform/chrome/cros_ec_sensorhub.c | 6 +++++- drivers/platform/chrome/cros_ec_sysfs.c | 5 +++-- include/linux/platform_data/cros_ec_proto.h | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-)
drivers/platform/chrome/cros_ec_sensorhub.c +5 -1
@@ -122,8 +122,12 @@ static int cros_ec_sensorhub_register(struct device *dev, sensor_type[sensorhub->resp->info.type]++; } -if (sensor_type[MOTIONSENSE_TYPE_ACCEL ] >=2 ) +if (sensor_type[MOTIONSENSE_TYPE_ACCEL ] >=2 ) { ec->has_kb_wake_angle = true; +if (ec->group &&sysfs_update_group (&ec->class_dev.kobj, + ec->group)) +dev_warn (dev,"Unable to update sysfs" ); + }if (cros_ec_check_features (ec,EC_FEATURE_REFINED_TABLET_MODE_HYSTERESIS )) {
drivers/platform/chrome/cros_ec_sysfs.c +3 -2
@@ -405,7 +405,8 @@ static int cros_ec_sysfs_probe(struct platform_device *pd)struct device *dev = &pd->dev;int ret; - ret =sysfs_create_group (&ec_dev->class_dev.kobj, &cros_ec_attr_group); + ec_dev->group = &cros_ec_attr_group; + ret =sysfs_create_group (&ec_dev->class_dev.kobj, ec_dev->group);if (ret <0 )dev_err (dev,"failed to create attributes. err=%d\n" , ret);
@@ -416,7 +417,7 @@ static void cros_ec_sysfs_remove(struct platform_device *pd) {struct cros_ec_dev *ec_dev =dev_get_drvdata (pd->dev.parent); -sysfs_remove_group (&ec_dev->class_dev.kobj, &cros_ec_attr_group); +sysfs_remove_group (&ec_dev->class_dev.kobj, ec_dev->group); }static const struct platform_device_id cros_ec_sysfs_id[] = {
include/linux/platform_data/cros_ec_proto.h +2 -0
@@ -228,6 +228,7 @@ struct cros_ec_platform {/** * struct cros_ec_dev - ChromeOS EC device entry point. * @class_dev: Device structure used in sysfs. +* @group: sysfs attributes groups for this EC. * @ec_dev: cros_ec_device structure to talk to the physical device. * @dev: Pointer to the platform device. * @debug_info: cros_ec_debugfs structure for debugging information.
@@ -237,6 +238,7 @@ struct cros_ec_platform {*/ struct cros_ec_dev {struct device class_dev; +const struct attribute_group *group;struct cros_ec_device *ec_dev;struct device *dev;struct cros_ec_debugfs *debug_info;
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
Tzung-Bi Shih
maintainerQuoted 10 lines · Tzung-Bi Shih
A race condition exists between the probe of cros-ec-sysfs and cros-ec-sensorhub.
The
kb_wake_angleattribute should only be visible if the sensor hub detects two or more accelerometers. Ifcros_ec_sysfs_probe()runs beforecros_ec_sensorhub_register()completes sensor enumeration, the sysfs attributes are created whilehas_kb_wake_angleis still false, hidingkb_wake_angleincorrectly.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git for-next
[1/1] platform/chrome: Resolve kb_wake_angle visibility race
commit: 79b1c32a3faf9ceae365f56de7e962b81fa8167d
Thanks!