nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

gpio: cdev: use correct pointer accessors with SRCU

Browse source 
We never dereference the chip pointer in character device code so we can
use the lighter rcu_access_pointer() helper. This also makes lockep
happier as it no longer complains about suspicious rcu_dereference()
usage.

Fixes: d83cee3d2b ("gpio: protect the pointer to gpio_chip in gpio_device with SRCU")
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202402122234.d85cca9b-lkp@intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Bartosz Golaszewski 2024-02-14 09:44:17 +01:00
parent 815a1b5a6d
commit 8574b5b476
1 changed files with 12 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/gpio/gpiolib-cdev.c
View file

@ -206,7 +206,7 @@ static long linehandle_ioctl(struct file *file, unsigned int cmd,
guard(srcu)(&lh->gdev->srcu); guard(srcu)(&lh->gdev->srcu);
if (!rcu_dereference(lh->gdev->chip)) if (!rcu_access_pointer(lh->gdev->chip))
return -ENODEV; return -ENODEV;
switch (cmd) { switch (cmd) {
@ -1521,7 +1521,7 @@ static long linereq_ioctl(struct file *file, unsigned int cmd,
guard(srcu)(&lr->gdev->srcu); guard(srcu)(&lr->gdev->srcu);
if (!rcu_dereference(lr->gdev->chip)) if (!rcu_access_pointer(lr->gdev->chip))
return -ENODEV; return -ENODEV;
switch (cmd) { switch (cmd) {
@ -1552,7 +1552,7 @@ static __poll_t linereq_poll(struct file *file,
guard(srcu)(&lr->gdev->srcu); guard(srcu)(&lr->gdev->srcu);
if (!rcu_dereference(lr->gdev->chip)) if (!rcu_access_pointer(lr->gdev->chip))
return EPOLLHUP | EPOLLERR; return EPOLLHUP | EPOLLERR;
poll_wait(file, &lr->wait, wait); poll_wait(file, &lr->wait, wait);
@ -1574,7 +1574,7 @@ static ssize_t linereq_read(struct file *file, char __user *buf,
guard(srcu)(&lr->gdev->srcu); guard(srcu)(&lr->gdev->srcu);
if (!rcu_dereference(lr->gdev->chip)) if (!rcu_access_pointer(lr->gdev->chip))
return -ENODEV; return -ENODEV;
if (count < sizeof(le)) if (count < sizeof(le))
@ -1875,7 +1875,7 @@ static __poll_t lineevent_poll(struct file *file,
guard(srcu)(&le->gdev->srcu); guard(srcu)(&le->gdev->srcu);
if (!rcu_dereference(le->gdev->chip)) if (!rcu_access_pointer(le->gdev->chip))
return EPOLLHUP | EPOLLERR; return EPOLLHUP | EPOLLERR;
poll_wait(file, &le->wait, wait); poll_wait(file, &le->wait, wait);
@ -1913,7 +1913,7 @@ static ssize_t lineevent_read(struct file *file, char __user *buf,
guard(srcu)(&le->gdev->srcu); guard(srcu)(&le->gdev->srcu);
if (!rcu_dereference(le->gdev->chip)) if (!rcu_access_pointer(le->gdev->chip))
return -ENODEV; return -ENODEV;
/* /*
@ -1996,7 +1996,7 @@ static long lineevent_ioctl(struct file *file, unsigned int cmd,
guard(srcu)(&le->gdev->srcu); guard(srcu)(&le->gdev->srcu);
if (!rcu_dereference(le->gdev->chip)) if (!rcu_access_pointer(le->gdev->chip))
return -ENODEV; return -ENODEV;
/* /*
@ -2510,7 +2510,7 @@ static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
guard(srcu)(&gdev->srcu); guard(srcu)(&gdev->srcu);
/* We fail any subsequent ioctl():s when the chip is gone */ /* We fail any subsequent ioctl():s when the chip is gone */
if (!rcu_dereference(gdev->chip)) if (!rcu_access_pointer(gdev->chip))
return -ENODEV; return -ENODEV;
/* Fill in the struct and pass to userspace */ /* Fill in the struct and pass to userspace */
@ -2595,7 +2595,7 @@ static __poll_t lineinfo_watch_poll(struct file *file,
guard(srcu)(&cdev->gdev->srcu); guard(srcu)(&cdev->gdev->srcu);
if (!rcu_dereference(cdev->gdev->chip)) if (!rcu_access_pointer(cdev->gdev->chip))
return EPOLLHUP | EPOLLERR; return EPOLLHUP | EPOLLERR;
poll_wait(file, &cdev->wait, pollt); poll_wait(file, &cdev->wait, pollt);
@ -2618,7 +2618,7 @@ static ssize_t lineinfo_watch_read(struct file *file, char __user *buf,
guard(srcu)(&cdev->gdev->srcu); guard(srcu)(&cdev->gdev->srcu);
if (!rcu_dereference(cdev->gdev->chip)) if (!rcu_access_pointer(cdev->gdev->chip))
return -ENODEV; return -ENODEV;
#ifndef CONFIG_GPIO_CDEV_V1 #ifndef CONFIG_GPIO_CDEV_V1
@ -2696,7 +2696,7 @@ static int gpio_chrdev_open(struct inode *inode, struct file *file)
guard(srcu)(&gdev->srcu); guard(srcu)(&gdev->srcu);
/* Fail on open if the backing gpiochip is gone */ /* Fail on open if the backing gpiochip is gone */
if (!rcu_dereference(gdev->chip)) if (!rcu_access_pointer(gdev->chip))
return -ENODEV; return -ENODEV;
cdev = kzalloc(sizeof(*cdev), GFP_KERNEL); cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
@ -2796,8 +2796,7 @@ int gpiolib_cdev_register(struct gpio_device *gdev, dev_t devt)
guard(srcu)(&gdev->srcu); guard(srcu)(&gdev->srcu);
gc = rcu_dereference(gdev->chip); if (!rcu_access_pointer(gdev->chip))
if (!gc)
return -ENODEV; return -ENODEV;
chip_dbg(gc, "added GPIO chardev (%d:%d)\n", MAJOR(devt), gdev->id); chip_dbg(gc, "added GPIO chardev (%d:%d)\n", MAJOR(devt), gdev->id);