Commit 5126f259 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] v4l2-dev: add flag to have the core lock all file operations

This used to be the default if the lock pointer was set, but now that lock is by
default only used for ioctl serialization. Those drivers that already used
core locking have this flag set explicitly, except for some drivers where
it was obvious that there was no need to serialize any file operations other
than ioctl.

The drivers that didn't need this flag were:

drivers/media/radio/dsbr100.c
drivers/media/radio/radio-isa.c
drivers/media/radio/radio-keene.c
drivers/media/radio/radio-miropcm20.c
drivers/media/radio/radio-mr800.c
drivers/media/radio/radio-tea5764.c
drivers/media/radio/radio-timb.c
drivers/media/video/vivi.c
sound/i2c/other/tea575x-tuner.c

The other drivers that use core locking and where it was not immediately
obvious that this flag wasn't needed were changed so that the flag is set
together with a comment that that driver needs work to avoid having to
set that flag. This will often involve taking the core lock in the fops
themselves.

Eventually this flag should go and it should not be used in new drivers.

There are a few reasons why we want to avoid core locking of non-ioctl
fops: in the case of mmap this can lead to a deadlock in rare situations
since when mmap is called the mmap_sem is held and it is possible for
other parts of the code to take that lock as well (copy_from_user()/copy_to_user()
perform a down_read(&mm->mmap_sem) when a page fault occurs).

It is very unlikely that that happens since the core lock serializes all
fops, but the kernel warns about it if lock validation is turned on.

For poll it is also undesirable to take the core lock as that can introduce
increased latency. The same is true for read/write.

While it was possible to make flags or something to turn on/off taking the
core lock for each file operation, in practice it is much simpler to just
not take it at all except for ioctl and leave it to the driver to take the
lock. There are only a handful fops compared to the zillion ioctls we have.

