April 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] KASAN: use-after-free Read in snd_timer_process_callbacks
by syzbot 10 Apr '19

10 Apr '19

Hello, syzbot found the following crash on: HEAD commit: ac5b84a1 Add linux-next specific files for 20190408 git tree: linux-next console output: https://syzkaller.appspot.com/x/log.txt?x=10ae80b7200000 kernel config: https://syzkaller.appspot.com/x/.config?x=42a33a21877c9c95 dashboard link: https://syzkaller.appspot.com/bug?extid=58813d77154713f4de15 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=102b9f5d200000 The bug was bisected to: commit a7588c896b05444929ecb3d0115481988720abf6 Author: Takashi Iwai <tiwai(a)suse.de> Date: Wed Mar 27 15:56:08 2019 +0000 ALSA: timer: Check ack_list emptiness instead of bit flag bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=1100d3ab200000 final crash: https://syzkaller.appspot.com/x/report.txt?x=1300d3ab200000 console output: https://syzkaller.appspot.com/x/log.txt?x=1500d3ab200000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+58813d77154713f4de15(a)syzkaller.appspotmail.com Fixes: a7588c896b05 ("ALSA: timer: Check ack_list emptiness instead of bit flag") ================================================================== BUG: KASAN: use-after-free in __list_del_entry_valid+0xd2/0xf5 lib/list_debug.c:42 Read of size 8 at addr ffff8880a497a7a0 by task swapper/1/0 CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.1.0-rc3-next-20190408 #20 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x172/0x1f0 lib/dump_stack.c:113 print_address_description.cold+0x7c/0x20d mm/kasan/report.c:187 kasan_report.cold+0x1b/0x40 mm/kasan/report.c:317 __asan_report_load8_noabort+0x14/0x20 mm/kasan/generic_report.c:132 __list_del_entry_valid+0xd2/0xf5 lib/list_debug.c:42 __list_del_entry include/linux/list.h:117 [inline] list_del_init include/linux/list.h:176 [inline] snd_timer_process_callbacks+0x7f/0x2f0 sound/core/timer.c:763 snd_timer_interrupt sound/core/timer.c:883 [inline] snd_timer_interrupt+0x578/0xdd0 sound/core/timer.c:804 snd_hrtimer_callback+0x219/0x3e0 sound/core/hrtimer.c:64 __run_hrtimer kernel/time/hrtimer.c:1389 [inline] __hrtimer_run_queues+0x33e/0xde0 kernel/time/hrtimer.c:1451 hrtimer_interrupt+0x314/0x770 kernel/time/hrtimer.c:1509 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1035 [inline] smp_apic_timer_interrupt+0x120/0x570 arch/x86/kernel/apic/apic.c:1060 apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:807 RIP: 0010:arch_local_irq_restore arch/x86/include/asm/paravirt.h:767 [inline] RIP: 0010:__raw_spin_unlock_irqrestore include/linux/spinlock_api_smp.h:160 [inline] RIP: 0010:_raw_spin_unlock_irqrestore+0x95/0xe0 kernel/locking/spinlock.c:184 Code: 48 c7 c0 70 9b 92 88 48 ba 00 00 00 00 00 fc ff df 48 c1 e8 03 80 3c 10 00 75 39 48 83 3d 22 d5 78 01 00 74 24 48 89 df 57 9d <0f> 1f 44 00 00 bf 01 00 00 00 e8 dc e1 33 fa 65 8b 05 25 27 e8 78 RSP: 0018:ffff8880ae907920 EFLAGS: 00000282 ORIG_RAX: ffffffffffffff13 RAX: 1ffffffff112536e RBX: 0000000000000282 RCX: 0000000000000000 RDX: dffffc0000000000 RSI: ffff8880aa292bc0 RDI: 0000000000000282 RBP: ffff8880ae907930 R08: ffff8880aa292340 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: ffff888097bafab8 R13: ffff8880aa20bb00 R14: ffff888097baf8b0 R15: 0000000000000001 spin_unlock_irqrestore include/linux/spinlock.h:384 [inline] test_clear_page_writeback+0x397/0x13b0 mm/page-writeback.c:2741 end_page_writeback+0x22a/0x4f0 mm/filemap.c:1311 ext4_finish_bio+0x63e/0xb10 fs/ext4/page-io.c:119 ext4_end_bio+0x190/0x6a0 fs/ext4/page-io.c:343 bio_endio+0x5f8/0xad0 block/bio.c:1879 req_bio_endio block/blk-core.c:196 [inline] blk_update_request+0x317/0xba0 block/blk-core.c:1457 scsi_end_request+0x7f/0x860 drivers/scsi/scsi_lib.c:579 scsi_io_completion+0x20a/0x1420 drivers/scsi/scsi_lib.c:964 scsi_finish_command+0x3ba/0x670 drivers/scsi/scsi.c:219 scsi_softirq_done+0x33b/0x3e0 drivers/scsi/scsi_lib.c:1464 blk_done_softirq+0x304/0x4d0 block/blk-softirq.c:37 __do_softirq+0x266/0x95a kernel/softirq.c:293 invoke_softirq kernel/softirq.c:374 [inline] irq_exit+0x180/0x1d0 kernel/softirq.c:414 exiting_irq arch/x86/include/asm/apic.h:536 [inline] do_IRQ+0x114/0x1d0 arch/x86/kernel/irq.c:258 common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:583 </IRQ> RIP: 0010:native_safe_halt+0x2/0x10 arch/x86/include/asm/irqflags.h:58 Code: ff ff ff 48 89 c7 48 89 45 d8 e8 c9 80 8f fa 48 8b 45 d8 e9 ce fe ff ff 48 89 df e8 b8 80 8f fa eb 82 90 90 90 90 90 90 fb f4 <c3> 0f 1f 00 66 2e 0f 1f 84 00 00 00 00 00 f4 c3 90 90 90 90 90 90 RSP: 0018:ffff8880aa2a7d78 EFLAGS: 00000282 ORIG_RAX: ffffffffffffffdd RAX: 1ffffffff1125371 RBX: ffff8880aa292340 RCX: 0000000000000000 RDX: dffffc0000000000 RSI: 0000000000000006 RDI: ffff8880aa292bbc RBP: ffff8880aa2a7da8 R08: ffff8880aa292340 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000001 R13: ffffffff88929b78 R14: 0000000000000001 R15: 0000000000000000 arch_cpu_idle+0x10/0x20 arch/x86/kernel/process.c:567 default_idle_call+0x36/0x90 kernel/sched/idle.c:93 cpuidle_idle_call kernel/sched/idle.c:153 [inline] do_idle+0x386/0x570 kernel/sched/idle.c:262 cpu_startup_entry+0x1b/0x20 kernel/sched/idle.c:353 start_secondary+0x360/0x4d0 arch/x86/kernel/smpboot.c:267 secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:243 Allocated by task 7668: save_stack+0x45/0xd0 mm/kasan/common.c:75 set_track mm/kasan/common.c:87 [inline] __kasan_kmalloc mm/kasan/common.c:497 [inline] __kasan_kmalloc.constprop.0+0xcf/0xe0 mm/kasan/common.c:470 kasan_kmalloc+0x9/0x10 mm/kasan/common.c:511 kmem_cache_alloc_trace+0x151/0x760 mm/slab.c:3621 kmalloc include/linux/slab.h:547 [inline] kzalloc include/linux/slab.h:742 [inline] snd_timer_instance_new+0x4f/0x3d0 sound/core/timer.c:109 snd_timer_open+0x8a7/0x1760 sound/core/timer.c:313 snd_seq_timer_open+0x240/0x590 sound/core/seq/seq_timer.c:290 queue_use+0xcb/0x240 sound/core/seq/seq_queue.c:502 snd_seq_queue_alloc+0x2c5/0x4d0 sound/core/seq/seq_queue.c:189 snd_seq_ioctl_create_queue+0xb0/0x330 sound/core/seq/seq_clientmgr.c:1522 snd_seq_ioctl+0x224/0x3e0 sound/core/seq/seq_clientmgr.c:2138 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xd6e/0x1390 fs/ioctl.c:696 ksys_ioctl+0xab/0xd0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x73/0xb0 fs/ioctl.c:718 do_syscall_64+0x103/0x610 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 7668: save_stack+0x45/0xd0 mm/kasan/common.c:75 set_track mm/kasan/common.c:87 [inline] __kasan_slab_free+0x102/0x150 mm/kasan/common.c:459 kasan_slab_free+0xe/0x10 mm/kasan/common.c:467 __cache_free mm/slab.c:3498 [inline] kfree+0xcf/0x230 mm/slab.c:3821 snd_timer_close_locked+0x6fd/0xd60 sound/core/timer.c:405 snd_timer_close+0x2e/0x70 sound/core/timer.c:430 snd_seq_timer_close+0x91/0xd0 sound/core/seq/seq_timer.c:329 queue_delete+0x52/0xb0 sound/core/seq/seq_queue.c:147 snd_seq_queue_client_leave+0x36/0x170 sound/core/seq/seq_queue.c:584 seq_free_client1.part.0+0xf3/0x270 sound/core/seq/seq_clientmgr.c:263 seq_free_client1 sound/core/seq/seq_clientmgr.c:256 [inline] seq_free_client+0x80/0xf0 sound/core/seq/seq_clientmgr.c:285 snd_seq_release+0x55/0xf0 sound/core/seq/seq_clientmgr.c:366 __fput+0x2e5/0x8d0 fs/file_table.c:278 ____fput+0x16/0x20 fs/file_table.c:309 task_work_run+0x14a/0x1c0 kernel/task_work.c:113 get_signal+0x1961/0x1d50 kernel/signal.c:2391 do_signal+0x87/0x1940 arch/x86/kernel/signal.c:816 exit_to_usermode_loop+0x244/0x2c0 arch/x86/entry/common.c:162 prepare_exit_to_usermode arch/x86/entry/common.c:197 [inline] syscall_return_slowpath arch/x86/entry/common.c:268 [inline] do_syscall_64+0x52d/0x610 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbe The buggy address belongs to the object at ffff8880a497a700 which belongs to the cache kmalloc-256 of size 256 The buggy address is located 160 bytes inside of 256-byte region [ffff8880a497a700, ffff8880a497a800) The buggy address belongs to the page: page:ffffea0002925e80 count:1 mapcount:0 mapping:ffff88812c3f07c0 index:0xffff8880a497a200 flags: 0x1fffc0000000200(slab) raw: 01fffc0000000200 ffff88812c3f1638 ffff88812c3f1638 ffff88812c3f07c0 raw: ffff8880a497a200 ffff8880a497a0c0 000000010000000b 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8880a497a680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8880a497a700: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb > ffff8880a497a780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff8880a497a800: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8880a497a880: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ================================================================== --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

