dvb_demux: Don't use vmalloc at dvb_dmx_swfilter_packet
PATCH 1/1 dvb_demux: Don't use vmalloc at dvb_dmx_swfilter_packet
As dvb_dmx_swfilter_packet() is protected by a spinlock, it shouldn't sleep. However, vmalloc() may call sleep. So, move the initialization of dvb_demux::cnt_storage field to a better place.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- drivers/media/dvb/dvb-core/dvb_demux.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)
drivers/media/dvb/dvb-core/dvb_demux.c +8 -11
@@ -426,16 +426,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) }; }; -if (dvb_demux_tscheck) { -if (!demux->cnt_storage) - demux->cnt_storage =vmalloc (MAX_PID +1 ); - -if (!demux->cnt_storage) { -printk (KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n" ); - dvb_demux_tscheck =0 ; - goto no_dvb_demux_tscheck; - } - +if (demux->cnt_storage) {/* check pkt counter */ if (pid <MAX_PID ) {if (buf[1 ] &0x80 )
@@ -454,7 +445,6 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) };/* end check */ }; -no_dvb_demux_tscheck:list_for_each_entry (feed, &demux->feed_list, list_head) {if ((feed->pid != pid) && (feed->pid !=0x2000 ))
@@ -1258,6 +1248,13 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux) dvbdemux->feed[i].index = i; } +if (dvb_demux_tscheck) { + dvbdemux->cnt_storage =vmalloc (MAX_PID +1 ); + +if (!dvbdemux->cnt_storage) +printk (KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n" ); + } +INIT_LIST_HEAD (&dvbdemux->frontend_list);for (i =0 ; i <DMX_TS_PES_OTHER ; i++) {
Signature · 1 line
1.6.6.1
Quoted 5 lines · Mauro Carvalho Chehab
As
dvb_dmx_swfilter_packet()is protected by a spinlock, it shouldn't sleep. However,vmalloc()may call sleep. So, move the initialization ofdvb_demux::cnt_storagefield to a better place.Signed-off-by Mauro Carvalho Chehab <[email protected]>
Looks good. In fact it is slightly better in that it doesn't disable the global module option for all following demuxes simply for one vmalloc() failure.
Reviewed-by Andy Walls <[email protected]>
Regards,
Andy
Quoted 48 lines
--- drivers/media/dvb/dvb-core/dvb_demux.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)drivers/media/dvb/dvb-core/dvb_demux.c +8
-11@@ -426,16 +426,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) }; }; -if (dvb_demux_tscheck) { -if (!demux->cnt_storage) - demux->cnt_storage =vmalloc (MAX_PID +1 ); - -if (!demux->cnt_storage) { -printk (KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n" ); - dvb_demux_tscheck =0 ; - goto no_dvb_demux_tscheck; - } - +if (demux->cnt_storage) {/* check pkt counter */ if (pid <MAX_PID ) {if (buf[1 ] &0x80 )@@ -454,7 +445,6 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) };/* end check */ }; -no_dvb_demux_tscheck:list_for_each_entry (feed, &demux->feed_list, list_head) {if ((feed->pid != pid) && (feed->pid !=0x2000 ))@@ -1258,6 +1248,13 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux) dvbdemux->feed[i].index = i; } +if (dvb_demux_tscheck) { + dvbdemux->cnt_storage =vmalloc (MAX_PID +1 ); + +if (!dvbdemux->cnt_storage) +printk (KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n" ); + } +INIT_LIST_HEAD (&dvbdemux->frontend_list);for (i =0 ; i <DMX_TS_PES_OTHER ; i++) {