Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] v4l2: move tracepoints to video_usercopy

Browse Source 
The (d)qbuf ioctls were traced in the low-level v4l2 ioctl function. The
trace was outside the serialization lock, so that can affect the usefulness
of the timing. In addition, the __user pointer was expected instead of a
proper kernel pointer.

By moving the tracepoints to video_usercopy we ensure that the trace calls
use the correct kernel pointer, and that it happens right after the ioctl
call to the driver, so certainly inside the serialization lock.

In addition, we only trace if the call was successful.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Wade Farnsworth <wade_farnsworth@mentor.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil 2013-12-16 05:45:37 -03:00 committed by Mauro Carvalho Chehab
parent 3fe6d4b962
commit aa32f4c0bc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/v4l2-core/v4l2-dev.c
View File

@ -31,10 +31,6 @@
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#define CREATE_TRACE_POINTS
#include <trace/events/v4l2.h>
#define VIDEO_NUM_DEVICES 256
#define VIDEO_NAME "video4linux"
@ -395,11 +391,6 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
} else
ret = -ENOTTY;
if (cmd == VIDIOC_DQBUF)
trace_v4l2_dqbuf(vdev->minor, (struct v4l2_buffer *)arg);
else if (cmd == VIDIOC_QBUF)
trace_v4l2_qbuf(vdev->minor, (struct v4l2_buffer *)arg);
return ret;
}

9
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -28,6 +28,9 @@
#include <media/v4l2-device.h>
#include <media/videobuf2-core.h>
#define CREATE_TRACE_POINTS
#include <trace/events/v4l2.h>
/* Zero out the end of the struct pointed to by p. Everything after, but
* not including, the specified field is cleared. */
#define CLEAR_AFTER_FIELD(p, field) \
@ -2338,6 +2341,12 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
err = func(file, cmd, parg);
if (err == -ENOIOCTLCMD)
err = -ENOTTY;
if (err == 0) {
if (cmd == VIDIOC_DQBUF)
trace_v4l2_dqbuf(video_devdata(file)->minor, parg);
else if (cmd == VIDIOC_QBUF)
trace_v4l2_qbuf(video_devdata(file)->minor, parg);
}
if (has_array_args) {
*kernel_ptr = user_ptr;