1 1

[alsa-devel] [PATCH V1] ASoC: fsl_esai: replace fall-through with break
by S.j. Wang 10 Apr '19

10 Apr '19

case ESAI_HCKT_EXTAL and case ESAI_HCKR_EXTAL should be independent of each other, so replace fall-through with break. Fixes: 16bbeb2b43c3 ("ASoC: fsl_esai: Mark expected switch fall-through") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_esai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c7410bbfd2af..bad0dfed6b68 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -251,7 +251,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, break; case ESAI_HCKT_EXTAL: ecr |= ESAI_ECR_ETI; - /* fall through */ + break; case ESAI_HCKR_EXTAL: ecr |= esai_priv->synchronous ? ESAI_ECR_ETI : ESAI_ECR_ERI; break; -- 1.9.1

3 7

[alsa-devel] [PATCH 0/5] ALSA: seq: More cleanups and fixes
by Takashi Iwai 09 Apr '19

09 Apr '19

Hi, this is a patchset for ALSA sequencer to clean up / minor improvement of some code as well as the fixes for remaining issues caught (spontaneously) by syzkaller. Takashi === Takashi Iwai (5): ALSA: seq: Use kvmalloc() for cell pools ALSA: seq: Align temporary re-locking with irqsave version ALSA: seq: Remove superfluous irqsave flags ALSA: seq: Protect in-kernel ioctl calls with mutex ALSA: seq: Fix race of get-subscription call vs port-delete ioctls sound/core/seq/seq_clientmgr.c | 38 +++++++++++++++++--------------------- sound/core/seq/seq_fifo.c | 14 ++++++-------- sound/core/seq/seq_memory.c | 30 ++++++++++++++---------------- sound/core/seq/seq_ports.c | 28 ++++++++++++++-------------- sound/core/seq/seq_ports.h | 5 +++-- 5 files changed, 54 insertions(+), 61 deletions(-) -- 2.16.4

