Commit 7b42cfaf authored Aug 20, 2017 by Takashi Sakamoto Committed by Takashi Iwai Aug 20, 2017

ALSA: control: queue events within locking of controls_rwsem for ELEM_WRITE operation

Any control event is queued by a call of snd_ctl_notify(). This function
adds the event to each queue of opened file data corresponding to ALSA
control character devices. This function acquired two types of lock; a
counting semaphore for a list of the opened file data and a spinlock for
card data opened by the file. Typically, this function is called after
acquiring a counting semaphore for a list of elements in the card data.

In current implementation of a handler for ELEM_WRITE request, the
function is called after releasing the semaphore for a list of elements
in the card data. This release is not necessarily needed.

This commit removes the release to call the function within the critical
section so that later commits are simple.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 31cb1fb4

sound/core/control.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -948,9 +948,8 @@ static int snd_ctl_elem_write(struct snd_card card, struct snd_ctl_file file,
		}
		if (result > 0) {
		struct snd_ctl_elem_id id = control->id;
		up_read(&card->controls_rwsem);
		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &id);
		return 0;
		result = 0;
		}
		}
		up_read(&card->controls_rwsem);

Admin message