[PATCH] fbcon: warn on invalid cursor blink intervals
> -Original Message- > From: Henrique de Moraes Holschuh [mailto:hmh at hmh.eng.br] > Sent: Saturday, May 28, 2016 4:49 AM > To: Scot Doyle > Cc: Tomi Valkeinen ; Jean-Christophe Plagniol- > Villard ; Greg Kroah-Hartman > ; Jeremy Kerr ; Ming Lei > ; Daney, David ; > Dann Frazier ; Peter Hurley > ; Pavel Machek ; Jonathan Liu > ; Alistair Popple ; > Jean-Philippe > Brucker ; Chintakuntla, Radha > ; Jiri Slaby ; David > Airlie ; David Daney ; dri- > devel at lists.freedesktop.org; linux-fbdev at vger.kernel.org; Linux Kernel > Mailing List ; stable > > Subject: Re: [PATCH] fbcon: warn on invalid cursor blink intervals > > On Fri, 20 May 2016, Scot Doyle wrote: > > On Fri, 20 May 2016, Jeremy Kerr wrote: > > > >Then looks there are two fix patches acked & tested: > > > > > > > > - the patch in this thread > > > > - another one "[PATCH] tty: vt: Fix soft lockup in fbcon cursor > > > >blink timer." > > > > https://lkml.org/lkml/2016/5/17/455 > > > > > > > >So which one will be pushed to linus? > > > > > > Not that it's my call, but we may want both; the first as a safety > > > measure to prevent an invalid cur_blink_jiffies ever being set, and the > > > second one to actually fix the initialisation of vc_cur_blink_ms (and > > > address the warning introduced by the first). > > > > Tomi / Greg, > > > > I'd suggest > > - applying "tty: vt: Fix soft lockup in fbcon cursor blink timer." to 4.7 > > and > stable[4.2] > > - applying "fbcon: warn on invalid cursor blink intervals" to 4.7 > > - ignoring "fbcon: use default if cursor blink interval is not valid" > > > > Note: the patches don't depend on each other > > I applied both recommended patches on top of 4.4.11 for testing, and they > made things a lot better here. > > I suggest the second patch should be backported to stable too, might as well > fix this thing for good *and keep the door closed*. Is this patch available on some tree so that I can point to ? And hope it will make it to linux-next soon ? > > -- > "One disk to rule them all, One disk to find them. One disk to bring > them all and in the darkness grind them. In the Land of Redmond > where the shadows lie." -- The Silicon Valley Tarot > Henrique Holschuh
[PATCH] fbcon: warn on invalid cursor blink intervals
On Fri, 20 May 2016, Scot Doyle wrote: > On Fri, 20 May 2016, Jeremy Kerr wrote: > > >Then looks there are two fix patches acked & tested: > > > > > > - the patch in this thread > > > - another one "[PATCH] tty: vt: Fix soft lockup in fbcon cursor > > >blink timer." > > > https://lkml.org/lkml/2016/5/17/455 > > > > > >So which one will be pushed to linus? > > > > Not that it's my call, but we may want both; the first as a safety > > measure to prevent an invalid cur_blink_jiffies ever being set, and the > > second one to actually fix the initialisation of vc_cur_blink_ms (and > > address the warning introduced by the first). > > Tomi / Greg, > > I'd suggest > - applying "tty: vt: Fix soft lockup in fbcon cursor blink timer." to 4.7 and > stable[4.2] > - applying "fbcon: warn on invalid cursor blink intervals" to 4.7 > - ignoring "fbcon: use default if cursor blink interval is not valid" > > Note: the patches don't depend on each other I applied both recommended patches on top of 4.4.11 for testing, and they made things a lot better here. I suggest the second patch should be backported to stable too, might as well fix this thing for good *and keep the door closed*. -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
[PATCH] fbcon: warn on invalid cursor blink intervals
On Thu, 19 May 2016, Scot Doyle wrote: > Two systems are locking on boot [1] because ops->cur_blink_jiffies > is set to zero from vc->vc_cur_blink_ms. > > Ignore such invalid intervals and log a warning. > > [1] https://bugs.launchpad.net/bugs/1574814 > > Suggested-by: David Daney > Signed-off-by: Scot Doyle > Cc: [v4.2] FWIW: Tested-by: Henrique de Moraes Holschuh on top of 4.4.11. And nothing caused it to issue warnings here, so far (with the other recommended patch applied first). > --- > drivers/video/console/fbcon.c | 14 -- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c > index 6e92917..fad5b89 100644 > --- a/drivers/video/console/fbcon.c > +++ b/drivers/video/console/fbcon.c > @@ -1095,7 +1095,13 @@ static void fbcon_init(struct vc_data *vc, int init) > con_copy_unimap(vc, svc); > > ops = info->fbcon_par; > - ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); > + > + if (vc->vc_cur_blink_ms >= 50) > + ops->cur_blink_jiffies = > + msecs_to_jiffies(vc->vc_cur_blink_ms); > + else > + WARN_ONCE(1, "blink interval < 50 ms"); > + > p->con_rotate = initial_rotation; > set_blitting_type(vc, info); > > @@ -1309,7 +1315,11 @@ static void fbcon_cursor(struct vc_data *vc, int mode) > int y; > int c = scr_readw((u16 *) vc->vc_pos); > > - ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); > + if (vc->vc_cur_blink_ms >= 50) > + ops->cur_blink_jiffies = > + msecs_to_jiffies(vc->vc_cur_blink_ms); > + else > + WARN_ONCE(1, "blink interval < 50 ms"); > > if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1) > return; -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