1 5

[alsa-devel] [PATCH v5 00/14] ASoC: Sound Open Firmware (SOF) core
by Pierre-Louis Bossart 09 Apr '19

09 Apr '19

Sound Open Firmware (SOF) is a host and DSP architecture agnostic audio DSP firmware. SOF is not tied to any specific host architecture or any specific physical IO communication type (it will work with on SoC DSPs, or DSP connected via SPI/I2C). SOF is also not coupled to any particular DSP architecture and has abstraction similar to Linux to allow porting to other DSP architectures. https://www.sofproject.org/ This patch series introduces the SOF core and utilities. Support for Intel devices is provided as a follow-up series. The SOF core manages all the core DSP services and ALSA/ASoC IO. The core is responsible for loading firmware, parsing topology, exposing PCMs and kcontrols, providing debug and trace mechanisms and performing IPC between host and DSP. The SOF core also has logic to allow reuse of existing machine drivers for other platforms/machines without any code modification. i.e. DAI links can be modified at runtime to bind with SOF and SOF topologies instead of existing hard coded DAI links and topology. Future patches will simplify the IPC interface to allow e.g. for the use of RPMsg or mailboxes on other hardware, the changes are not included just yet. This patchset is dependent on 3 patches already shared on alsa-devel but not yet merged: ASoC: topology: Align tplg pointer increment across all kcontrols ASoC: core: support driver alias names for FE topology overrides ASoC: dapm: set power_check callback for widgets that shouldnt be always on Changes since v4: feedback from Mark: Removed need for private field in soc_runtime Completely reworked IPC, now much simpler and robust. IPC refactoring work will continue to e.g. allow for different types of IPC hardware and a better split between core and platform-specific drivers. Feedback from Takashi: Clarified endianness and alignment issues for page tables Removed useless mutexes Removed unneeded initializations, return types and wrappers Use snd_mask_set_format() Trace code flow optimization Removed checks on preallocate_pages() Test status of open/close functions. Released reference when pm_runtime_get_sync fails Fixed multiple memory allocation issues Fixed static analysis warnings Fixed error checks with copy_to_user() Added support for multi-core DSPs Fixed leaked references with firmware handling on resume Multiple topology fixes/improvements (enum/switch, mux, removal of duplicate connections, widget power not reported as ON) Code simplifications (removed set-but-unused, typecasts, etc). Changes since v3: Addressed dozens ofcomments from Takashi Iwai, Mark Brown, Andy Shevchenko, Daniel Baluta (Thanks!) Hardened memory allocation, fixed module load/unload oops or errors (now at hundreds of cycles on ApolloLake devices) Fixed suspend/resume and removed use of suspend_late, now using snd_soc_pm_ops and standard flow Fixed topology free (multiple patches already contributed for ASoC-core) Fixed debugfs/pm_runtime interaction Removed error checks on debugfs, changed to EXPORT_SYMBOL_GPL Added filenames in debug messages, ues hex_dump_to_buffer Removed "sof-audio" platform device and added better error checks on probe Reworked data structures to remove mix of const/variable fields and duplication of pointers for platform-specific changes Removed redundant ops tables Fixed trace/logger issues Fixed issues with loader (alignment and block size errors) Fixed release_firmware handling (was all over the place) Simplified PCI handling Added comments on non-atomic triggers Removed enum controls (not supported in topology) Simplified include file dependencies Fix cppcheck warnings Fixed Kconfigs to deal with Kbuild warnings on exotic architectures Precisions: The code in this patchset is directly squashed from the SOF development branch [1], which tracks Mark Brown's for-next branch on a weekly basis and the configurations used for testing are based on the defconfigs at [2]. The patches are also used backported for Chromebook devices. Full disclosure on known limitation and issues (full list at [3]) a) the interaction with ASoC is not always perfect, there are a couple of points where a better solution is desired (use of private data, support for link DMA, etc). The known points are explicitly documented in the code and will be updated. To be clearer, it's our belief that SOF does not cripple ASoC in any way, and that merging this SOF core does not harm others. It's just complicated to get things right, especially on a couple of cases where the topology and DPCM frameworks generate complex flows that very few people understand. b) The get/put methods for controls generate an IPC and possibly a wake-up. This is not optimal and is being fixed. c) runtime_pm is being hardened and the use of SMART_SUSPEND was suggested. Thank you for reviews and comments, we appreciate the time spent commenting on this large patchset. Thanks in particular to Alan Cox and Andy Shevchenko for their comments on an earlier version. This patchset also includes contributions from Daniel Baluta for loading code on non-Intel platforms. Pierre [1] https://github.com/thesofproject/linux [2] https://github.com/thesofproject/kconfig [3] https://github.com/thesofproject/linux/issues Liam Girdwood (12): ASoC: SOF: Add Sound Open Firmware driver core ASoC: SOF: Add Sound Open Firmware KControl support ASoC: SOF: Add driver debug support. ASoC: SOF: Add support for IPC IO between DSP and Host ASoC: SOF: Add PCM operations support ASoC: SOF: Add support for loading topologies ASoC: SOF: Add DSP firmware logger support ASoC: SOF: Add DSP HW abstraction operations ASoC: SOF: Add firmware loader support ASoC: SOF: Add userspace ABI support ASoC: SOF: Add PM support ASoC: SOF: Add Nocodec machine driver support Pierre-Louis Bossart (2): ASoC: SOF: Add xtensa support ASoC: SOF: Add utils include/sound/sof.h | 100 + include/sound/sof/control.h | 158 ++ include/sound/sof/dai-intel.h | 178 ++ include/sound/sof/dai.h | 75 + include/sound/sof/header.h | 158 ++ include/sound/sof/info.h | 118 ++ include/sound/sof/pm.h | 48 + include/sound/sof/stream.h | 148 ++ include/sound/sof/topology.h | 256 +++ include/sound/sof/trace.h | 66 + include/sound/sof/xtensa.h | 44 + include/uapi/sound/sof/abi.h | 62 + include/uapi/sound/sof/eq.h | 172 ++ include/uapi/sound/sof/fw.h | 78 + include/uapi/sound/sof/header.h | 27 + include/uapi/sound/sof/manifest.h | 188 ++ include/uapi/sound/sof/tokens.h | 103 + include/uapi/sound/sof/tone.h | 21 + include/uapi/sound/sof/trace.h | 97 + sound/soc/sof/control.c | 544 ++++++ sound/soc/sof/core.c | 489 +++++ sound/soc/sof/debug.c | 219 +++ sound/soc/sof/ipc.c | 742 ++++++++ sound/soc/sof/loader.c | 376 ++++ sound/soc/sof/nocodec.c | 109 ++ sound/soc/sof/ops.c | 204 ++ sound/soc/sof/ops.h | 403 ++++ sound/soc/sof/pcm.c | 723 +++++++ sound/soc/sof/pm.c | 373 ++++ sound/soc/sof/sof-priv.h | 616 ++++++ sound/soc/sof/topology.c | 2913 +++++++++++++++++++++++++++++ sound/soc/sof/trace.c | 295 +++ sound/soc/sof/utils.c | 112 ++ sound/soc/sof/xtensa/Kconfig | 2 + sound/soc/sof/xtensa/Makefile | 5 + sound/soc/sof/xtensa/core.c | 138 ++ 36 files changed, 10360 insertions(+) create mode 100644 include/sound/sof.h create mode 100644 include/sound/sof/control.h create mode 100644 include/sound/sof/dai-intel.h create mode 100644 include/sound/sof/dai.h create mode 100644 include/sound/sof/header.h create mode 100644 include/sound/sof/info.h create mode 100644 include/sound/sof/pm.h create mode 100644 include/sound/sof/stream.h create mode 100644 include/sound/sof/topology.h create mode 100644 include/sound/sof/trace.h create mode 100644 include/sound/sof/xtensa.h create mode 100644 include/uapi/sound/sof/abi.h create mode 100644 include/uapi/sound/sof/eq.h create mode 100644 include/uapi/sound/sof/fw.h create mode 100644 include/uapi/sound/sof/header.h create mode 100644 include/uapi/sound/sof/manifest.h create mode 100644 include/uapi/sound/sof/tokens.h create mode 100644 include/uapi/sound/sof/tone.h create mode 100644 include/uapi/sound/sof/trace.h create mode 100644 sound/soc/sof/control.c create mode 100644 sound/soc/sof/core.c create mode 100644 sound/soc/sof/debug.c create mode 100644 sound/soc/sof/ipc.c create mode 100644 sound/soc/sof/loader.c create mode 100644 sound/soc/sof/nocodec.c create mode 100644 sound/soc/sof/ops.c create mode 100644 sound/soc/sof/ops.h create mode 100644 sound/soc/sof/pcm.c create mode 100644 sound/soc/sof/pm.c create mode 100644 sound/soc/sof/sof-priv.h create mode 100644 sound/soc/sof/topology.c create mode 100644 sound/soc/sof/trace.c create mode 100644 sound/soc/sof/utils.c create mode 100644 sound/soc/sof/xtensa/Kconfig create mode 100644 sound/soc/sof/xtensa/Makefile create mode 100644 sound/soc/sof/xtensa/core.c -- 2.17.1

