| Message ID | 20240507133551.607171-2-perex@perex.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: pcm: reinvent the stream synchronization ID API | expand |
Hi, On Tue, May 07, 2024 at 03:30:50PM +0200, Jaroslav Kysela wrote: > diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h > index 628d46a0da92..c458172b32d5 100644 > --- a/include/uapi/sound/asound.h > +++ b/include/uapi/sound/asound.h > @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { > * * > *****************************************************************************/ > > -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) > +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18) > > typedef unsigned long snd_pcm_uframes_t; > typedef signed long snd_pcm_sframes_t; > @@ -330,12 +330,6 @@ enum { > #endif > }; > > -union snd_pcm_sync_id { > - unsigned char id[16]; > - unsigned short id16[8]; > - unsigned int id32[4]; > -}; It can bring FTBFS for any userspace application which uses the structure. If getting rid of such public structure, we should have the term to deprecate it for a while. > diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c > index 6f73b3c2c205..57ed4ffc891a 100644 > --- a/sound/core/pcm_lib.c > +++ b/sound/core/pcm_lib.c > @@ -5,6 +5,7 @@ > * Abramo Bagnara <abramo@alsa-project.org> > */ > > +#include <asm/unaligned.h> > #include <linux/slab.h> > #include <linux/sched/signal.h> > #include <linux/time.h> > @@ -525,10 +526,8 @@ void snd_pcm_set_sync(struct snd_pcm_substream *substream) > { > struct snd_pcm_runtime *runtime = substream->runtime; > > - runtime->sync.id32[0] = substream->pcm->card->number; > - runtime->sync.id32[1] = -1; > - runtime->sync.id32[2] = -1; > - runtime->sync.id32[3] = -1; > + *(__u32 *)runtime->sync = cpu_to_le32(substream->pcm->card->number); > + memset(runtime->sync + 4, 0xff, sizeof(runtime->sync) - 4); > } > EXPORT_SYMBOL(snd_pcm_set_sync); > > @@ -1810,6 +1809,24 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, > return 0; > } > > +/** > + * is sync id (clock id) empty? > + */ > +static inline bool pcm_sync_empty(const unsigned char *sync) > +{ > + return get_unaligned((__u64 *)(sync + 0)) == 0 && get_unaligned((__u64 *)(sync + 8)) == 0; > +} This kind of usage of C inline qualifier is not useless, since the modern compilers can optimize it into the local code. > +static int snd_pcm_lib_ioctl_sync_id(struct snd_pcm_substream *substream, > + void *arg) > +{ > + struct snd_pcm_hw_params *params = arg; > + > + if (pcm_sync_empty(params->sync)) > + memcpy(params->sync, substream->runtime->sync, sizeof(params->sync)); > + return 0; > +} Furthermore, it does not work as expected in the case that any of driver sets zeros to char[16] intentionally for its own purpose at PCM .open callback. I think it is a kind of 'Separation of mechanism and policy' argument, and a kind of designs which should be avoided. > /** > * snd_pcm_lib_ioctl - a generic PCM ioctl callback > * @substream: the pcm substream instance > @@ -1831,6 +1848,8 @@ int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, > return snd_pcm_lib_ioctl_channel_info(substream, arg); > case SNDRV_PCM_IOCTL1_FIFO_SIZE: > return snd_pcm_lib_ioctl_fifo_size(substream, arg); > + case SNDRV_PCM_IOCTL1_SYNC_ID: > + return snd_pcm_lib_ioctl_sync_id(substream, arg); > } > return -ENXIO; > } > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c > index 0b76e76823d2..63fcb08ee93d 100644 > --- a/sound/core/pcm_native.c > +++ b/sound/core/pcm_native.c > @@ -533,6 +533,12 @@ static int fixup_unreferenced_params(struct snd_pcm_substream *substream, > SNDRV_PCM_INFO_MMAP_VALID); > } > > + err = snd_pcm_ops_ioctl(substream, > + SNDRV_PCM_IOCTL1_SYNC_ID, > + params); > + if (err < 0) > + return err; > + > return 0; > } > > diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c > index e7f097cae574..773725dbdfbd 100644 > --- a/sound/pci/emu10k1/p16v.c > +++ b/sound/pci/emu10k1/p16v.c > @@ -174,10 +174,9 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea > if (err < 0) > return err; > > - runtime->sync.id32[0] = substream->pcm->card->number; > - runtime->sync.id32[1] = 'P'; > - runtime->sync.id32[2] = 16; > - runtime->sync.id32[3] = 'V'; > + *(__u32 *)runtime->sync = cpu_to_le32(substream->pcm->card->number); > + memset(runtime->sync + 4, 0, sizeof(runtime->sync) - 4); > + strncpy(runtime->sync + 4, "P16V", 4); I'm sorry if I overlooked your reply to my point, however the above is not equivalent. Regards Takashi Sakamoto
On Thu, 13 Jun 2024 14:56:49 +0200, Takashi Sakamoto wrote: > > Hi, > > On Tue, May 07, 2024 at 03:30:50PM +0200, Jaroslav Kysela wrote: > > diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h > > index 628d46a0da92..c458172b32d5 100644 > > --- a/include/uapi/sound/asound.h > > +++ b/include/uapi/sound/asound.h > > @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { > > * * > > *****************************************************************************/ > > > > -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) > > +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18) > > > > typedef unsigned long snd_pcm_uframes_t; > > typedef signed long snd_pcm_sframes_t; > > @@ -330,12 +330,6 @@ enum { > > #endif > > }; > > > > -union snd_pcm_sync_id { > > - unsigned char id[16]; > > - unsigned short id16[8]; > > - unsigned int id32[4]; > > -}; > > It can bring FTBFS for any userspace application which uses the > structure. If getting rid of such public structure, we should have the > term to deprecate it for a while. A good point. We can keep the union definition there but add a comment that it's deprecated and not actually used in any code. Takashi
On 13. 06. 24 16:20, Takashi Iwai wrote: > On Thu, 13 Jun 2024 14:56:49 +0200, > Takashi Sakamoto wrote: >> >> Hi, >> >> On Tue, May 07, 2024 at 03:30:50PM +0200, Jaroslav Kysela wrote: >>> diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h >>> index 628d46a0da92..c458172b32d5 100644 >>> --- a/include/uapi/sound/asound.h >>> +++ b/include/uapi/sound/asound.h >>> @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { >>> * * >>> *****************************************************************************/ >>> >>> -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) >>> +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18) >>> >>> typedef unsigned long snd_pcm_uframes_t; >>> typedef signed long snd_pcm_sframes_t; >>> @@ -330,12 +330,6 @@ enum { >>> #endif >>> }; >>> >>> -union snd_pcm_sync_id { >>> - unsigned char id[16]; >>> - unsigned short id16[8]; >>> - unsigned int id32[4]; >>> -}; >> >> It can bring FTBFS for any userspace application which uses the >> structure. If getting rid of such public structure, we should have the >> term to deprecate it for a while. > > A good point. We can keep the union definition there but add a > comment that it's deprecated and not actually used in any code. The question is, if someone is using this directly (outside alsa-lib) when the implementation was vanished for several years. Anyway, I'll add __attribute__((deprecated)) to this structure in respin. Thanks for the review. Jaroslav
On 13. 06. 24 14:56, Takashi Sakamoto wrote: > Hi, > > On Tue, May 07, 2024 at 03:30:50PM +0200, Jaroslav Kysela wrote: >> diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h >> index 628d46a0da92..c458172b32d5 100644 >> --- a/include/uapi/sound/asound.h >> +++ b/include/uapi/sound/asound.h >> @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { >> * * >> *****************************************************************************/ >> >> -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) >> +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18) >> >> typedef unsigned long snd_pcm_uframes_t; >> typedef signed long snd_pcm_sframes_t; >> @@ -330,12 +330,6 @@ enum { >> #endif >> }; >> >> -union snd_pcm_sync_id { >> - unsigned char id[16]; >> - unsigned short id16[8]; >> - unsigned int id32[4]; >> -}; > > It can bring FTBFS for any userspace application which uses the > structure. If getting rid of such public structure, we should have the > term to deprecate it for a while. Marked with __attribute__((deprecated)) in v5. >> +/** >> + * is sync id (clock id) empty? >> + */ >> +static inline bool pcm_sync_empty(const unsigned char *sync) >> +{ >> + return get_unaligned((__u64 *)(sync + 0)) == 0 && get_unaligned((__u64 *)(sync + 8)) == 0; >> +} > > This kind of usage of C inline qualifier is not useless, since the modern > compilers can optimize it into the local code. Removed get_unaligned() calls. Using standard C code because this code is removed in the second patch. >> +static int snd_pcm_lib_ioctl_sync_id(struct snd_pcm_substream *substream, >> + void *arg) >> +{ >> + struct snd_pcm_hw_params *params = arg; >> + >> + if (pcm_sync_empty(params->sync)) >> + memcpy(params->sync, substream->runtime->sync, sizeof(params->sync)); >> + return 0; >> +} > > Furthermore, it does not work as expected in the case that any of driver sets > zeros to char[16] intentionally for its own purpose at PCM .open callback. > > I think it is a kind of 'Separation of mechanism and policy' argument, > and a kind of designs which should be avoided. The second patch resolves this. >> - runtime->sync.id32[0] = substream->pcm->card->number; >> - runtime->sync.id32[1] = 'P'; >> - runtime->sync.id32[2] = 16; >> - runtime->sync.id32[3] = 'V'; >> + *(__u32 *)runtime->sync = cpu_to_le32(substream->pcm->card->number); >> + memset(runtime->sync + 4, 0, sizeof(runtime->sync) - 4); >> + strncpy(runtime->sync + 4, "P16V", 4); > > I'm sorry if I overlooked your reply to my point, however the above is > not equivalent. It does not matter. The ID should not be used for a direct comparison. The ID must be only unique for the system and applications should compare those IDs between PCM streams (including multiple sound cards). If equal - the source clock source is equal. I tried to explain this in the commit message in v5. Thanks for your review, Jaroslav
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 210096f124ee..f187d4c9b420 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -93,6 +93,7 @@ struct snd_pcm_ops { #define SNDRV_PCM_IOCTL1_CHANNEL_INFO 2 /* 3 is absent slot. */ #define SNDRV_PCM_IOCTL1_FIFO_SIZE 4 +#define SNDRV_PCM_IOCTL1_SYNC_ID 5 #define SNDRV_PCM_TRIGGER_STOP 0 #define SNDRV_PCM_TRIGGER_START 1 @@ -396,7 +397,7 @@ struct snd_pcm_runtime { snd_pcm_uframes_t silence_start; /* starting pointer to silence area */ snd_pcm_uframes_t silence_filled; /* already filled part of silence area */ - union snd_pcm_sync_id sync; /* hardware synchronization ID */ + unsigned char sync[16]; /* hardware synchronization ID */ /* -- mmap -- */ struct snd_pcm_mmap_status *status; diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 628d46a0da92..c458172b32d5 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { * * *****************************************************************************/ -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18) typedef unsigned long snd_pcm_uframes_t; typedef signed long snd_pcm_sframes_t; @@ -330,12 +330,6 @@ enum { #endif }; -union snd_pcm_sync_id { - unsigned char id[16]; - unsigned short id16[8]; - unsigned int id32[4]; -}; - struct snd_pcm_info { unsigned int device; /* RO/WR (control): device number */ unsigned int subdevice; /* RO/WR (control): subdevice number */ @@ -348,7 +342,7 @@ struct snd_pcm_info { int dev_subclass; /* SNDRV_PCM_SUBCLASS_* */ unsigned int subdevices_count; unsigned int subdevices_avail; - union snd_pcm_sync_id sync; /* hardware synchronization ID */ + unsigned char pad1[16]; /* was: hardware synchronization ID */ unsigned char reserved[64]; /* reserved for future... */ }; @@ -420,7 +414,8 @@ struct snd_pcm_hw_params { unsigned int rate_num; /* R: rate numerator */ unsigned int rate_den; /* R: rate denominator */ snd_pcm_uframes_t fifo_size; /* R: chip FIFO size in frames */ - unsigned char reserved[64]; /* reserved for future */ + unsigned char sync[16]; /* R: synchronization ID (perfect sync - one clock source) */ + unsigned char reserved[48]; /* reserved for future */ }; enum { diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 6f73b3c2c205..57ed4ffc891a 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -5,6 +5,7 @@ * Abramo Bagnara <abramo@alsa-project.org> */ +#include <asm/unaligned.h> #include <linux/slab.h> #include <linux/sched/signal.h> #include <linux/time.h> @@ -525,10 +526,8 @@ void snd_pcm_set_sync(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - runtime->sync.id32[0] = substream->pcm->card->number; - runtime->sync.id32[1] = -1; - runtime->sync.id32[2] = -1; - runtime->sync.id32[3] = -1; + *(__u32 *)runtime->sync = cpu_to_le32(substream->pcm->card->number); + memset(runtime->sync + 4, 0xff, sizeof(runtime->sync) - 4); } EXPORT_SYMBOL(snd_pcm_set_sync); @@ -1810,6 +1809,24 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, return 0; } +/** + * is sync id (clock id) empty? + */ +static inline bool pcm_sync_empty(const unsigned char *sync) +{ + return get_unaligned((__u64 *)(sync + 0)) == 0 && get_unaligned((__u64 *)(sync + 8)) == 0; +} + +static int snd_pcm_lib_ioctl_sync_id(struct snd_pcm_substream *substream, + void *arg) +{ + struct snd_pcm_hw_params *params = arg; + + if (pcm_sync_empty(params->sync)) + memcpy(params->sync, substream->runtime->sync, sizeof(params->sync)); + return 0; +} + /** * snd_pcm_lib_ioctl - a generic PCM ioctl callback * @substream: the pcm substream instance @@ -1831,6 +1848,8 @@ int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, return snd_pcm_lib_ioctl_channel_info(substream, arg); case SNDRV_PCM_IOCTL1_FIFO_SIZE: return snd_pcm_lib_ioctl_fifo_size(substream, arg); + case SNDRV_PCM_IOCTL1_SYNC_ID: + return snd_pcm_lib_ioctl_sync_id(substream, arg); } return -ENXIO; } diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 0b76e76823d2..63fcb08ee93d 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -533,6 +533,12 @@ static int fixup_unreferenced_params(struct snd_pcm_substream *substream, SNDRV_PCM_INFO_MMAP_VALID); } + err = snd_pcm_ops_ioctl(substream, + SNDRV_PCM_IOCTL1_SYNC_ID, + params); + if (err < 0) + return err; + return 0; } diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index e7f097cae574..773725dbdfbd 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c @@ -174,10 +174,9 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea if (err < 0) return err; - runtime->sync.id32[0] = substream->pcm->card->number; - runtime->sync.id32[1] = 'P'; - runtime->sync.id32[2] = 16; - runtime->sync.id32[3] = 'V'; + *(__u32 *)runtime->sync = cpu_to_le32(substream->pcm->card->number); + memset(runtime->sync + 4, 0, sizeof(runtime->sync) - 4); + strncpy(runtime->sync + 4, "P16V", 4); return 0; }
Until the commit e11f0f90a626 ("ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command"), there was a possibility to pass information about the synchronized streams to the user space. The mentioned commit removed blindly the appropriate code with an irrelevant comment. The revert may be appropriate, but since this API was lost for several years without any complains, it's time to improve it. The hardware parameters may change the used stream clock source (e.g. USB hardware) so move this synchronization ID to hw_params as read-only field. It seems that pipewire can benefit from this API (disable adaptive resampling for perfectly synchronized PCM streams) now. Cc: Takashi Sakamoto <takaswie@kernel.org> Signed-off-by: Jaroslav Kysela <perex@perex.cz> --- include/sound/pcm.h | 3 ++- include/uapi/sound/asound.h | 13 ++++--------- sound/core/pcm_lib.c | 27 +++++++++++++++++++++++---- sound/core/pcm_native.c | 6 ++++++ sound/pci/emu10k1/p16v.c | 7 +++---- 5 files changed, 38 insertions(+), 18 deletions(-)