From: Dave Airlie <airlied@redhat.com> To: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, Linus <torvalds@linux-foundation.org>, Alan Cox <alan@lxorguk.ukuu.org.uk>, Randy Dunlap <rdunlap@xenotime.net>, Josh Boyer <jwboyer@gmail.com>, Dave Airlie <airlied@redhat.com> Subject: [PATCH] fbcon: fix race condition between console lock and cursor timer Date: Tue, 21 Aug 2012 16:40:07 +1000 [thread overview] Message-ID: <1345531207-24926-1-git-send-email-airlied@redhat.com> (raw) So we've had a fair few reports of fbcon handover breakage between efi/vesafb and i915 surface recently, so I dedicated a couple of days to finding the problem. Essentially the last thing we saw was the conflicting framebuffer message and that was all. So after much tracing with direct netconsole writes (printks under console_lock not so useful), I think I found the race. Thread A (driver load) Thread B (timer thread) unbind_con_driver -> | bind_con_driver -> | vc->vc_sw->con_deinit -> | fbcon_deinit -> | console_lock() | | | | fbcon_flashcursor timer fires | console_lock() <- blocked for A | | fbcon_del_cursor_timer -> del_timer_sync (BOOM) Of course because all of this is under the console lock, we never see anything, also since we also just unbound the active console guess what we never see anything. Hopefully this fixes the problem for anyone seeing vesafb->kms driver handoff. Signed-off-by: David Airlie <airlied@redhat.com> --- drivers/video/console/fbcon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 2e471c2..f8a79fc 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -372,8 +372,12 @@ static void fb_flashcursor(struct work_struct *work) struct vc_data *vc = NULL; int c; int mode; + int ret; + + ret = console_trylock(); + if (ret == 0) + return; - console_lock(); if (ops && ops->currcon != -1) vc = vc_cons[ops->currcon].d; -- 1.7.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Dave Airlie <airlied@redhat.com> To: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, Linus <torvalds@linux-foundation.org>, Alan Cox <alan@lxorguk.ukuu.org.uk>, Randy Dunlap <rdunlap@xenotime.net>, Josh Boyer <jwboyer@gmail.com>, Dave Airlie <airlied@redhat.com> Subject: [PATCH] fbcon: fix race condition between console lock and cursor timer Date: Tue, 21 Aug 2012 06:40:07 +0000 [thread overview] Message-ID: <1345531207-24926-1-git-send-email-airlied@redhat.com> (raw) So we've had a fair few reports of fbcon handover breakage between efi/vesafb and i915 surface recently, so I dedicated a couple of days to finding the problem. Essentially the last thing we saw was the conflicting framebuffer message and that was all. So after much tracing with direct netconsole writes (printks under console_lock not so useful), I think I found the race. Thread A (driver load) Thread B (timer thread) unbind_con_driver -> | bind_con_driver -> | vc->vc_sw->con_deinit -> | fbcon_deinit -> | console_lock() | | | | fbcon_flashcursor timer fires | console_lock() <- blocked for A | | fbcon_del_cursor_timer -> del_timer_sync (BOOM) Of course because all of this is under the console lock, we never see anything, also since we also just unbound the active console guess what we never see anything. Hopefully this fixes the problem for anyone seeing vesafb->kms driver handoff. Signed-off-by: David Airlie <airlied@redhat.com> --- drivers/video/console/fbcon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 2e471c2..f8a79fc 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -372,8 +372,12 @@ static void fb_flashcursor(struct work_struct *work) struct vc_data *vc = NULL; int c; int mode; + int ret; + + ret = console_trylock(); + if (ret = 0) + return; - console_lock(); if (ops && ops->currcon != -1) vc = vc_cons[ops->currcon].d; -- 1.7.10.2
next reply other threads:[~2012-08-21 6:40 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-21 6:40 Dave Airlie [this message] 2012-08-21 6:40 ` [PATCH] fbcon: fix race condition between console lock and cursor timer Dave Airlie 2012-08-21 9:15 ` Alan Cox 2012-08-21 9:15 ` Alan Cox 2012-08-21 9:15 ` Alan Cox 2012-08-21 9:15 ` Alan Cox 2012-08-21 12:15 ` Peter Zijlstra 2012-08-21 12:15 ` Peter Zijlstra 2012-08-21 12:15 ` Peter Zijlstra 2012-08-21 12:15 ` Peter Zijlstra 2012-08-22 4:00 ` Dave Airlie 2012-08-22 4:00 ` Dave Airlie 2012-08-22 4:00 ` Dave Airlie 2012-08-21 12:14 ` Peter Zijlstra 2012-08-21 12:14 ` Peter Zijlstra 2012-08-21 12:14 ` Peter Zijlstra 2012-08-21 12:14 ` Peter Zijlstra 2012-08-21 13:19 ` Josh Boyer 2012-08-21 13:19 ` Josh Boyer 2012-08-21 13:19 ` Josh Boyer 2012-08-21 13:19 ` Josh Boyer -- strict thread matches above, loose matches on Subject: below -- 2012-08-21 6:40 Dave Airlie 2012-08-21 6:40 Dave Airlie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1345531207-24926-1-git-send-email-airlied@redhat.com \ --to=airlied@redhat.com \ --cc=alan@lxorguk.ukuu.org.uk \ --cc=dri-devel@lists.sf.net \ --cc=jwboyer@gmail.com \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rdunlap@xenotime.net \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.