Commit c44027c8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: add snd_card_disconnect_sync() 



In case of user unbind ALSA driver during playing back / capturing,
each driver needs to stop and remove it correctly. One note here is
that we can't cancel from remove function in such case, because
unbind operation doesn't check return value from remove function.
So, we *must* stop and remove in this case.

For this purpose, we need to sync (= wait) until the all top-level
operations are canceled at remove function.
For example, snd_card_free() processes the disconnection procedure at
first, then waits for the completion. That's how the hot-unplug works
safely. It's implemented, at least, in the top-level driver removal.

Now for the lower level driver, we need a similar strategy. Notify to
the toplevel for hot-unplug (disconnect in ALSA), and sync with the
stop operation, then continue the rest of its own remove procedure.

This patch adds snd_card_disconnect_sync(), and driver can use it from
remove function.

Note: the "lower level" driver here refers to a middle layer driver
(e.g. ASoC components) that can be unbound freely during operation.
Most of legacy ALSA helper drivers don't have such a problem because
they can't be unbound.

Note#2: snd_card_disconnect_sync() merely calls snd_card_disconnect()
and syncs with closing all pending files.  It takes only the files
opened by user-space into account, and doesn't care about object
refcounts.  (The latter is handled by snd_card_free() completion call,
BTW.)  Also, the function doesn't free resources by itself.

Tested-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8a5776a5

include/sound/core.h

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct snd_card { 
	struct device card_dev;		/* cardX object for sysfs */

	const struct attribute_group *dev_groups[4]; /* assigned sysfs attr */

	bool registered;		/* card_dev is registered? */

	wait_queue_head_t remove_sleep;



#ifdef CONFIG_PM

	unsigned int power_state;	/* power state */
@@ -240,6 +241,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid, 
		 struct snd_card **card_ret);



int snd_card_disconnect(struct snd_card *card);

void snd_card_disconnect_sync(struct snd_card *card);

int snd_card_free(struct snd_card *card);

int snd_card_free_when_closed(struct snd_card *card);

void snd_card_set_id(struct snd_card *card, const char *id);

sound/core/init.c

+32 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid, 
#ifdef CONFIG_PM

	init_waitqueue_head(&card->power_sleep);

#endif

	init_waitqueue_head(&card->remove_sleep);



	device_initialize(&card->card_dev);

	card->card_dev.parent = parent;
@@ -452,6 +453,35 @@ int snd_card_disconnect(struct snd_card *card) 
}

EXPORT_SYMBOL(snd_card_disconnect);



/**

 * snd_card_disconnect_sync - disconnect card and wait until files get closed

 * @card: card object to disconnect

 *

 * This calls snd_card_disconnect() for disconnecting all belonging components

 * and waits until all pending files get closed.

 * It assures that all accesses from user-space finished so that the driver

 * can release its resources gracefully.

 */

void snd_card_disconnect_sync(struct snd_card *card)

{

	int err;



	err = snd_card_disconnect(card);

	if (err < 0) {

		dev_err(card->dev,

			"snd_card_disconnect error (%d), skipping sync\n",

			err);

		return;

	}



	spin_lock_irq(&card->files_lock);

	wait_event_lock_irq(card->remove_sleep,

			    list_empty(&card->files_list),

			    card->files_lock);

	spin_unlock_irq(&card->files_lock);

}

EXPORT_SYMBOL_GPL(snd_card_disconnect_sync);



static int snd_card_do_free(struct snd_card *card)

{

#if IS_ENABLED(CONFIG_SND_MIXER_OSS)
@@ -957,6 +987,8 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) 
			break;

		}

	}

	if (list_empty(&card->files_list))

		wake_up_all(&card->remove_sleep);

	spin_unlock(&card->files_lock);

	if (!found) {

		dev_err(card->dev, "card file remove problem (%p)\n", file);

CRA Git | Maintained and supported by SUSTech CRA and CCSE