On 03/14/2016 01:19 PM, Mauro Carvalho Chehab wrote:
> The notify routines may sleep. So, they can't be called in spinlock
> context. Also, they may want to call other media routines that might
> be spinning the spinlock, like creating a link.
>
> This fixes the following bug:
>
> [ 1839.510587] BUG: sleeping function called from invalid context at
> mm/slub.c:1289
> [ 1839.510881] in_atomic(): 1, irqs_disabled(): 0, pid: 3479, name: modprobe
> [ 1839.511157] 4 locks held by modprobe/3479:
> [ 1839.511415] #0: (>mutex){..}, at: []
> __driver_attach+0xa3/0x160
> [ 1839.512381] #1: (>mutex){..}, at: []
> __driver_attach+0xb1/0x160
> [ 1839.512388] #2: (register_mutex#5){+.+.+.}, at: []
> usb_audio_probe+0x257/0x1c90 [snd_usb_audio]
> [ 1839.512401] #3: (&(>lock)->rlock){+.+.+.}, at:
> [] media_device_register_entity+0x1cb/0x700 [media]
> [ 1839.512412] CPU: 2 PID: 3479 Comm: modprobe Not tainted 4.5.0-rc3+ #49
> [ 1839.512415] Hardware name: /NUC5i7RYB, BIOS
> RYBDWi35.86A.0350.2015.0812.1722 08/12/2015
> [ 1839.512417] 8803b3f6f288 81933901
> 8803c4bae000
> [ 1839.512422] 8803c4bae5c8 8803b3f6f2b0 811c6af5
> 8803c4bae000
> [ 1839.512427] 8285d7f6 0509 8803b3f6f2f0
> 811c6ce5
> [ 1839.512432] Call Trace:
> [ 1839.512436] [] dump_stack+0x85/0xc4
> [ 1839.512440] [] ___might_sleep+0x245/0x3a0
> [ 1839.512443] [] __might_sleep+0x95/0x1a0
> [ 1839.512446] [] kmem_cache_alloc_trace+0x20e/0x300
> [ 1839.512451] [] ? media_add_link+0x4d/0x140 [media]
> [ 1839.512455] [] media_add_link+0x4d/0x140 [media]
> [ 1839.512459] [] media_create_pad_link+0xa1/0x600 [media]
> [ 1839.512463] [] au0828_media_graph_notify+0x173/0x360
> [au0828]
> [ 1839.512467] [] ? media_gobj_create+0x1ba/0x480 [media]
> [ 1839.512471] [] media_device_register_entity+0x3ab/0x700
> [media]
>
> Tested with an HVR-950Q, under the following testcases:
>
> 1) load au0828 driver first, and then snd-usb-audio;
> 2) load snd-usb-audio driver first, and then au0828;
> 3) loading both drivers, and then connecting the device.
>
> Signed-off-by: Mauro Carvalho Chehab
Looks good. Tested. Inserting device with au0828 blacklisted. Just the audio
graph
gets created and then modprobed au0828. The complete graph looks good. Also
tested
without blacklisting, so both drivers are probed together. Graph looks good.
Tested-by: Shuah Khan
thanks,
-- Shuah
> ---
>
> Please disconsider verison 1. It got amended with an experimental patch.
>
> drivers/media/media-device.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
> index 6ba6e8f982fc..fc3c199e5500 100644
> --- a/drivers/media/media-device.c
> +++ b/drivers/media/media-device.c
> @@ -587,14 +587,15 @@ int __must_check media_device_register_entity(struct
> media_device *mdev,
> media_gobj_create(mdev, MEDIA_GRAPH_PAD,
> >pads[i].graph_obj);
>
> + spin_unlock(>lock);
> +
> /* invoke entity_notify callbacks */
> list_for_each_entry_safe(notify, next, >entity_notify, list) {
> (notify)->notify(entity, notify->notify_data);
> }
>
> - spin_unlock(>lock);
> -
> mutex_lock(>graph_mutex);
> +
> if (mdev->entity_internal_idx_max
> >= mdev->pm_count_walk.ent_enum.idx_max) {
> struct media_entity_graph new = { .top = 0 };
>
--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shua...@osg.samsung.com | (970) 217-8978
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