6 42

[alsa-devel] [PATCH] ALSA: timer: Revert active callback sync check at close
by Takashi Iwai 09 Apr '19

09 Apr '19

This is essentially a revert of the commit a7588c896b05 ("ALSA: timer: Check ack_list emptiness instead of bit flag"). The intended change by the commit turns out to be insufficient, as snd_timer_close*() always calls snd_timer_stop() that deletes the ack_list beforehand. In theory, we can change the behavior of snd_timer_stop() to sync the pending ack_list, but this will become a deadlock for the callback like sequencer that calls again snd_timer_stop() from itself. So, reverting the change is a more straightforward solution. Fixes: a7588c896b05 ("ALSA: timer: Check ack_list emptiness instead of bit flag") Reported-by: syzbot+58813d77154713f4de15(a)syzkaller.appspotmail.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/timer.h | 1 + sound/core/timer.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/sound/timer.h b/include/sound/timer.h index bcfee20ea226..7ae226ab6990 100644 --- a/include/sound/timer.h +++ b/include/sound/timer.h @@ -43,6 +43,7 @@ #define SNDRV_TIMER_IFLG_START 0x00000004 #define SNDRV_TIMER_IFLG_AUTO 0x00000008 /* auto restart */ #define SNDRV_TIMER_IFLG_FAST 0x00000010 /* fast callback (do not use tasklet) */ +#define SNDRV_TIMER_IFLG_CALLBACK 0x00000020 /* timer callback is active */ #define SNDRV_TIMER_IFLG_EXCLUSIVE 0x00000040 /* exclusive owner - no more instances */ #define SNDRV_TIMER_IFLG_EARLY_EVENT 0x00000080 /* write early event to the poll queue */ diff --git a/sound/core/timer.c b/sound/core/timer.c index bb7e90ab90f8..df52d2960179 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -372,7 +372,7 @@ static int snd_timer_close_locked(struct snd_timer_instance *timeri) timer->num_instances--; /* wait, until the active callback is finished */ spin_lock_irq(&timer->lock); - while (!list_empty(&timeri->ack_list)) { + while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) { spin_unlock_irq(&timer->lock); udelay(10); spin_lock_irq(&timer->lock); @@ -748,19 +748,20 @@ static void snd_timer_process_callbacks(struct snd_timer *timer, ti = list_first_entry(head, struct snd_timer_instance, ack_list); + /* remove from ack_list and make empty */ + list_del_init(&ti->ack_list); + if (!(ti->flags & SNDRV_TIMER_IFLG_DEAD)) { ticks = ti->pticks; ti->pticks = 0; resolution = ti->resolution; - + ti->flags |= SNDRV_TIMER_IFLG_CALLBACK; spin_unlock(&timer->lock); if (ti->callback) ti->callback(ti, resolution, ticks); spin_lock(&timer->lock); + ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK; } - - /* remove from ack_list and make empty */ - list_del_init(&ti->ack_list); } } -- 2.16.4

