Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef009fe2 authored by Yunfei Dong's avatar Yunfei Dong Committed by Greg Kroah-Hartman
Browse files

media: v4l2-mem2mem: add lock to protect parameter num_rdy 



[ Upstream commit 56b5c3e67b0f9af3f45cf393be048ee8d8a92694 ]

Getting below error when using KCSAN to check the driver. Adding lock to
protect parameter num_rdy when getting the value with function:
v4l2_m2m_num_src_bufs_ready/v4l2_m2m_num_dst_bufs_ready.

kworker/u16:3: [name:report&]BUG: KCSAN: data-race in v4l2_m2m_buf_queue
kworker/u16:3: [name:report&]

kworker/u16:3: [name:report&]read-write to 0xffffff8105f35b94 of 1 bytes by task 20865 on cpu 7:
kworker/u16:3:  v4l2_m2m_buf_queue+0xd8/0x10c

Signed-off-by: default avatarPina Chen <pina.chen@mediatek.com>
Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2a8807f9

include/media/v4l2-mem2mem.h

+16 −2
Original line number Diff line number Diff line
@@ -401,7 +401,14 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, 
static inline

unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)

{

	return m2m_ctx->out_q_ctx.num_rdy;

	unsigned int num_buf_rdy;

	unsigned long flags;



	spin_lock_irqsave(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);

	num_buf_rdy = m2m_ctx->out_q_ctx.num_rdy;

	spin_unlock_irqrestore(&m2m_ctx->out_q_ctx.rdy_spinlock, flags);



	return num_buf_rdy;

}



/**
@@ -413,7 +420,14 @@ unsigned int v4l2_m2m_num_src_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx) 
static inline

unsigned int v4l2_m2m_num_dst_bufs_ready(struct v4l2_m2m_ctx *m2m_ctx)

{

	return m2m_ctx->cap_q_ctx.num_rdy;

	unsigned int num_buf_rdy;

	unsigned long flags;



	spin_lock_irqsave(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);

	num_buf_rdy = m2m_ctx->cap_q_ctx.num_rdy;

	spin_unlock_irqrestore(&m2m_ctx->cap_q_ctx.rdy_spinlock, flags);



	return num_buf_rdy;

}



/**