gpio: consumer: new virtual driver
Subsystems (2)
PATCH v6 1/1 gpio: consumer: new virtual driver
From: Bartosz Golaszewski <[email protected]>
The GPIO subsystem has a serious problem with undefined behavior and use-after-free bugs on hot-unplug of GPIO chips. This can be considered a corner-case by some as most GPIO controllers are enabled early in the boot process and live until the system goes down but most GPIO drivers do allow unbind over sysfs, many are loadable modules that can be (force) unloaded and there are also GPIO devices that can be dynamically detached, for instance CP2112 which is a USB GPIO expender.
Bugs can be triggered both from user-space as well as by in-kernel users. We have the means of testing it from user-space via the character device but the issues manifest themselves differently in the kernel.
This is a proposition of adding a new virtual driver - a configurable GPIO consumer that can be configured over configfs (similarly to gpio-sim).
The configfs interface allows users to create dynamic GPIO lookup tables that are registered with the GPIO subsystem. Every config group represents a consumer device. Every sub-group represents a single GPIO lookup. The device can work in three modes: just keeping the line active, toggling it every second or requesting its interrupt and reporting edges. Every lookup allows to specify the key, offset and flags as per the lookup struct defined in linux/gpio/machine.h.
The module together with gpio-sim allows to easily trigger kernel hot-unplug errors. A simple use-case is to create a simulated chip, setup the consumer to lookup one of its lines in 'monitor' mode, unbind the simulator, unbind the consumer and observe the fireworks in dmesg.
This driver is aimed as a helper in tackling the hot-unplug problem in GPIO as well as basis for future regression testing once the fixes are upstream.
---
RFC -> v2:
- add documentation
- fix various issues pointed out by Andy: use struct_size() where applicable, improve the logic when storing the 'live' property, improve log messages, remove commas in terminators, etc.
v2 -> v3:
- use cleanup.h interfaces
- add some clarifying commets
- more minor code tweaks
v3 -> v4:
- fix the toggle value assignment
- use guard(mutex)() wherever we can return directly from the subsequent function call
- use skip_spaces() + strim() to avoid having to do a memmove() when stripping strings off whitespaces
- DON'T try to save a couple LOC in ifdefs if that makes them less readable (Andy :) )
v4 -> v5:
- add the gpio-consumer docs to the admin-guide/gpio/ index (reported by kernel test robot <[email protected]>)
v5 -> v6:
- initialize the flags temp variables at declaration and hopefully make Andy happy finally :)
.../admin-guide/gpio/gpio-consumer.rst | 111 ++ Documentation/admin-guide/gpio/index.rst | 1 + drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-consumer.c | 946 ++++++++++++++++++ 5 files changed, 1066 insertions(+) create mode 100644 Documentation/admin-guide/gpio/gpio-consumer.rst create mode 100644 drivers/gpio/gpio-consumer.c
Documentation/admin-guide/gpio/gpio-consumer.rst new file +111 -0
@@ -0,0 +1,111 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +Virtual GPIO Consumer +===================== + +The virtual GPIO Consumer module allows users to create dynamic GPIO lookup +tables using the exposed configfs interface and instantiate virtual GPIO +consumer devices that retrieve and use GPIOs using these tables. + +Creating GPIO consumers +----------------------- + +The gpio-consumer module registers a configfs subsystem called +``'gpio-consumer'``. For details of the configfs filesystem, please refer to +the configfs documentation. + +The user can create a hierarchy of configfs groups and items as well as modify +values of exposed attributes. Once the consumer is instantiated, this hierarchy +will be translated to appropriate device properties. The general structure is: + +**Group:** ``/config/gpio-consumer`` + +This is the top directory of the gpio-consumer configfs tree. + +**Group:** ``/config/gpio-consumer/consumer-device`` + +**Attribute:** ``/config/gpio-consumer/gpio-device/function`` + +**Attribute:** ``/config/gpio-consumer/gpio-device/live`` + +This is a directory representing a GPIO consumer device. The ``'function'`` +attribute defines how the device will use requested GPIOs. It takes the +following values: ``'active'`` - GPIOs will be requested as output-high and +kept in this state until the device is unbound, ``'toggle'`` - GPIOs will +be requested in output mode and then toggled periodically (every second) +between 1 and 0, ``'monitor'`` - GPIOs will be requested in input mode, then +requested as interrupts and their firing reported in the kernel log. + +The ``'live'`` attribute allows to trigger the actual creation of the device +once it's fully configured. The accepted values are: ``'1'`` to enable the +virtual device and ``'0'`` to disable and tear it down. + +Creating GPIO lookup tables +--------------------------- + +User can create a number of configfs groups under the device group with the +following properties: + +**Group:** ``/config/gpio-consumer/consumer-device/lookupX`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/key`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/offset`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/drive`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/pull`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/active_low`` + +**Attribute:** ``/config/gpio-consumer/consumer-device/lookupX/transitory`` + +This group represents a single entry in the GPIO lookup table. The name of the +sub-directory maps to the ``'con_id'`` field of ``'struct gpiod_lookup'``. The +``'key'`` attribute represents either the name of the chip this GPIO belongs to +or the GPIO line name. This depends on the value of the ``'offset'`` attribute: +if its value is >= 0, then ``'key'`` represents the label of the chip to lookup +while ``'offset'`` represents the offset of the line in that chip. If +``'offset'`` is < 0, then ``'key'`` represents the name of the line. + +The remaining attributes map to the ``'flags'`` field of the GPIO lookup struct. +The first two take string values as arguments: + +**``'drive'``:** ``'push-pull'``, ``'open-drain'``, ``'open-source'`` +**``'pull'``:** ``'pull-up'``, ``'pull-down'``, ``'pull-disabled'``, ``'as-is'`` + +``'active_low'`` and ``'transitory'`` are boolean attributes. + +Activating GPIO consumers +------------------------- + +Once the confiuration is complete, the ``'live'`` attribute must be set to 1 in +order to instantiate the consumer. It can be set back to 0 to destroy the +virtual devices. The module will synchronously wait for the new simulated device +to be successfully probed and if this doesn't happen, writing to ``'live'`` will +result in an error. + +Device-tree +----------- + +Virtual GPIO consumers can also be defined in device-tree. The compatible string +must be: ``"gpio-virtual-consumer"``. Supported properties are: + + ``"gpio-virtual-consumer,function"`` - function of the virtual device + ``"gpio-virtual-consumer,lines"`` - list of lookup keys + +An example device-tree code defining a virtual GPIO consumer: + +.. code-block :: none + + gpio-virt-consumer { + compatible = "gpio-virtual-consumer"; + + foo-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + bar-gpios = <&gpio0 6 0>; + + gpio-virtual-consumer,function = "toggle"; + gpio-virtual-consumer,lines = "foo", "bar"; + }; + +.. SPDX-License-Identifier: GPL-2.0-or-later
Documentation/admin-guide/gpio/index.rst +1 -0
@@ -8,6 +8,7 @@ gpio :maxdepth: 1 gpio-aggregator + gpio-consumer sysfs gpio-mockup gpio-sim
drivers/gpio/Kconfig +7 -0
@@ -1762,6 +1762,13 @@ config GPIO_AGGREGATOR industrial control context, to be operated from userspace using the GPIO chardev interface. +config GPIO_CONSUMER + tristate "GPIO Consumer Testing Module" + select CONFIGFS_FS + help + This enables the configurable, configfs-based virtual GPIO consumer + testing driver. + config GPIO_LATCH tristate "GPIO latch driver" help
drivers/gpio/Makefile +1 -0
@@ -46,6 +46,7 @@ obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o +obj-$(CONFIG_GPIO_CONSUMER) += gpio-consumer.o obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
drivers/gpio/gpio-consumer.c new file +946 -0
946 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 34 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The GPIO subsystem has a serious problem with undefined behavior and use-after-free bugs on hot-unplug of GPIO chips. This can be considered a corner-case by some as most GPIO controllers are enabled early in the boot process and live until the system goes down but most GPIO drivers do allow unbind over sysfs, many are loadable modules that can be (force) unloaded and there are also GPIO devices that can be dynamically detached, for instance CP2112 which is a USB GPIO expender.
Bugs can be triggered both from user-space as well as by in-kernel users. We have the means of testing it from user-space via the character device but the issues manifest themselves differently in the kernel.
This is a proposition of adding a new virtual driver - a configurable GPIO consumer that can be configured over configfs (similarly to gpio-sim).
The configfs interface allows users to create dynamic GPIO lookup tables that are registered with the GPIO subsystem. Every config group represents a consumer device. Every sub-group represents a single GPIO lookup. The device can work in three modes: just keeping the line active, toggling it every second or requesting its interrupt and reporting edges. Every lookup allows to specify the key, offset and flags as per the lookup struct defined in
linux/gpio/machine.h.The module together with gpio-sim allows to easily trigger kernel hot-unplug errors. A simple use-case is to create a simulated chip, setup the consumer to lookup one of its lines in 'monitor' mode, unbind the simulator, unbind the consumer and observe the fireworks in dmesg.
This driver is aimed as a helper in tackling the hot-unplug problem in GPIO as well as basis for future regression testing once the fixes are upstream.
...
drivers/gpio/Makefile obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o · line 49
Quoted 5 lines
drivers/gpio/Makefile +1
-0@@ -46,6 +46,7 @@ obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o +obj-$(CONFIG_GPIO_CONSUMER) += gpio-consumer.o
Order?
Quoted 3 lines
drivers/gpio/Makefile +0
-0obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
...
Review
Quoted 2 lines
(quoted diff) +2
-0+ return dev_err_probe(dev, ret, + "Failed to read GPIO line names\n");
With one line it takes 83 characters (and note, that long before checkpatch went for 100, the string literals at the end of a long line were accepted)...
...
Review
Quoted 2 lines
(quoted diff) +2
-0+ return dev_err_probe(dev, ret, + "Failed to request GPIO line interrupt\n");
And here with broken indentation you got 91.
Can you be consistent?
(I prefer as you know less LoCs)
...
Quoted 13 lines
drivers/gpio/gpio-consumer.c new file +13
-0+static ssize_t +gpio_consumer_lookup_config_drive_store (struct config_item *item, +const char *page,size_t count) +{ +struct gpio_consumer_lookup *lookup =to_gpio_consumer_lookup (item); +struct gpio_consumer_device *dev = lookup->parent; + +guard (mutex)(&dev->lock); + +if (gpio_consumer_device_is_live_unlocked (dev)) +return -EBUSY ; + +if (sysfs_streq (page,"push-pull" )) {
drivers/gpio/gpio-consumer.c line 430
Quoted 10 lines
drivers/gpio/gpio-consumer.c new file +9
-0+ lookup->flags &= ~(GPIO_OPEN_DRAIN |GPIO_OPEN_SOURCE ); + }else if (sysfs_streq (page,"open-drain" )) { + lookup->flags &= ~GPIO_OPEN_SOURCE ; + lookup->flags |=GPIO_OPEN_DRAIN ; + }else if (sysfs_streq (page,"open-source" )) { + lookup->flags &= ~GPIO_OPEN_DRAIN ; + lookup->flags |=GPIO_OPEN_SOURCE ; + }else { + count = -EINVAL ;
Strictly speaking this is incorrect.
You need
ssize_t ret; ... ret = count; if (...) ret = -EINVAL;
drivers/gpio/gpio-consumer.c line 459
Quoted 9 lines
drivers/gpio/gpio-consumer.c new file +8
-0+ } + +return count; +} +static ssize_t +gpio_consumer_lookup_config_pull_store (struct config_item *item, +const char *page,size_t count) +{
As per above.
Quoted 1 line
+}
...
drivers/gpio/gpio-consumer.c line 609
Quoted 2 lines
drivers/gpio/gpio-consumer.c new file +2
-0+ curr->chip_hwnum = lookup->offset <0 ? +U16_MAX : lookup->offset;
I found this way better
curr->chip_hwnum = lookup->offset < 0 ? U16_MAX : lookup->offset;
...
drivers/gpio/gpio-consumer.c line 734
Quoted 1 line
drivers/gpio/gpio-consumer.c new file +1
-0+return ret ?: count;
Also possible way in the above mentioned cases.
...
I'm not going to bikeshed, I believe you can fix above accordingly, either way
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 135 lines · Andy Shevchenko
Quoted 34 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
The GPIO subsystem has a serious problem with undefined behavior and use-after-free bugs on hot-unplug of GPIO chips. This can be considered a corner-case by some as most GPIO controllers are enabled early in the boot process and live until the system goes down but most GPIO drivers do allow unbind over sysfs, many are loadable modules that can be (force) unloaded and there are also GPIO devices that can be dynamically detached, for instance CP2112 which is a USB GPIO expender.
Bugs can be triggered both from user-space as well as by in-kernel users. We have the means of testing it from user-space via the character device but the issues manifest themselves differently in the kernel.
This is a proposition of adding a new virtual driver - a configurable GPIO consumer that can be configured over configfs (similarly to gpio-sim).
The configfs interface allows users to create dynamic GPIO lookup tables that are registered with the GPIO subsystem. Every config group represents a consumer device. Every sub-group represents a single GPIO lookup. The device can work in three modes: just keeping the line active, toggling it every second or requesting its interrupt and reporting edges. Every lookup allows to specify the key, offset and flags as per the lookup struct defined in
linux/gpio/machine.h.The module together with gpio-sim allows to easily trigger kernel hot-unplug errors. A simple use-case is to create a simulated chip, setup the consumer to lookup one of its lines in 'monitor' mode, unbind the simulator, unbind the consumer and observe the fireworks in dmesg.
This driver is aimed as a helper in tackling the hot-unplug problem in GPIO as well as basis for future regression testing once the fixes are upstream.
...
drivers/gpio/Makefile obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o · line 49
Quoted 5 lines
drivers/gpio/Makefile +1
-0@@ -46,6 +46,7 @@ obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o +obj-$(CONFIG_GPIO_CONSUMER) += gpio-consumer.oOrder?
Quoted 3 lines
drivers/gpio/Makefile +0
-0obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o...
Review
Quoted 2 lines
(quoted diff) +2
-0+ return dev_err_probe(dev, ret, + "Failed to read GPIO line names\n");With one line it takes 83 characters (and note, that long before checkpatch went for 100, the string literals at the end of a long line were accepted)...
...
Review
Quoted 2 lines
(quoted diff) +2
-0+ return dev_err_probe(dev, ret, + "Failed to request GPIO line interrupt\n");And here with broken indentation you got 91.
Can you be consistent?(I prefer as you know less LoCs)
...
Quoted 13 lines
drivers/gpio/gpio-consumer.c new file +13
-0+static ssize_t +gpio_consumer_lookup_config_drive_store (struct config_item *item, +const char *page,size_t count) +{ +struct gpio_consumer_lookup *lookup =to_gpio_consumer_lookup (item); +struct gpio_consumer_device *dev = lookup->parent; + +guard (mutex)(&dev->lock); + +if (gpio_consumer_device_is_live_unlocked (dev)) +return -EBUSY ; + +if (sysfs_streq (page,"push-pull" )) {drivers/gpio/gpio-consumer.c line 430
Quoted 10 lines
drivers/gpio/gpio-consumer.c new file +9
-0+ lookup->flags &= ~(GPIO_OPEN_DRAIN |GPIO_OPEN_SOURCE ); + }else if (sysfs_streq (page,"open-drain" )) { + lookup->flags &= ~GPIO_OPEN_SOURCE ; + lookup->flags |=GPIO_OPEN_DRAIN ; + }else if (sysfs_streq (page,"open-source" )) { + lookup->flags &= ~GPIO_OPEN_DRAIN ; + lookup->flags |=GPIO_OPEN_SOURCE ; + }else { + count = -EINVAL ;Strictly speaking this is incorrect.
You needssize_t ret; ... ret = count; if (...) ret = -EINVAL;drivers/gpio/gpio-consumer.c line 459
Quoted 9 lines
drivers/gpio/gpio-consumer.c new file +8
-0+ } + +return count; +} +static ssize_t +gpio_consumer_lookup_config_pull_store (struct config_item *item, +const char *page,size_t count) +{As per above.
Quoted 1 line
+}
...
drivers/gpio/gpio-consumer.c line 609
Quoted 2 lines
drivers/gpio/gpio-consumer.c new file +2
-0+ curr->chip_hwnum = lookup->offset <0 ? +U16_MAX : lookup->offset;I found this way better
curr->chip_hwnum = lookup->offset < 0 ? U16_MAX : lookup->offset;...
Quoted 1 line
+ return ret ?: count;
Also possible way in the above mentioned cases.
Quoted 8 lines
...
I'm not going to bikeshed, I believe you can fix above accordingly, either way
Reviewed-by Andy Shevchenko <[email protected]>
Actually when experimenting more, I started thinking we could improve the driver even more. Expose a sysfs interface that would allow to control the GPIOs from the kernel on user-space's behalf. For
instance: change value, change direction, toggle active-low watch for interrupts (and log them to a sysfs buffer) etc.
I won't be queueing it for v6.6, I want to spend some more time on it.
Thanks for the reviews.
Bart
Quoted 5 lines
--
With Best Regards,
Andy Shevchenko