I also wanted to make it obvious which drivers still take the lock for all
fops, so that's why I chose to have drivers set it explicitly.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4b902fec
...@@ -511,6 +511,10 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, ...@@ -511,6 +511,10 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
vfd->fops = &video_fops; vfd->fops = &video_fops;
vfd->ioctl_ops = &dev->ext_vv_data->ops; vfd->ioctl_ops = &dev->ext_vv_data->ops;
vfd->release = video_device_release; vfd->release = video_device_release;
/* Locking in file operations other than ioctl should be done by
the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->lock = &dev->v4l2_lock; vfd->lock = &dev->v4l2_lock;
vfd->tvnorms = 0; vfd->tvnorms = 0;
for (i = 0; i < dev->ext_vv_data->num_stds; i++) for (i = 0; i < dev->ext_vv_data->num_stds; i++)
......
...@@ -518,6 +518,10 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr) ...@@ -518,6 +518,10 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)
video_set_drvdata(gradio_dev, fmdev); video_set_drvdata(gradio_dev, fmdev);
gradio_dev->lock = &fmdev->mutex; gradio_dev->lock = &fmdev->mutex;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &gradio_dev->flags);
/* Register with V4L2 subsystem as RADIO device */ /* Register with V4L2 subsystem as RADIO device */
if (video_register_device(gradio_dev, VFL_TYPE_RADIO, radio_nr)) { if (video_register_device(gradio_dev, VFL_TYPE_RADIO, radio_nr)) {
......
...@@ -942,6 +942,10 @@ static int __devinit bcap_probe(struct platform_device *pdev) ...@@ -942,6 +942,10 @@ static int __devinit bcap_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&bcap_dev->dma_queue); INIT_LIST_HEAD(&bcap_dev->dma_queue);
vfd->lock = &bcap_dev->mutex; vfd->lock = &bcap_dev->mutex;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
/* register video device */ /* register video device */
ret = video_register_device(bcap_dev->video_dev, VFL_TYPE_GRABBER, -1); ret = video_register_device(bcap_dev->video_dev, VFL_TYPE_GRABBER, -1);
......
...@@ -1147,6 +1147,10 @@ int cpia2_register_camera(struct camera_data *cam) ...@@ -1147,6 +1147,10 @@ int cpia2_register_camera(struct camera_data *cam)
cam->vdev.ctrl_handler = hdl; cam->vdev.ctrl_handler = hdl;
cam->vdev.v4l2_dev = &cam->v4l2_dev; cam->vdev.v4l2_dev = &cam->v4l2_dev;
set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags); set_bit(V4L2_FL_USE_FH_PRIO, &cam->vdev.flags);
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &cam->vdev.flags);
reset_camera_struct_v4l(cam); reset_camera_struct_v4l(cam);
......
...@@ -2561,6 +2561,10 @@ static struct video_device *cx231xx_vdev_init(struct cx231xx *dev, ...@@ -2561,6 +2561,10 @@ static struct video_device *cx231xx_vdev_init(struct cx231xx *dev,
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->debug = video_debug; vfd->debug = video_debug;
vfd->lock = &dev->lock; vfd->lock = &dev->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
......
...@@ -1618,6 +1618,10 @@ static __devinit int init_vpbe_layer(int i, struct vpbe_display *disp_dev, ...@@ -1618,6 +1618,10 @@ static __devinit int init_vpbe_layer(int i, struct vpbe_display *disp_dev,
vbd->ioctl_ops = &vpbe_ioctl_ops; vbd->ioctl_ops = &vpbe_ioctl_ops;
vbd->minor = -1; vbd->minor = -1;
vbd->v4l2_dev = &disp_dev->vpbe_dev->v4l2_dev; vbd->v4l2_dev = &disp_dev->vpbe_dev->v4l2_dev;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vbd->flags);
vbd->lock = &vpbe_display_layer->opslock; vbd->lock = &vpbe_display_layer->opslock;
if (disp_dev->vpbe_dev->current_timings.timings_type & if (disp_dev->vpbe_dev->current_timings.timings_type &
......
...@@ -2228,6 +2228,10 @@ static __init int vpif_probe(struct platform_device *pdev) ...@@ -2228,6 +2228,10 @@ static __init int vpif_probe(struct platform_device *pdev)
common = &(ch->common[VPIF_VIDEO_INDEX]); common = &(ch->common[VPIF_VIDEO_INDEX]);
spin_lock_init(&common->irqlock); spin_lock_init(&common->irqlock);
mutex_init(&common->lock); mutex_init(&common->lock);
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &ch->video_dev->flags);
ch->video_dev->lock = &common->lock; ch->video_dev->lock = &common->lock;
/* Initialize prio member of channel object */ /* Initialize prio member of channel object */
v4l2_prio_init(&ch->prio); v4l2_prio_init(&ch->prio);
......
...@@ -1778,6 +1778,10 @@ static __init int vpif_probe(struct platform_device *pdev) ...@@ -1778,6 +1778,10 @@ static __init int vpif_probe(struct platform_device *pdev)
v4l2_prio_init(&ch->prio); v4l2_prio_init(&ch->prio);
ch->common[VPIF_VIDEO_INDEX].fmt.type = ch->common[VPIF_VIDEO_INDEX].fmt.type =
V4L2_BUF_TYPE_VIDEO_OUTPUT; V4L2_BUF_TYPE_VIDEO_OUTPUT;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &ch->video_dev->flags);
ch->video_dev->lock = &common->lock; ch->video_dev->lock = &common->lock;
/* register video device */ /* register video device */
......
...@@ -2495,6 +2495,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, ...@@ -2495,6 +2495,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->debug = video_debug; vfd->debug = video_debug;
vfd->lock = &dev->lock; vfd->lock = &dev->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
snprintf(vfd->name, sizeof(vfd->name), "%s %s", snprintf(vfd->name, sizeof(vfd->name), "%s %s",
dev->name, type_name); dev->name, type_name);
......
...@@ -1544,6 +1544,10 @@ static int __devinit viu_of_probe(struct platform_device *op) ...@@ -1544,6 +1544,10 @@ static int __devinit viu_of_probe(struct platform_device *op)
/* initialize locks */ /* initialize locks */
mutex_init(&viu_dev->lock); mutex_init(&viu_dev->lock);
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &viu_dev->vdev->flags);
viu_dev->vdev->lock = &viu_dev->lock; viu_dev->vdev->lock = &viu_dev->lock;
spin_lock_init(&viu_dev->slock); spin_lock_init(&viu_dev->slock);
......
...@@ -228,6 +228,10 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) ...@@ -228,6 +228,10 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
s->vdev->release = video_device_release; s->vdev->release = video_device_release;
s->vdev->tvnorms = V4L2_STD_ALL; s->vdev->tvnorms = V4L2_STD_ALL;
s->vdev->lock = &itv->serialize_lock; s->vdev->lock = &itv->serialize_lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &s->vdev->flags);
set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags); set_bit(V4L2_FL_USE_FH_PRIO, &s->vdev->flags);
ivtv_set_funcs(s->vdev); ivtv_set_funcs(s->vdev);
return 0; return 0;
......
...@@ -958,6 +958,10 @@ static int m2mtest_probe(struct platform_device *pdev) ...@@ -958,6 +958,10 @@ static int m2mtest_probe(struct platform_device *pdev)
} }
*vfd = m2mtest_videodev; *vfd = m2mtest_videodev;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->lock = &dev->dev_mutex; vfd->lock = &dev->dev_mutex;
ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0); ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
......
...@@ -904,6 +904,10 @@ static int emmaprp_probe(struct platform_device *pdev) ...@@ -904,6 +904,10 @@ static int emmaprp_probe(struct platform_device *pdev)
} }
*vfd = emmaprp_videodev; *vfd = emmaprp_videodev;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->lock = &pcdev->dev_mutex; vfd->lock = &pcdev->dev_mutex;
video_set_drvdata(vfd, pcdev); video_set_drvdata(vfd, pcdev);
......
...@@ -1948,6 +1948,10 @@ static int s2255_probe_v4l(struct s2255_dev *dev) ...@@ -1948,6 +1948,10 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
/* register 4 video devices */ /* register 4 video devices */
channel->vdev = template; channel->vdev = template;
channel->vdev.lock = &dev->lock; channel->vdev.lock = &dev->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &channel->vdev.flags);
channel->vdev.v4l2_dev = &dev->v4l2_dev; channel->vdev.v4l2_dev = &dev->v4l2_dev;
video_set_drvdata(&channel->vdev, channel); video_set_drvdata(&channel->vdev, channel);
if (video_nr == -1) if (video_nr == -1)
......
...@@ -1516,6 +1516,10 @@ int fimc_register_capture_device(struct fimc_dev *fimc, ...@@ -1516,6 +1516,10 @@ int fimc_register_capture_device(struct fimc_dev *fimc,
vfd->minor = -1; vfd->minor = -1;
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->lock = &fimc->lock; vfd->lock = &fimc->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
video_set_drvdata(vfd, fimc); video_set_drvdata(vfd, fimc);
vid_cap = &fimc->vid_cap; vid_cap = &fimc->vid_cap;
......
...@@ -1520,6 +1520,10 @@ int fimc_register_m2m_device(struct fimc_dev *fimc, ...@@ -1520,6 +1520,10 @@ int fimc_register_m2m_device(struct fimc_dev *fimc,
vfd->minor = -1; vfd->minor = -1;
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->lock = &fimc->lock; vfd->lock = &fimc->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
snprintf(vfd->name, sizeof(vfd->name), "%s.m2m", dev_name(&pdev->dev)); snprintf(vfd->name, sizeof(vfd->name), "%s.m2m", dev_name(&pdev->dev));
video_set_drvdata(vfd, fimc); video_set_drvdata(vfd, fimc);
......
...@@ -762,6 +762,10 @@ static int g2d_probe(struct platform_device *pdev) ...@@ -762,6 +762,10 @@ static int g2d_probe(struct platform_device *pdev)
goto unreg_v4l2_dev; goto unreg_v4l2_dev;
} }
*vfd = g2d_videodev; *vfd = g2d_videodev;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->lock = &dev->mutex; vfd->lock = &dev->mutex;
ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0); ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
if (ret) { if (ret) {
......
...@@ -1386,6 +1386,10 @@ static int s5p_jpeg_probe(struct platform_device *pdev) ...@@ -1386,6 +1386,10 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
jpeg->vfd_encoder->release = video_device_release; jpeg->vfd_encoder->release = video_device_release;
jpeg->vfd_encoder->lock = &jpeg->lock; jpeg->vfd_encoder->lock = &jpeg->lock;
jpeg->vfd_encoder->v4l2_dev = &jpeg->v4l2_dev; jpeg->vfd_encoder->v4l2_dev = &jpeg->v4l2_dev;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &jpeg->vfd_encoder->flags);
ret = video_register_device(jpeg->vfd_encoder, VFL_TYPE_GRABBER, -1); ret = video_register_device(jpeg->vfd_encoder, VFL_TYPE_GRABBER, -1);
if (ret) { if (ret) {
...@@ -1413,6 +1417,10 @@ static int s5p_jpeg_probe(struct platform_device *pdev) ...@@ -1413,6 +1417,10 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
jpeg->vfd_decoder->release = video_device_release; jpeg->vfd_decoder->release = video_device_release;
jpeg->vfd_decoder->lock = &jpeg->lock; jpeg->vfd_decoder->lock = &jpeg->lock;
jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev; jpeg->vfd_decoder->v4l2_dev = &jpeg->v4l2_dev;
/* Locking in file operations other than ioctl should be done by the driver,
not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &jpeg->vfd_decoder->flags);
ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1); ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1);
if (ret) { if (ret) {
......
...@@ -1048,6 +1048,10 @@ static int s5p_mfc_probe(struct platform_device *pdev) ...@@ -1048,6 +1048,10 @@ static int s5p_mfc_probe(struct platform_device *pdev)
vfd->ioctl_ops = get_dec_v4l2_ioctl_ops(); vfd->ioctl_ops = get_dec_v4l2_ioctl_ops();
vfd->release = video_device_release, vfd->release = video_device_release,
vfd->lock = &dev->mfc_mutex; vfd->lock = &dev->mfc_mutex;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->v4l2_dev = &dev->v4l2_dev; vfd->v4l2_dev = &dev->v4l2_dev;
snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_DEC_NAME); snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_DEC_NAME);
dev->vfd_dec = vfd; dev->vfd_dec = vfd;
...@@ -1072,6 +1076,8 @@ static int s5p_mfc_probe(struct platform_device *pdev) ...@@ -1072,6 +1076,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
vfd->ioctl_ops = get_enc_v4l2_ioctl_ops(); vfd->ioctl_ops = get_enc_v4l2_ioctl_ops();
vfd->release = video_device_release, vfd->release = video_device_release,
vfd->lock = &dev->mfc_mutex; vfd->lock = &dev->mfc_mutex;
/* This should not be necessary */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
vfd->v4l2_dev = &dev->v4l2_dev; vfd->v4l2_dev = &dev->v4l2_dev;
snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_ENC_NAME); snprintf(vfd->name, sizeof(vfd->name), "%s", S5P_MFC_ENC_NAME);
dev->vfd_enc = vfd; dev->vfd_enc = vfd;
......
...@@ -1069,6 +1069,10 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, ...@@ -1069,6 +1069,10 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
set_bit(V4L2_FL_USE_FH_PRIO, &layer->vfd.flags); set_bit(V4L2_FL_USE_FH_PRIO, &layer->vfd.flags);
video_set_drvdata(&layer->vfd, layer); video_set_drvdata(&layer->vfd, layer);
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &layer->vfd.flags);
layer->vfd.lock = &layer->mutex; layer->vfd.lock = &layer->mutex;
layer->vfd.v4l2_dev = &mdev->v4l2_dev; layer->vfd.v4l2_dev = &mdev->v4l2_dev;
......
...@@ -1390,6 +1390,10 @@ static int __devinit sh_vou_probe(struct platform_device *pdev) ...@@ -1390,6 +1390,10 @@ static int __devinit sh_vou_probe(struct platform_device *pdev)
vdev->v4l2_dev = &vou_dev->v4l2_dev; vdev->v4l2_dev = &vou_dev->v4l2_dev;
vdev->release = video_device_release; vdev->release = video_device_release;
vdev->lock = &vou_dev->fop_lock; vdev->lock = &vou_dev->fop_lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags);
vou_dev->vdev = vdev; vou_dev->vdev = vdev;
video_set_drvdata(vdev, vou_dev); video_set_drvdata(vdev, vou_dev);
......
...@@ -1425,6 +1425,10 @@ static int video_dev_create(struct soc_camera_device *icd) ...@@ -1425,6 +1425,10 @@ static int video_dev_create(struct soc_camera_device *icd)
vdev->tvnorms = V4L2_STD_UNKNOWN; vdev->tvnorms = V4L2_STD_UNKNOWN;
vdev->ctrl_handler = &icd->ctrl_handler; vdev->ctrl_handler = &icd->ctrl_handler;
vdev->lock = &icd->video_lock; vdev->lock = &icd->video_lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags);
icd->vdev = vdev; icd->vdev = vdev;
......
...@@ -1731,6 +1731,10 @@ static struct video_device *vdev_init(struct tm6000_core *dev, ...@@ -1731,6 +1731,10 @@ static struct video_device *vdev_init(struct tm6000_core *dev,
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->debug = tm6000_debug; vfd->debug = tm6000_debug;
vfd->lock = &dev->lock; vfd->lock = &dev->lock;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
......
...@@ -1296,6 +1296,10 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision, ...@@ -1296,6 +1296,10 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
if (NULL == vdev) if (NULL == vdev)
return NULL; return NULL;
*vdev = *vdev_template; *vdev = *vdev_template;
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags);
vdev->lock = &usbvision->v4l2_lock; vdev->lock = &usbvision->v4l2_lock;
vdev->v4l2_dev = &usbvision->v4l2_dev; vdev->v4l2_dev = &usbvision->v4l2_dev;
snprintf(vdev->name, sizeof(vdev->name), "%s", name); snprintf(vdev->name, sizeof(vdev->name), "%s", name);
......
...@@ -274,11 +274,12 @@ static ssize_t v4l2_read(struct file *filp, char __user *buf, ...@@ -274,11 +274,12 @@ static ssize_t v4l2_read(struct file *filp, char __user *buf,
if (!vdev->fops->read) if (!vdev->fops->read)
return -EINVAL; return -EINVAL;
if (vdev->lock && mutex_lock_interruptible(vdev->lock)) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags) &&
mutex_lock_interruptible(vdev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (video_is_registered(vdev)) if (video_is_registered(vdev))
ret = vdev->fops->read(filp, buf, sz, off); ret = vdev->fops->read(filp, buf, sz, off);
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
return ret; return ret;
} }
...@@ -291,11 +292,12 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf, ...@@ -291,11 +292,12 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
if (!vdev->fops->write) if (!vdev->fops->write)
return -EINVAL; return -EINVAL;
if (vdev->lock && mutex_lock_interruptible(vdev->lock)) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags) &&
mutex_lock_interruptible(vdev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (video_is_registered(vdev)) if (video_is_registered(vdev))
ret = vdev->fops->write(filp, buf, sz, off); ret = vdev->fops->write(filp, buf, sz, off);
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
return ret; return ret;
} }
...@@ -307,11 +309,11 @@ static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll) ...@@ -307,11 +309,11 @@ static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll)
if (!vdev->fops->poll) if (!vdev->fops->poll)
return DEFAULT_POLLMASK; return DEFAULT_POLLMASK;
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_lock(vdev->lock); mutex_lock(vdev->lock);
if (video_is_registered(vdev)) if (video_is_registered(vdev))
ret = vdev->fops->poll(filp, poll); ret = vdev->fops->poll(filp, poll);
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
return ret; return ret;
} }
...@@ -399,11 +401,12 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm) ...@@ -399,11 +401,12 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
if (!vdev->fops->mmap) if (!vdev->fops->mmap)
return ret; return ret;
if (vdev->lock && mutex_lock_interruptible(vdev->lock)) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags) &&
mutex_lock_interruptible(vdev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (video_is_registered(vdev)) if (video_is_registered(vdev))
ret = vdev->fops->mmap(filp, vm); ret = vdev->fops->mmap(filp, vm);
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
return ret; return ret;
} }
...@@ -426,7 +429,8 @@ static int v4l2_open(struct inode *inode, struct file *filp) ...@@ -426,7 +429,8 @@ static int v4l2_open(struct inode *inode, struct file *filp)
video_get(vdev); video_get(vdev);
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
if (vdev->fops->open) { if (vdev->fops->open) {
if (vdev->lock && mutex_lock_interruptible(vdev->lock)) { if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags) &&
mutex_lock_interruptible(vdev->lock)) {
ret = -ERESTARTSYS; ret = -ERESTARTSYS;
goto err; goto err;
} }
...@@ -434,7 +438,7 @@ static int v4l2_open(struct inode *inode, struct file *filp) ...@@ -434,7 +438,7 @@ static int v4l2_open(struct inode *inode, struct file *filp)
ret = vdev->fops->open(filp); ret = vdev->fops->open(filp);
else else
ret = -ENODEV; ret = -ENODEV;
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
} }
...@@ -452,10 +456,10 @@ static int v4l2_release(struct inode *inode, struct file *filp) ...@@ -452,10 +456,10 @@ static int v4l2_release(struct inode *inode, struct file *filp)
int ret = 0; int ret = 0;
if (vdev->fops->release) { if (vdev->fops->release) {
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_lock(vdev->lock); mutex_lock(vdev->lock);
vdev->fops->release(filp); vdev->fops->release(filp);
if (vdev->lock) if (test_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags))
mutex_unlock(vdev->lock); mutex_unlock(vdev->lock);
} }
/* decrease the refcount unconditionally since the release() /* decrease the refcount unconditionally since the release()
...@@ -831,6 +835,10 @@ int __video_register_device(struct video_device *vdev, int type, int nr, ...@@ -831,6 +835,10 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
WARN_ON(video_device[vdev->minor] != NULL); WARN_ON(video_device[vdev->minor] != NULL);
vdev->index = get_index(vdev); vdev->index = get_index(vdev);
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
/* if no lock was passed, then make sure the LOCK_ALL_FOPS bit is
clear and warn if it wasn't. */
if (vdev->lock == NULL)
WARN_ON(test_and_clear_bit(V4L2_FL_LOCK_ALL_FOPS, &vdev->flags));
if (vdev->ioctl_ops) if (vdev->ioctl_ops)
determine_valid_ioctls(vdev); determine_valid_ioctls(vdev);
......
...@@ -898,6 +898,10 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -898,6 +898,10 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
INIT_LIST_HEAD(&pd->dmaq); INIT_LIST_HEAD(&pd->dmaq);
mutex_init(&pd->mux); mutex_init(&pd->mux);
pd->vdev->lock = &pd->mux; /* for locking v4l2_file_operations */ pd->vdev->lock = &pd->mux; /* for locking v4l2_file_operations */
/* Locking in file operations other than ioctl should be done
by the driver, not the V4L2 core.
This driver needs auditing so that this flag can be removed. */
set_bit(V4L2_FL_LOCK_ALL_FOPS, &pd->vdev->flags);
spin_lock_init(&pd->lock); spin_lock_init(&pd->lock);
pd->csr2 = csr2_init; pd->csr2 = csr2_init;
pd->config = config_init; pd->config = config_init;
......
...@@ -39,6 +39,9 @@ struct v4l2_ctrl_handler; ...@@ -39,6 +39,9 @@ struct v4l2_ctrl_handler;
#define V4L2_FL_USES_V4L2_FH (1) #define V4L2_FL_USES_V4L2_FH (1)
/* Use the prio field of v4l2_fh for core priority checking */ /* Use the prio field of v4l2_fh for core priority checking */
#define V4L2_FL_USE_FH_PRIO (2) #define V4L2_FL_USE_FH_PRIO (2)
/* If ioctl core locking is in use, then apply that also to all
file operations. */
#define V4L2_FL_LOCK_ALL_FOPS (3)
/* Priority helper functions */ /* Priority helper functions */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment