github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: seq: oss/midi: Cleanup with guard and auto-cleanup

Browse Source 
Use the auto-cleanup for the refcount management of seq_oss_midi
object.  The explicit call of snd_use_lock_free() is dropped by the
magic __free(seq_oss_midi) attribute.

Along with that, replace the manual mutex and spin locks with
guard().

Only code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250827080520.7544-10-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-27 10:05:15 +02:00
parent 1291fc664d
commit 895a46e034
1 changed files with 36 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
sound/core/seq/oss/seq_oss_midi.c
View File

@ -40,6 +40,7 @@ struct seq_oss_midi {
struct mutex open_mutex; struct mutex open_mutex;
}; };
DEFINE_FREE(seq_oss_midi, struct seq_oss_midi *, if (!IS_ERR_OR_NULL(_T)) snd_use_lock_free(&(_T)->use_lock))
/* /*
* midi device table * midi device table
@ -90,13 +91,11 @@ static struct seq_oss_midi *
get_mdev(int dev) get_mdev(int dev)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags;
spin_lock_irqsave(&register_lock, flags); guard(spinlock_irqsave)(&register_lock);
mdev = midi_devs[dev]; mdev = midi_devs[dev];
if (mdev) if (mdev)
snd_use_lock_use(&mdev->use_lock); snd_use_lock_use(&mdev->use_lock);
spin_unlock_irqrestore(&register_lock, flags);
return mdev; return mdev;
} }
@ -108,19 +107,16 @@ find_slot(int client, int port)
{ {
int i; int i;
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags;
spin_lock_irqsave(&register_lock, flags); guard(spinlock_irqsave)(&register_lock);
for (i = 0; i < max_midi_devs; i++) { for (i = 0; i < max_midi_devs; i++) {
mdev = midi_devs[i]; mdev = midi_devs[i];
if (mdev && mdev->client == client && mdev->port == port) { if (mdev && mdev->client == client && mdev->port == port) {
/* found! */ /* found! */
snd_use_lock_use(&mdev->use_lock); snd_use_lock_use(&mdev->use_lock);
spin_unlock_irqrestore(&register_lock, flags);
return mdev; return mdev;
} }
} }
spin_unlock_irqrestore(&register_lock, flags);
return NULL; return NULL;
} }
@ -135,7 +131,6 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)
{ {
int i; int i;
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags;
/* the port must include generic midi */ /* the port must include generic midi */
if (! (pinfo->type & SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC)) if (! (pinfo->type & SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC))
@ -185,14 +180,13 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)
/* /*
* look for en empty slot * look for en empty slot
*/ */
spin_lock_irqsave(&register_lock, flags); guard(spinlock_irqsave)(&register_lock);
for (i = 0; i < max_midi_devs; i++) { for (i = 0; i < max_midi_devs; i++) {
if (midi_devs[i] == NULL) if (midi_devs[i] == NULL)
break; break;
} }
if (i >= max_midi_devs) { if (i >= max_midi_devs) {
if (max_midi_devs >= SNDRV_SEQ_OSS_MAX_MIDI_DEVS) { if (max_midi_devs >= SNDRV_SEQ_OSS_MAX_MIDI_DEVS) {
spin_unlock_irqrestore(&register_lock, flags);
snd_midi_event_free(mdev->coder); snd_midi_event_free(mdev->coder);
kfree(mdev); kfree(mdev);
return -ENOMEM; return -ENOMEM;
@ -201,7 +195,6 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)
} }
mdev->seq_device = i; mdev->seq_device = i;
midi_devs[mdev->seq_device] = mdev; midi_devs[mdev->seq_device] = mdev;
spin_unlock_irqrestore(&register_lock, flags);
return 0; return 0;
} }
@ -213,26 +206,24 @@ int
snd_seq_oss_midi_check_exit_port(int client, int port) snd_seq_oss_midi_check_exit_port(int client, int port)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags;
int index; int index;
mdev = find_slot(client, port); mdev = find_slot(client, port);
if (mdev) { if (mdev) {
spin_lock_irqsave(&register_lock, flags); scoped_guard(spinlock_irqsave, &register_lock) {
midi_devs[mdev->seq_device] = NULL; midi_devs[mdev->seq_device] = NULL;
spin_unlock_irqrestore(&register_lock, flags); }
snd_use_lock_free(&mdev->use_lock); snd_use_lock_free(&mdev->use_lock);
snd_use_lock_sync(&mdev->use_lock); snd_use_lock_sync(&mdev->use_lock);
snd_midi_event_free(mdev->coder); snd_midi_event_free(mdev->coder);
kfree(mdev); kfree(mdev);
} }
spin_lock_irqsave(&register_lock, flags); guard(spinlock_irqsave)(&register_lock);
for (index = max_midi_devs - 1; index >= 0; index--) { for (index = max_midi_devs - 1; index >= 0; index--) {
if (midi_devs[index]) if (midi_devs[index])
break; break;
} }
max_midi_devs = index + 1; max_midi_devs = index + 1;
spin_unlock_irqrestore(&register_lock, flags);
return 0; return 0;
} }
@ -245,9 +236,8 @@ snd_seq_oss_midi_clear_all(void)
{ {
int i; int i;
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev;
unsigned long flags;
spin_lock_irqsave(&register_lock, flags); guard(spinlock_irqsave)(&register_lock);
for (i = 0; i < max_midi_devs; i++) { for (i = 0; i < max_midi_devs; i++) {
mdev = midi_devs[i]; mdev = midi_devs[i];
if (mdev) { if (mdev) {
@ -257,7 +247,6 @@ snd_seq_oss_midi_clear_all(void)
} }
} }
max_midi_devs = 0; max_midi_devs = 0;
spin_unlock_irqrestore(&register_lock, flags);
} }
@ -267,9 +256,8 @@ snd_seq_oss_midi_clear_all(void)
void void
snd_seq_oss_midi_setup(struct seq_oss_devinfo *dp) snd_seq_oss_midi_setup(struct seq_oss_devinfo *dp)
{ {
spin_lock_irq(&register_lock); guard(spinlock_irq)(&register_lock);
dp->max_mididev = max_midi_devs; dp->max_mididev = max_midi_devs;
spin_unlock_irq(&register_lock);
} }
/* /*
@ -317,20 +305,17 @@ int
snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode) snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
{ {
int perm; int perm;
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
struct snd_seq_port_subscribe subs; struct snd_seq_port_subscribe subs;
int err;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
return -ENODEV; return -ENODEV;
mutex_lock(&mdev->open_mutex); guard(mutex)(&mdev->open_mutex);
/* already used? */ /* already used? */
if (mdev->opened && mdev->devinfo != dp) { if (mdev->opened && mdev->devinfo != dp)
err = -EBUSY; return -EBUSY;
goto unlock;
}
perm = 0; perm = 0;
if (is_write_mode(fmode)) if (is_write_mode(fmode))
@ -338,16 +323,12 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
if (is_read_mode(fmode)) if (is_read_mode(fmode))
perm |= PERM_READ; perm |= PERM_READ;
perm &= mdev->flags; perm &= mdev->flags;
if (perm == 0) { if (perm == 0)
err = -ENXIO; return -ENXIO;
goto unlock;
}
/* already opened? */ /* already opened? */
if ((mdev->opened & perm) == perm) { if ((mdev->opened & perm) == perm)
err = 0; return 0;
goto unlock;
}
perm &= ~mdev->opened; perm &= ~mdev->opened;
@ -370,18 +351,11 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
mdev->opened |= PERM_READ; mdev->opened |= PERM_READ;
} }
if (! mdev->opened) { if (!mdev->opened)
err = -ENXIO; return -ENXIO;
goto unlock;
}
mdev->devinfo = dp; mdev->devinfo = dp;
err = 0; return 0;
unlock:
mutex_unlock(&mdev->open_mutex);
snd_use_lock_free(&mdev->use_lock);
return err;
} }
/* /*
@ -390,15 +364,15 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)
int int
snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev) snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
struct snd_seq_port_subscribe subs; struct snd_seq_port_subscribe subs;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
return -ENODEV; return -ENODEV;
mutex_lock(&mdev->open_mutex); guard(mutex)(&mdev->open_mutex);
if (!mdev->opened || mdev->devinfo != dp) if (!mdev->opened || mdev->devinfo != dp)
goto unlock; return 0;
memset(&subs, 0, sizeof(subs)); memset(&subs, 0, sizeof(subs));
if (mdev->opened & PERM_WRITE) { if (mdev->opened & PERM_WRITE) {
@ -416,10 +390,6 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
mdev->opened = 0; mdev->opened = 0;
mdev->devinfo = NULL; mdev->devinfo = NULL;
unlock:
mutex_unlock(&mdev->open_mutex);
snd_use_lock_free(&mdev->use_lock);
return 0; return 0;
} }
@ -429,7 +399,7 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
int int
snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev) snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
int mode; int mode;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
@ -442,7 +412,6 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)
if (mdev->opened & PERM_READ) if (mdev->opened & PERM_READ)
mode |= SNDRV_SEQ_OSS_FILE_READ; mode |= SNDRV_SEQ_OSS_FILE_READ;
snd_use_lock_free(&mdev->use_lock);
return mode; return mode;
} }
@ -453,15 +422,13 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)
void void
snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev) snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
return; return;
if (! mdev->opened) { if (!mdev->opened)
snd_use_lock_free(&mdev->use_lock);
return; return;
}
if (mdev->opened & PERM_WRITE) { if (mdev->opened & PERM_WRITE) {
struct snd_seq_event ev; struct snd_seq_event ev;
@ -492,7 +459,6 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)
} }
} }
// snd_seq_oss_midi_close(dp, dev); // snd_seq_oss_midi_close(dp, dev);
snd_use_lock_free(&mdev->use_lock);
} }
@ -502,14 +468,13 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)
void void
snd_seq_oss_midi_get_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_addr *addr) snd_seq_oss_midi_get_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_addr *addr)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
return; return;
addr->client = mdev->client; addr->client = mdev->client;
addr->port = mdev->port; addr->port = mdev->port;
snd_use_lock_free(&mdev->use_lock);
} }
@ -520,26 +485,20 @@ int
snd_seq_oss_midi_input(struct snd_seq_event *ev, int direct, void *private_data) snd_seq_oss_midi_input(struct snd_seq_event *ev, int direct, void *private_data)
{ {
struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private_data; struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private_data;
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
int rc;
if (dp->readq == NULL) if (dp->readq == NULL)
return 0; return 0;
mdev = find_slot(ev->source.client, ev->source.port); mdev = find_slot(ev->source.client, ev->source.port);
if (!mdev) if (!mdev)
return 0; return 0;
if (! (mdev->opened & PERM_READ)) { if (!(mdev->opened & PERM_READ))
snd_use_lock_free(&mdev->use_lock);
return 0; return 0;
}
if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_MUSIC) if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_MUSIC)
rc = send_synth_event(dp, ev, mdev->seq_device); return send_synth_event(dp, ev, mdev->seq_device);
else else
rc = send_midi_event(dp, ev, mdev); return send_midi_event(dp, ev, mdev);
snd_use_lock_free(&mdev->use_lock);
return rc;
} }
/* /*
@ -636,17 +595,15 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq
int int
snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, struct snd_seq_event *ev) snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, struct snd_seq_event *ev)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
return -ENODEV; return -ENODEV;
if (snd_midi_event_encode_byte(mdev->coder, c, ev)) { if (snd_midi_event_encode_byte(mdev->coder, c, ev)) {
snd_seq_oss_fill_addr(dp, ev, mdev->client, mdev->port); snd_seq_oss_fill_addr(dp, ev, mdev->client, mdev->port);
snd_use_lock_free(&mdev->use_lock);
return 0; return 0;
} }
snd_use_lock_free(&mdev->use_lock);
return -EINVAL; return -EINVAL;
} }
@ -656,7 +613,7 @@ snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, stru
int int
snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info *inf) snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info *inf)
{ {
struct seq_oss_midi *mdev; struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
mdev = get_mididev(dp, dev); mdev = get_mididev(dp, dev);
if (!mdev) if (!mdev)
@ -665,7 +622,6 @@ snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info
inf->dev_type = 0; /* FIXME: ?? */ inf->dev_type = 0; /* FIXME: ?? */
inf->capabilities = 0; /* FIXME: ?? */ inf->capabilities = 0; /* FIXME: ?? */
strscpy(inf->name, mdev->name, sizeof(inf->name)); strscpy(inf->name, mdev->name, sizeof(inf->name));
snd_use_lock_free(&mdev->use_lock);
return 0; return 0;
} }
@ -692,10 +648,11 @@ void
snd_seq_oss_midi_info_read(struct snd_info_buffer *buf) snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)
{ {
int i; int i;
struct seq_oss_midi *mdev;
snd_iprintf(buf, "\nNumber of MIDI devices: %d\n", max_midi_devs); snd_iprintf(buf, "\nNumber of MIDI devices: %d\n", max_midi_devs);
for (i = 0; i < max_midi_devs; i++) { for (i = 0; i < max_midi_devs; i++) {
struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;
snd_iprintf(buf, "\nmidi %d: ", i); snd_iprintf(buf, "\nmidi %d: ", i);
mdev = get_mdev(i); mdev = get_mdev(i);
if (mdev == NULL) { if (mdev == NULL) {
@ -707,7 +664,6 @@ snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)
snd_iprintf(buf, " capability %s / opened %s\n", snd_iprintf(buf, " capability %s / opened %s\n",
capmode_str(mdev->flags), capmode_str(mdev->flags),
capmode_str(mdev->opened)); capmode_str(mdev->opened));
snd_use_lock_free(&mdev->use_lock);
} }
} }
#endif /* CONFIG_SND_PROC_FS */ #endif /* CONFIG_SND_PROC_FS */