提交 ec5da7f8 编写于 作者: D Dave Airlie 提交者: Linus Torvalds

fbcon: fix race condition between console lock and cursor timer

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: NDavid Airlie <airlied@redhat.com>
Acked-by: NAlan Cox <alan@lxorguk.ukuu.org.uk>
Cc: stable@vger.kernel.org
Tested-by: NJosh Boyer <jwboyer@gmail.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 9160338d
...@@ -372,8 +372,12 @@ static void fb_flashcursor(struct work_struct *work) ...@@ -372,8 +372,12 @@ static void fb_flashcursor(struct work_struct *work)
struct vc_data *vc = NULL; struct vc_data *vc = NULL;
int c; int c;
int mode; int mode;
int ret;
ret = console_trylock();
if (ret == 0)
return;
console_lock();
if (ops && ops->currcon != -1) if (ops && ops->currcon != -1)
vc = vc_cons[ops->currcon].d; vc = vc_cons[ops->currcon].d;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册