Re: [PATCH] media: v4l2-mem2mem: fix mem order in last buf
From: Hsia-Jun Li
Date: Wed Feb 21 2024 - 05:37:25 EST
On 2/17/24 03:09, Nicolas Dufresne wrote:
CAUTION: Email originated externally, do not click links or open attachments unless you recognize the sender and know the content is safe.
Le jeudi 15 février 2024 à 09:41 +0100, Hans Verkuil a écrit :
On 15/02/2024 04:16, Randy Li wrote:
On 2024/2/15 04:38, Nicolas Dufresne wrote:
Hi,
media: v4l2-mem2mem: fix mem order in last buf
mem order ? Did you mean call order ?
std::memory_order
Le dimanche 11 février 2024 à 02:04 +0800, Hsia-Jun Li a écrit :
From: "Hsia-Jun(Randy) Li" <randy.li@xxxxxxxxxxxxx>
The has_stopped property in struct v4l2_m2m_ctx is operated
without a lock protecction. Then the userspace calls to
protection When ? ~~
Access to those 3 booleans you mentioned later.
v4l2_m2m_encoder_cmd()/v4l2_m2m_decoder_cmd() may lead to
a critical section issue.
As there is no locking, there is no critical section, perhaps a better phrasing
could help.
"concurrent accesses to shared resources can lead to unexpected or erroneous behavior, so parts of the program where the shared resource is accessed need to be protected in ways that avoid the
concurrent access."
It didn't say we need a lock here.
Signed-off-by: Hsia-Jun(Randy) Li <randy.li@xxxxxxxxxxxxx>
---
drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 75517134a5e9..f1de71031e02 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -635,9 +635,9 @@ void v4l2_m2m_last_buffer_done(struct v4l2_m2m_ctx *m2m_ctx,
struct vb2_v4l2_buffer *vbuf)
{
vbuf->flags |= V4L2_BUF_FLAG_LAST;
- vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
-
v4l2_m2m_mark_stopped(m2m_ctx);
+
+ vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
While it most likely fix the issue while testing, since userspace most likely
polls on that queue and don't touch the driver until the poll was signalled, I
strongly believe this is insufficient. When I look at vicodec and wave5, they
both add a layer of locking on top of the mem2mem framework to fix this issue.
Maybe a memory barrier is enough. Since vb2_buffer_done() itself would invoke the (spin)lock operation.
When the poll() returns in userspace, the future operation for those three boolean variables won't happen before the lock.
I think this is unfortunate, but v4l2_m2m_mark_stopped() is backed by 3 booleans
accessed in many places that aren't in any known atomic context. I think it
would be nice to remove the spurious locking in drivers and try and fix this
issue in the framework itself.
I tend to not introduce more locks here. There is a spinlock in m2m_ctx which is a pain in the ass, something we could reuse it to save our CPU but it just can't be access.
I think the root cause is something else.
Let me say first of all that swapping the order of the two calls does make sense:
before returning the buffer you want to mark the queue as stopped.
But the real problem is that for drivers using the mem2mem framework the streaming
ioctls can be serialized with a different lock than the VIDIOC_DE/ENCODER_CMD ioctls.
The reason for that is that those two ioctls are not marked with INFO_FL_QUEUE,
but I think they should. These ioctls are really part of the streaming ioctls
and should all use the same lock.
Note that for many drivers the same mutex is used for the streaming ioctls as for
all other ioctls, but it looks like at least the venus driver uses separate mutexes.
But I saw many drivers didn't assign that q_lock here. I am an one.
Since it is an optional mutex lock.
With that change in v4l2-core/v4l2-ioctl.c I don't believe any locking is needed,
since it should always be serialized by the same top-level mutex.
The v4l2_ioctl_get_lock() function in v4l2-ioctl.c is the one that selects which
mutex to use for a given ioctl.
There was no way to comply with the spec without accessing that state in the irq
thread in Wave5. In that case, we need to decide if we continue or cancel a
dynamic resolution change.
if (!v4l2_m2m_has_stopped(m2m_ctx)) {
switch_state(inst, VPU_INST_STATE_STOP);
if (dec_info.sequence_changed)
handle_dynamic_resolution_change(inst);
else
send_eos_event(inst);
flag_last_buffer_done(inst);
}
That forced us to introduce a spinlock to protect that state in that driver.
Usually we won't do buffer operation in the irq handler context. It
causes too many times,
But that makes a point. Sometimes, I can't just introduce that a mutex,
while most of the m2m context has acquired a spinlock.
As for locking cmd_start, that might help, its certainly a behaviour change and
will have to be taken with care. How does the ioctl lock interact with blocking
QBUF notably ?
Nicolas
Regards,
Hans
Nicolas
}
EXPORT_SYMBOL_GPL(v4l2_m2m_last_buffer_done);
--
Hsia-Jun(Randy) Li