Skip to content

Commit d82b9e0

Browse files
author
Bartosz Golaszewski
committed
gpio: use srcu_dereference() with SRCU-protected pointers
Lockdep with CONFIG_PROVE_RCU enabled reports false positives about suspicious rcu_dereference() usage. Let's silence it by using srcu_dereference() which is the correct helper with SRCU. Fixes: d83cee3 ("gpio: protect the pointer to gpio_chip in gpio_device with SRCU") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-lkp/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]> Acked-by: Paul E. McKenney <[email protected]>
1 parent 8574b5b commit d82b9e0

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

drivers/gpio/gpiolib-sysfs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/slab.h>
1515
#include <linux/spinlock.h>
1616
#include <linux/string.h>
17+
#include <linux/srcu.h>
1718
#include <linux/sysfs.h>
1819
#include <linux/types.h>
1920

@@ -756,7 +757,7 @@ int gpiochip_sysfs_register(struct gpio_device *gdev)
756757

757758
guard(srcu)(&gdev->srcu);
758759

759-
chip = rcu_dereference(gdev->chip);
760+
chip = srcu_dereference(gdev->chip, &gdev->srcu);
760761
if (!chip)
761762
return -ENODEV;
762763

@@ -800,7 +801,7 @@ void gpiochip_sysfs_unregister(struct gpio_device *gdev)
800801

801802
guard(srcu)(&gdev->srcu);
802803

803-
chip = rcu_dereference(gdev->chip);
804+
chip = srcu_dereference(gdev->chip, &gdev->srcu);
804805
if (chip)
805806
return;
806807

drivers/gpio/gpiolib.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const char *gpiod_get_label(struct gpio_desc *desc)
109109
return "interrupt";
110110

111111
return test_bit(FLAG_REQUESTED, &flags) ?
112-
rcu_dereference(desc->label) : NULL;
112+
srcu_dereference(desc->label, &desc->srcu) : NULL;
113113
}
114114

115115
static int desc_set_label(struct gpio_desc *desc, const char *label)
@@ -447,7 +447,7 @@ static struct gpio_desc *gpio_name_to_desc(const char * const name)
447447
srcu_read_lock_held(&gpio_devices_srcu)) {
448448
guard(srcu)(&gdev->srcu);
449449

450-
gc = rcu_dereference(gdev->chip);
450+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
451451
if (!gc)
452452
continue;
453453

@@ -1190,7 +1190,7 @@ struct gpio_device *gpio_device_find(void *data,
11901190
srcu_read_lock_held(&gpio_devices_srcu)) {
11911191
guard(srcu)(&gdev->srcu);
11921192

1193-
gc = rcu_dereference(gdev->chip);
1193+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
11941194

11951195
if (gc && match(gc, data))
11961196
return gpio_device_get(gdev);
@@ -2978,7 +2978,7 @@ static int gpiod_get_raw_value_commit(const struct gpio_desc *desc)
29782978

29792979
guard(srcu)(&gdev->srcu);
29802980

2981-
gc = rcu_dereference(gdev->chip);
2981+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
29822982
if (!gc)
29832983
return -ENODEV;
29842984

@@ -3012,7 +3012,7 @@ static bool gpio_device_chip_cmp(struct gpio_device *gdev, struct gpio_chip *gc)
30123012
{
30133013
guard(srcu)(&gdev->srcu);
30143014

3015-
return gc == rcu_dereference(gdev->chip);
3015+
return gc == srcu_dereference(gdev->chip, &gdev->srcu);
30163016
}
30173017

30183018
int gpiod_get_array_value_complex(bool raw, bool can_sleep,
@@ -3593,7 +3593,7 @@ int gpiod_to_irq(const struct gpio_desc *desc)
35933593
gdev = desc->gdev;
35943594
/* FIXME Cannot use gpio_chip_guard due to const desc. */
35953595
guard(srcu)(&gdev->srcu);
3596-
gc = rcu_dereference(gdev->chip);
3596+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
35973597
if (!gc)
35983598
return -ENODEV;
35993599

@@ -4787,7 +4787,7 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev)
47874787

47884788
guard(srcu)(&gdev->srcu);
47894789

4790-
gc = rcu_dereference(gdev->chip);
4790+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
47914791
if (!gc) {
47924792
seq_puts(s, "Underlying GPIO chip is gone\n");
47934793
return;
@@ -4872,7 +4872,7 @@ static int gpiolib_seq_show(struct seq_file *s, void *v)
48724872

48734873
guard(srcu)(&gdev->srcu);
48744874

4875-
gc = rcu_dereference(gdev->chip);
4875+
gc = srcu_dereference(gdev->chip, &gdev->srcu);
48764876
if (!gc) {
48774877
seq_printf(s, "%s%s: (dangling chip)",
48784878
priv->newline ? "\n" : "",

drivers/gpio/gpiolib.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ DEFINE_CLASS(gpio_chip_guard,
202202

203203
_guard.gdev = desc->gdev;
204204
_guard.idx = srcu_read_lock(&_guard.gdev->srcu);
205-
_guard.gc = rcu_dereference(_guard.gdev->chip);
205+
_guard.gc = srcu_dereference(_guard.gdev->chip,
206+
&_guard.gdev->srcu);
206207

207208
_guard;
208209
}),

0 commit comments

Comments
 (0)