1 0

[alsa-devel] [PATCH 0/2] ASoC: fsl: audmix: fix two issues
by Viorel Suman 09 Apr '19

09 Apr '19

The latest audmix patch-set (v5) had the "model" attribute removed as requested by Nicolin Chen, but looks like (v4) version of DAI driver reached "for-next" branch - fix this. Asside of this fix object reference leaks in machine probe reported by Julia Lawall. Viorel Suman (2): ASoC: fsl_audmix: remove "model" attribute ASoC: imx-audmix: fix object reference leaks in probe sound/soc/fsl/fsl_audmix.c | 61 ++++++++++++++++++++++++---------------------- sound/soc/fsl/imx-audmix.c | 31 +++++++++-------------- 2 files changed, 43 insertions(+), 49 deletions(-) -- 2.7.4

2 5

[alsa-devel] [PATCH] ALSA: hda - Add two more machines to the power_save_blacklist
by Hui Wang 09 Apr '19

09 Apr '19

Recently we set CONFIG_SND_HDA_POWER_SAVE_DEFAULT to 1 when configuring the kernel, then two machines were reported to have noise after installing the new kernel. Put them in the blacklist, the noise disappears. https://bugs.launchpad.net/bugs/1821663 Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ece256a3b48f..f62fb8b16c49 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2150,6 +2150,9 @@ static struct snd_pci_quirk power_save_blacklist[] = { SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0), /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */ SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0), + /* https://bugs.launchpad.net/bugs/1821663 */ + SND_PCI_QUIRK(0x1631, 0xe017, "Packard Bell NEC IMEDIA 5204", 0), + SND_PCI_QUIRK(0x8086, 0x2064, "Intel Laptop 8086:2064", 0), {} }; #endif /* CONFIG_PM */ -- 2.17.1

4 4

[alsa-devel] [PATCH v2 0/4] soundwire: code cleanup
by Pierre-Louis Bossart 08 Apr '19

08 Apr '19

SoundWire support will be provided in Linux with the Sound Open Firmware (SOF) on Intel platforms. Before we start adding the missing pieces, there are a number of warnings and style issues reported by checkpatch, cppcheck and Coccinelle that need to be cleaned-up. Changes since v1: added missing newlines in new patch (suggested by Joe Perches) Pierre-Louis Bossart (4): soundwire: fix style issues soundwire: bus: remove useless initializations soundwire: stream: remove useless initialization of local variable soundwire: add missing newlines in dynamic debug logs drivers/soundwire/Kconfig | 2 +- drivers/soundwire/bus.c | 137 ++++++++------- drivers/soundwire/bus.h | 16 +- drivers/soundwire/bus_type.c | 4 +- drivers/soundwire/cadence_master.c | 99 +++++------ drivers/soundwire/cadence_master.h | 22 +-- drivers/soundwire/intel.c | 101 ++++++----- drivers/soundwire/intel.h | 4 +- drivers/soundwire/intel_init.c | 12 +- drivers/soundwire/mipi_disco.c | 116 +++++++------ drivers/soundwire/slave.c | 10 +- drivers/soundwire/stream.c | 267 +++++++++++++++-------------- 12 files changed, 403 insertions(+), 387 deletions(-) -- 2.17.1

1 4

[alsa-devel] [asoc:for-5.1 329/329] sound/soc/soc-pcm.c:659 soc_pcm_open() warn: inconsistent returns 'mutex:&rtd->pcm_mutex'.
by Dan Carpenter 08 Apr '19

