mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3 1/2] staging: most: video: Protect pending_mbos and mute with list_lock
@ 2026-11-17 17:05 Shivani Patel
  2026-11-17 17:05 ` [PATCH v3 2/2] staging: most: video: Document locks in struct most_video_dev Shivani Patel
  0 siblings, 1 reply; 2+ messages in thread
From: Shivani Patel @ 2026-11-17 17:05 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Parthiban Veerasooran, Christian Gromm
  Cc: linux-staging, linux-kernel, Dan Carpenter, Andy Shevchenko,
	Julia Lawall, Shivani Patel

data_ready() and get_top_mbo() read mdev->pending_mbos without holding
mdev->list_lock, racing with comp_rx_data() which modifies the list
under mdev->list_lock. Also, comp_vdev_close() clears mdev->mute without
holding mdev->list_lock.

Acquire mdev->list_lock in data_ready(), get_top_mbo(), and when
clearing mdev->mute in comp_vdev_close(). Use list_first_entry_or_null()
in get_top_mbo() so comp_vdev_read() can drop the redundant data_ready()
check inside the read loop.

Signed-off-by: Shivani Patel <patelshivani2283@gmail.com>
---
v3:
 - New patch added after inspecting list_lock usage per Dan Carpenter's
   review of v2.

 drivers/staging/most/video/video.c | 34 ++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index 3a0445ff6..92d5fbc9a 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -60,14 +60,27 @@ static inline struct comp_fh *to_comp_fh(struct file *filp)
 static LIST_HEAD(video_devices);
 static DEFINE_SPINLOCK(list_lock);
 
-static inline bool data_ready(struct most_video_dev *mdev)
+static bool data_ready(struct most_video_dev *mdev)
 {
-	return !list_empty(&mdev->pending_mbos);
+	unsigned long flags;
+	bool ready;
+
+	spin_lock_irqsave(&mdev->list_lock, flags);
+	ready = !list_empty(&mdev->pending_mbos);
+	spin_unlock_irqrestore(&mdev->list_lock, flags);
+
+	return ready;
 }
 
-static inline struct mbo *get_top_mbo(struct most_video_dev *mdev)
+static struct mbo *get_top_mbo(struct most_video_dev *mdev)
 {
-	return list_first_entry(&mdev->pending_mbos, struct mbo, list);
+	struct mbo *mbo;
+
+	spin_lock_irq(&mdev->list_lock);
+	mbo = list_first_entry_or_null(&mdev->pending_mbos, struct mbo, list);
+	spin_unlock_irq(&mdev->list_lock);
+
+	return mbo;
 }
 
 static int comp_vdev_open(struct file *filp)
@@ -143,7 +156,9 @@ static int comp_vdev_close(struct file *filp)
 	}
 
 	most_stop_channel(mdev->iface, mdev->ch_idx, &comp);
+	spin_lock_irq(&mdev->list_lock);
 	mdev->mute = false;
+	spin_unlock_irq(&mdev->list_lock);
 
 	v4l2_fh_del(&fh->fh, filp);
 	v4l2_fh_exit(&fh->fh);
@@ -175,10 +190,15 @@ static ssize_t comp_vdev_read(struct file *filp, char __user *buf,
 	if (!data_ready(mdev))
 		return -EAGAIN;
 
-	while (count > 0 && data_ready(mdev)) {
+	while (count > 0) {
 		struct mbo *const mbo = get_top_mbo(mdev);
-		int const rem = mbo->processed_length - fh->offs;
-		int const cnt = rem < count ? rem : count;
+		int rem, cnt;
+
+		if (!mbo)
+			break;
+
+		rem = mbo->processed_length - fh->offs;
+		cnt = rem < count ? rem : count;
 
 		if (copy_to_user(buf, mbo->virt_address + fh->offs, cnt)) {
 			v4l2_err(&mdev->v4l2_dev, "read: copy_to_user failed\n");
-- 
2.50.1 (Apple Git-155)


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH v3 2/2] staging: most: video: Document locks in struct most_video_dev
  2026-11-17 17:05 [PATCH v3 1/2] staging: most: video: Protect pending_mbos and mute with list_lock Shivani Patel
@ 2026-11-17 17:05 ` Shivani Patel
  0 siblings, 0 replies; 2+ messages in thread
From: Shivani Patel @ 2026-11-17 17:05 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Parthiban Veerasooran, Christian Gromm
  Cc: linux-staging, linux-kernel, Dan Carpenter, Andy Shevchenko,
	Julia Lawall, Shivani Patel

checkpatch.pl reports that list_lock and lock in struct most_video_dev
are defined without a comment.

list_lock protects pending_mbos and mute across all callers. lock is
assigned to vdev->lock and is used by the V4L2 core to serialize ioctls.

Add short comments describing what each lock protects.

Signed-off-by: Shivani Patel <patelshivani2283@gmail.com>
---
v3:
 - Reword list_lock comment to "Protects @pending_mbos and @mute" instead of
   singling out the rx completion path (Dan Carpenter)
 - Split out locking fixes into patch 1/2

v2:
 - Add a commit message and Signed-off-by (Andy Shevchenko)
 - Use the "staging: most: video:" subject prefix
 - Make the comments shorter and accurate
 - Drop the outreachy list (Julia Lawall)

 drivers/staging/most/video/video.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index 92d5fbc9a..02a44659a 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -33,6 +33,7 @@ struct most_video_dev {
 	bool mute;
 
 	struct list_head pending_mbos;
+	/* Protects @pending_mbos and @mute */
 	spinlock_t list_lock;
 
 	struct v4l2_device v4l2_dev;
@@ -40,6 +41,7 @@ struct most_video_dev {
 	struct video_device *vdev;
 	unsigned int ctrl_input;
 
+	/* Serializes V4L2 ioctls, used as the video_device lock */
 	struct mutex lock;
 
 	wait_queue_head_t wait_data;
-- 
2.50.1 (Apple Git-155)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-17 17:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 17:05 [PATCH v3 1/2] staging: most: video: Protect pending_mbos and mute with list_lock Shivani Patel
2026-11-17 17:05 ` [PATCH v3 2/2] staging: most: video: Document locks in struct most_video_dev Shivani Patel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®