Message ID | alpine.LNX.2.11.1502271914040.4248@localhost (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
2015-02-27 22:15 GMT+03:00 Scot Doyle <lkml14@scotdoyle.com>: > vt now provides a cursor blink interval via vc_data. Use this > interval instead of the currently hardcoded 200 msecs. Store it in > fbcon_ops to avoid locking the console in cursor_timer_handler(). I regularly execute criu tests on linux-next. For this, I use virtual machine from the digitalocean clould. The current version of linux-next hangs after a few seconds. I use git bisect to find the commit where the problem is appeaed. And it looks like the problem is in this patch. When the kernel hangs, it doesn't report anything on the screen and there is nothing suspicious in logs after reboot. I will try to reproduce the problem in my local enviroment to get more information. There is my config file: https://github.com/avagin/criu-jenkins-digitalocean/blob/d95d9e30a7da8755c47b290630bac7ee1fe7132d/jenkins-scripts/config Thanks, Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 27 May 2015, Andrey Wagin wrote: ... > I regularly execute criu tests on linux-next. For this, I use virtual > machine from the digitalocean clould. The current version of > linux-next hangs after a few seconds. I use git bisect to find the > commit where the problem is appeaed. And it looks like the problem is > in this patch. ... > Thanks, > Andrew Perhaps this pending patch will help: http://marc.info/?l=linux-kernel&m=143219509918969&w=2 Thanks, Scot -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2015-05-27 10:52 GMT+03:00 Scot Doyle <lkml14@scotdoyle.com>: > On Wed, 27 May 2015, Andrey Wagin wrote: > ... >> I regularly execute criu tests on linux-next. For this, I use virtual >> machine from the digitalocean clould. The current version of >> linux-next hangs after a few seconds. I use git bisect to find the >> commit where the problem is appeaed. And it looks like the problem is >> in this patch. > ... >> Thanks, >> Andrew > > Perhaps this pending patch will help: > http://marc.info/?l=linux-kernel&m=143219509918969&w=2 Yes, it helps. Thanks. > > Thanks, > Scot > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index b972106..05b1d1a 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -402,7 +402,7 @@ static void cursor_timer_handler(unsigned long dev_addr) struct fbcon_ops *ops = info->fbcon_par; queue_work(system_power_efficient_wq, &info->queue); - mod_timer(&ops->cursor_timer, jiffies + HZ/5); + mod_timer(&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); } static void fbcon_add_cursor_timer(struct fb_info *info) @@ -417,7 +417,7 @@ static void fbcon_add_cursor_timer(struct fb_info *info) init_timer(&ops->cursor_timer); ops->cursor_timer.function = cursor_timer_handler; - ops->cursor_timer.expires = jiffies + HZ / 5; + ops->cursor_timer.expires = jiffies + ops->cur_blink_jiffies; ops->cursor_timer.data = (unsigned long ) info; add_timer(&ops->cursor_timer); ops->flags |= FBCON_FLAGS_CURSOR_TIMER; @@ -1309,9 +1309,9 @@ static void fbcon_cursor(struct vc_data *vc, int mode) if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1) return; - if (vc->vc_cursor_type & 0x10) - fbcon_del_cursor_timer(info); - else + ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); + fbcon_del_cursor_timer(info); + if (!(vc->vc_cursor_type & 0x10)) fbcon_add_cursor_timer(info); ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 6bd2e0c..7aaa4ea 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h @@ -70,6 +70,7 @@ struct fbcon_ops { struct fb_cursor cursor_state; struct display *p; int currcon; /* Current VC. */ + int cur_blink_jiffies; int cursor_flash; int cursor_reset; int blank_state;