08 Apr '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1 head: 52034add758e268c39110f33d46e2a9492e82aef commit: 52034add758e268c39110f33d46e2a9492e82aef [329/329] ASoC: pcm: update module refcount if module_get_upon_open is set smatch warnings: sound/soc/soc-pcm.c:659 soc_pcm_open() warn: inconsistent returns 'mutex:&rtd->pcm_mutex'. Locked on: line 522 Unlocked on: line 622 # https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?i… git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout 52034add758e268c39110f33d46e2a9492e82aef vim +659 sound/soc/soc-pcm.c 244e2936 Charles Keepax 2018-06-19 474 58ba9b25 Mark Brown 2012-01-16 475 /* ddee627c Liam Girdwood 2011-06-09 476 * Called by ALSA when a PCM substream is opened, the runtime->hw record is ddee627c Liam Girdwood 2011-06-09 477 * then initialized and any private data can be allocated. This also calls ef050bec Charles Keepax 2018-04-24 478 * startup for the cpu DAI, component, machine and codec DAI. ddee627c Liam Girdwood 2011-06-09 479 */ ddee627c Liam Girdwood 2011-06-09 480 static int soc_pcm_open(struct snd_pcm_substream *substream) ddee627c Liam Girdwood 2011-06-09 481 { ddee627c Liam Girdwood 2011-06-09 482 struct snd_soc_pcm_runtime *rtd = substream->private_data; ddee627c Liam Girdwood 2011-06-09 483 struct snd_pcm_runtime *runtime = substream->runtime; 90be711e Kuninori Morimoto 2017-08-08 484 struct snd_soc_component *component; 90be711e Kuninori Morimoto 2017-08-08 485 struct snd_soc_rtdcom_list *rtdcom; ddee627c Liam Girdwood 2011-06-09 486 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 2e5894d7 Benoit Cousson 2014-07-08 487 struct snd_soc_dai *codec_dai; 2e5894d7 Benoit Cousson 2014-07-08 488 const char *codec_dai_name = "multicodec"; 244e2936 Charles Keepax 2018-06-19 489 int i, ret = 0; ddee627c Liam Girdwood 2011-06-09 490 988e8cc4 Nicolin Chen 2013-11-04 491 pinctrl_pm_select_default_state(cpu_dai->dev); 0b7990e3 Kuninori Morimoto 2018-09-03 492 for_each_rtd_codec_dai(rtd, i, codec_dai) 0b7990e3 Kuninori Morimoto 2018-09-03 493 pinctrl_pm_select_default_state(codec_dai->dev); 90be711e Kuninori Morimoto 2017-08-08 494 90be711e Kuninori Morimoto 2017-08-08 495 for_each_rtdcom(rtd, rtdcom) { 90be711e Kuninori Morimoto 2017-08-08 496 component = rtdcom->component; 90be711e Kuninori Morimoto 2017-08-08 497 90be711e Kuninori Morimoto 2017-08-08 498 pm_runtime_get_sync(component->dev); 90be711e Kuninori Morimoto 2017-08-08 499 } d6652ef8 Mark Brown 2011-12-03 500 b8c0dab9 Liam Girdwood 2011-06-09 501 mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); ^^^^^^^^^^^^^^^ ddee627c Liam Girdwood 2011-06-09 502 ddee627c Liam Girdwood 2011-06-09 503 /* startup the audio subsystem */ 9900a422 Kuninori Morimoto 2017-09-25 504 if (cpu_dai->driver->ops->startup) { ddee627c Liam Girdwood 2011-06-09 505 ret = cpu_dai->driver->ops->startup(substream, cpu_dai); ddee627c Liam Girdwood 2011-06-09 506 if (ret < 0) { 103d84a3 Liam Girdwood 2012-11-19 507 dev_err(cpu_dai->dev, "ASoC: can't open interface" 103d84a3 Liam Girdwood 2012-11-19 508 " %s: %d\n", cpu_dai->name, ret); ddee627c Liam Girdwood 2011-06-09 509 goto out; ^^^^^^^^^ ddee627c Liam Girdwood 2011-06-09 510 } ddee627c Liam Girdwood 2011-06-09 511 } ddee627c Liam Girdwood 2011-06-09 512 b8135864 Kuninori Morimoto 2017-10-11 513 for_each_rtdcom(rtd, rtdcom) { b8135864 Kuninori Morimoto 2017-10-11 514 component = rtdcom->component; b8135864 Kuninori Morimoto 2017-10-11 515 b8135864 Kuninori Morimoto 2017-10-11 516 if (!component->driver->ops || b8135864 Kuninori Morimoto 2017-10-11 517 !component->driver->ops->open) b8135864 Kuninori Morimoto 2017-10-11 518 continue; b8135864 Kuninori Morimoto 2017-10-11 519 52034add Ranjani Sridharan 2019-04-05 520 if (component->driver->module_get_upon_open && 52034add Ranjani Sridharan 2019-04-05 521 !try_module_get(component->dev->driver->owner)) 52034add Ranjani Sridharan 2019-04-05 522 return -ENODEV; ^^^^^^^^^^^^^^^ We need some error handling before returning. 52034add Ranjani Sridharan 2019-04-05 523 244e2936 Charles Keepax 2018-06-19 524 ret = component->driver->ops->open(substream); 244e2936 Charles Keepax 2018-06-19 525 if (ret < 0) { b8135864 Kuninori Morimoto 2017-10-11 526 dev_err(component->dev, b8135864 Kuninori Morimoto 2017-10-11 527 "ASoC: can't open component %s: %d\n", 244e2936 Charles Keepax 2018-06-19 528 component->name, ret); 244e2936 Charles Keepax 2018-06-19 529 goto component_err; b8135864 Kuninori Morimoto 2017-10-11 530 } b8135864 Kuninori Morimoto 2017-10-11 531 } 244e2936 Charles Keepax 2018-06-19 532 component = NULL; b8135864 Kuninori Morimoto 2017-10-11 533 0b7990e3 Kuninori Morimoto 2018-09-03 534 for_each_rtd_codec_dai(rtd, i, codec_dai) { 9900a422 Kuninori Morimoto 2017-09-25 535 if (codec_dai->driver->ops->startup) { 2e5894d7 Benoit Cousson 2014-07-08 536 ret = codec_dai->driver->ops->startup(substream, 2e5894d7 Benoit Cousson 2014-07-08 537 codec_dai); ddee627c Liam Girdwood 2011-06-09 538 if (ret < 0) { 2e5894d7 Benoit Cousson 2014-07-08 539 dev_err(codec_dai->dev, 2e5894d7 Benoit Cousson 2014-07-08 540 "ASoC: can't open codec %s: %d\n", 2e5894d7 Benoit Cousson 2014-07-08 541 codec_dai->name, ret); ddee627c Liam Girdwood 2011-06-09 542 goto codec_dai_err; ddee627c Liam Girdwood 2011-06-09 543 } ddee627c Liam Girdwood 2011-06-09 544 } ddee627c Liam Girdwood 2011-06-09 545 2e5894d7 Benoit Cousson 2014-07-08 546 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 2e5894d7 Benoit Cousson 2014-07-08 547 codec_dai->tx_mask = 0; 2e5894d7 Benoit Cousson 2014-07-08 548 else 2e5894d7 Benoit Cousson 2014-07-08 549 codec_dai->rx_mask = 0; 2e5894d7 Benoit Cousson 2014-07-08 550 } 2e5894d7 Benoit Cousson 2014-07-08 551 75ab9eb6 Kuninori Morimoto 2017-09-26 552 if (rtd->dai_link->ops->startup) { ddee627c Liam Girdwood 2011-06-09 553 ret = rtd->dai_link->ops->startup(substream); ddee627c Liam Girdwood 2011-06-09 554 if (ret < 0) { 103d84a3 Liam Girdwood 2012-11-19 555 pr_err("ASoC: %s startup failed: %d\n", 25bfe662 Mark Brown 2012-02-01 556 rtd->dai_link->name, ret); ddee627c Liam Girdwood 2011-06-09 557 goto machine_err; ddee627c Liam Girdwood 2011-06-09 558 } ddee627c Liam Girdwood 2011-06-09 559 } ddee627c Liam Girdwood 2011-06-09 560 01d7584c Liam Girdwood 2012-04-25 561 /* Dynamic PCM DAI links compat checks use dynamic capabilities */ 01d7584c Liam Girdwood 2012-04-25 562 if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) 01d7584c Liam Girdwood 2012-04-25 563 goto dynamic; 01d7584c Liam Girdwood 2012-04-25 564 ddee627c Liam Girdwood 2011-06-09 565 /* Check that the codec and cpu DAIs are compatible */ 2e5894d7 Benoit Cousson 2014-07-08 566 soc_pcm_init_runtime_hw(substream); 2e5894d7 Benoit Cousson 2014-07-08 567 2e5894d7 Benoit Cousson 2014-07-08 568 if (rtd->num_codecs == 1) 2e5894d7 Benoit Cousson 2014-07-08 569 codec_dai_name = rtd->codec_dai->name; ddee627c Liam Girdwood 2011-06-09 570 62e5f676 Lars-Peter Clausen 2013-11-30 571 if (soc_pcm_has_symmetry(substream)) 62e5f676 Lars-Peter Clausen 2013-11-30 572 runtime->hw.info |= SNDRV_PCM_INFO_JOINT_DUPLEX; 62e5f676 Lars-Peter Clausen 2013-11-30 573 ddee627c Liam Girdwood 2011-06-09 574 ret = -EINVAL; ddee627c Liam Girdwood 2011-06-09 575 if (!runtime->hw.rates) { 103d84a3 Liam Girdwood 2012-11-19 576 printk(KERN_ERR "ASoC: %s <-> %s No matching rates\n", 2e5894d7 Benoit Cousson 2014-07-08 577 codec_dai_name, cpu_dai->name); ddee627c Liam Girdwood 2011-06-09 578 goto config_err; ddee627c Liam Girdwood 2011-06-09 579 } ddee627c Liam Girdwood 2011-06-09 580 if (!runtime->hw.formats) { 103d84a3 Liam Girdwood 2012-11-19 581 printk(KERN_ERR "ASoC: %s <-> %s No matching formats\n", 2e5894d7 Benoit Cousson 2014-07-08 582 codec_dai_name, cpu_dai->name); ddee627c Liam Girdwood 2011-06-09 583 goto config_err; ddee627c Liam Girdwood 2011-06-09 584 } ddee627c Liam Girdwood 2011-06-09 585 if (!runtime->hw.channels_min || !runtime->hw.channels_max || ddee627c Liam Girdwood 2011-06-09 586 runtime->hw.channels_min > runtime->hw.channels_max) { 103d84a3 Liam Girdwood 2012-11-19 587 printk(KERN_ERR "ASoC: %s <-> %s No matching channels\n", 2e5894d7 Benoit Cousson 2014-07-08 588 codec_dai_name, cpu_dai->name); ddee627c Liam Girdwood 2011-06-09 589 goto config_err; ddee627c Liam Girdwood 2011-06-09 590 } ddee627c Liam Girdwood 2011-06-09 591 c8dd1fec Benoit Cousson 2014-07-01 592 soc_pcm_apply_msb(substream); 58ba9b25 Mark Brown 2012-01-16 593 ddee627c Liam Girdwood 2011-06-09 594 /* Symmetry only applies if we've already got an active stream. */ 17841020 Dong Aisheng 2011-08-29 595 if (cpu_dai->active) { 17841020 Dong Aisheng 2011-08-29 596 ret = soc_pcm_apply_symmetry(substream, cpu_dai); 17841020 Dong Aisheng 2011-08-29 597 if (ret != 0) 17841020 Dong Aisheng 2011-08-29 598 goto config_err; 17841020 Dong Aisheng 2011-08-29 599 } 17841020 Dong Aisheng 2011-08-29 600 0b7990e3 Kuninori Morimoto 2018-09-03 601 for_each_rtd_codec_dai(rtd, i, codec_dai) { 0b7990e3 Kuninori Morimoto 2018-09-03 602 if (codec_dai->active) { 0b7990e3 Kuninori Morimoto 2018-09-03 603 ret = soc_pcm_apply_symmetry(substream, codec_dai); ddee627c Liam Girdwood 2011-06-09 604 if (ret != 0) ddee627c Liam Girdwood 2011-06-09 605 goto config_err; ddee627c Liam Girdwood 2011-06-09 606 } 2e5894d7 Benoit Cousson 2014-07-08 607 } ddee627c Liam Girdwood 2011-06-09 608 103d84a3 Liam Girdwood 2012-11-19 609 pr_debug("ASoC: %s <-> %s info:\n", 2e5894d7 Benoit Cousson 2014-07-08 610 codec_dai_name, cpu_dai->name); 103d84a3 Liam Girdwood 2012-11-19 611 pr_debug("ASoC: rate mask 0x%x\n", runtime->hw.rates); 103d84a3 Liam Girdwood 2012-11-19 612 pr_debug("ASoC: min ch %d max ch %d\n", runtime->hw.channels_min, ddee627c Liam Girdwood 2011-06-09 613 runtime->hw.channels_max); 103d84a3 Liam Girdwood 2012-11-19 614 pr_debug("ASoC: min rate %d max rate %d\n", runtime->hw.rate_min, ddee627c Liam Girdwood 2011-06-09 615 runtime->hw.rate_max); ddee627c Liam Girdwood 2011-06-09 616 01d7584c Liam Girdwood 2012-04-25 617 dynamic: 24894b76 Lars-Peter Clausen 2014-03-05 618 24894b76 Lars-Peter Clausen 2014-03-05 619 snd_soc_runtime_activate(rtd, substream->stream); 24894b76 Lars-Peter Clausen 2014-03-05 620 b8c0dab9 Liam Girdwood 2011-06-09 621 mutex_unlock(&rtd->pcm_mutex); ddee627c Liam Girdwood 2011-06-09 622 return 0; ddee627c Liam Girdwood 2011-06-09 623 ddee627c Liam Girdwood 2011-06-09 624 config_err: 75ab9eb6 Kuninori Morimoto 2017-09-26 625 if (rtd->dai_link->ops->shutdown) ddee627c Liam Girdwood 2011-06-09 626 rtd->dai_link->ops->shutdown(substream); ddee627c Liam Girdwood 2011-06-09 627 ddee627c Liam Girdwood 2011-06-09 628 machine_err: 2e5894d7 Benoit Cousson 2014-07-08 629 i = rtd->num_codecs; 2e5894d7 Benoit Cousson 2014-07-08 630 2e5894d7 Benoit Cousson 2014-07-08 631 codec_dai_err: 6d11b128 Kuninori Morimoto 2018-09-18 632 for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { ddee627c Liam Girdwood 2011-06-09 633 if (codec_dai->driver->ops->shutdown) ddee627c Liam Girdwood 2011-06-09 634 codec_dai->driver->ops->shutdown(substream, codec_dai); 2e5894d7 Benoit Cousson 2014-07-08 635 } ddee627c Liam Girdwood 2011-06-09 636 b8135864 Kuninori Morimoto 2017-10-11 637 component_err: 244e2936 Charles Keepax 2018-06-19 638 soc_pcm_components_close(substream, component); b8135864 Kuninori Morimoto 2017-10-11 639 ddee627c Liam Girdwood 2011-06-09 640 if (cpu_dai->driver->ops->shutdown) ddee627c Liam Girdwood 2011-06-09 641 cpu_dai->driver->ops->shutdown(substream, cpu_dai); ddee627c Liam Girdwood 2011-06-09 642 out: b8c0dab9 Liam Girdwood 2011-06-09 643 mutex_unlock(&rtd->pcm_mutex); d6652ef8 Mark Brown 2011-12-03 644 90be711e Kuninori Morimoto 2017-08-08 645 for_each_rtdcom(rtd, rtdcom) { 90be711e Kuninori Morimoto 2017-08-08 646 component = rtdcom->component; 90be711e Kuninori Morimoto 2017-08-08 647 90be711e Kuninori Morimoto 2017-08-08 648 pm_runtime_mark_last_busy(component->dev); 90be711e Kuninori Morimoto 2017-08-08 649 pm_runtime_put_autosuspend(component->dev); 3f809783 Sanyog Kale 2016-01-05 650 } 3f809783 Sanyog Kale 2016-01-05 651 0b7990e3 Kuninori Morimoto 2018-09-03 652 for_each_rtd_codec_dai(rtd, i, codec_dai) { 0b7990e3 Kuninori Morimoto 2018-09-03 653 if (!codec_dai->active) 0b7990e3 Kuninori Morimoto 2018-09-03 654 pinctrl_pm_select_sleep_state(codec_dai->dev); 2e5894d7 Benoit Cousson 2014-07-08 655 } 988e8cc4 Nicolin Chen 2013-11-04 656 if (!cpu_dai->active) 988e8cc4 Nicolin Chen 2013-11-04 657 pinctrl_pm_select_sleep_state(cpu_dai->dev); d6652ef8 Mark Brown 2011-12-03 658 ddee627c Liam Girdwood 2011-06-09 @659 return ret; ddee627c Liam Girdwood 2011-06-09 660 } ddee627c Liam Girdwood 2011-06-09 661 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2] pcm: null: Do not allow a period size of 0
by twischer＠de.adit-jv.com 08 Apr '19

08 Apr '19

From: Timo Wischer <twischer(a)de.adit-jv.com> Some applications do not expect that get_period_size_min() could return 0. Therefore these applications cannot use the null plugin without this patch. Due to there is no use case for having a period size of 0 this patch disallows a period size of 0 when using the null plugin. Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> --- Hi Takashi, > Why 32? I thought there is also no use case for a period of 1 frame. Therefore I increased it to a 2^n value to also lower the CPU usage in case of null plugin. > Or does it cause a problem? I do not see any issues here. But for example portaudio will automatically choose a period size of 1 frame which will result in a higher CPU load. But anyway I would also be fine with this higher CPU load if you prefer this patch. Best regards Timo src/pcm/pcm_null.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index ff61624..1d81548 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -261,7 +261,17 @@ static snd_pcm_sframes_t snd_pcm_null_mmap_commit(snd_pcm_t *pcm, static int snd_pcm_null_hw_refine(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_params_t *params) { - int err = snd_pcm_hw_refine_soft(pcm, params); + int err; + + /* Do not return a period size of 0 because for example portaudio cannot + * handle it. + */ + err = _snd_pcm_hw_param_set_min(params, SND_PCM_HW_PARAM_PERIOD_SIZE, 1, + 0); + if (err < 0) + return err; + + err = snd_pcm_hw_refine_soft(pcm, params); params->info = SND_PCM_INFO_MMAP | SND_PCM_INFO_MMAP_VALID | SND_PCM_INFO_RESUME | SND_PCM_INFO_PAUSE; params->fifo_size = 0; -- 2.7.4

2 1