Re: Revert "console: implement lockdep support for console_lock"

Re: Revert "console: implement lockdep support for console_lock"

[Sedat Dilek]

Hi Dave,

people having the fbcon-locking-fixes [1] in their local GIT tree can
revert this change?

commit ff0d05bf73620eb7dc8aee7423e992ef87870bdf
Refs: v3.8-rc5-194-gff0d05b
Author:     Dave Airlie <airlied@gmail.com>
AuthorDate: Thu Jan 31 14:27:03 2013 +1100
Commit:     Dave Airlie <airlied@gmail.com>
CommitDate: Thu Jan 31 15:46:56 2013 +1100

    Revert "console: implement lockdep support for console_lock"

    This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.

    I'll requeue this after the console locking fixes, so lockdep
    is useful again for people until fbcon is fixed.

    Signed-off-by: Dave Airlie <airlied@redhat.com>

Thanks!

Regards,
- Sedat

[1] http://cgit.freedesktop.org/~airlied/linux/log/?h=fbcon-locking-fixes

Re: Revert "console: implement lockdep support for console_lock"

[Daniel Vetter]

On Fri, Feb 1, 2013 at 9:21 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> people having the fbcon-locking-fixes [1] in their local GIT tree can
> revert this change?

Yeah, if you have all the fixes reverting this is fine and appreciated
to increase testing. Dave will probably push the revert himself to
drm-next soon.
-Daniel

>
> commit ff0d05bf73620eb7dc8aee7423e992ef87870bdf
> Refs: v3.8-rc5-194-gff0d05b
> Author:     Dave Airlie <airlied@gmail.com>
> AuthorDate: Thu Jan 31 14:27:03 2013 +1100
> Commit:     Dave Airlie <airlied@gmail.com>
> CommitDate: Thu Jan 31 15:46:56 2013 +1100
>
>     Revert "console: implement lockdep support for console_lock"
>
>     This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.
>
>     I'll requeue this after the console locking fixes, so lockdep
>     is useful again for people until fbcon is fixed.
>
>     Signed-off-by: Dave Airlie <airlied@redhat.com>
>
> Thanks!
>
> Regards,
> - Sedat
>
> [1] http://cgit.freedesktop.org/~airlied/linux/log/?h=fbcon-locking-fixes



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: Revert "console: implement lockdep support for console_lock"

[Sedat Dilek]

On Fri, Feb 1, 2013 at 9:42 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> On Fri, Feb 1, 2013 at 9:21 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>> people having the fbcon-locking-fixes [1] in their local GIT tree can
>> revert this change?
>
> Yeah, if you have all the fixes reverting this is fine and appreciated
> to increase testing. Dave will probably push the revert himself to
> drm-next soon.

[ CCing Ingo ]

The revert is now in -rc6.

Hmmm, I have here...

     CONFIG_LOCKDEP_SUPPORT=y

Excerpts from the revert [1]:
[...]
-#ifdef CONFIG_LOCKDEP
-static struct lockdep_map console_lock_dep_map = {
-       .name = "console_lock"
-};
-#endif
[...]

Checking for CONFIG_LOCKDEP ...

[ lib/Kconfig.debug ]
...
config LOCKDEP
        bool
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT &&
STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
        select STACKTRACE
        select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390
&& !MICROBLAZE
        select KALLSYMS
        select KALLSYMS_ALL
...

---> No help text.
---> Missing pointer to <file:Documentation/lockdep-design.txt>.

[ arch/x86/Kconfig ]
...
config LOCKDEP_SUPPORT
        def_bool y
...

I would have expected a check for CONFIG_LOCKDEP_SUPPORT.
This is BTW with Linux v3.8-rc5!

- Sedat -

[1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=ff0d05bf73620eb7dc8aee7423e992ef87870bdf
[2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=Documentation/lockdep-design.txt

> -Daniel
>
>>
>> commit ff0d05bf73620eb7dc8aee7423e992ef87870bdf
>> Refs: v3.8-rc5-194-gff0d05b
>> Author:     Dave Airlie <airlied@gmail.com>
>> AuthorDate: Thu Jan 31 14:27:03 2013 +1100
>> Commit:     Dave Airlie <airlied@gmail.com>
>> CommitDate: Thu Jan 31 15:46:56 2013 +1100
>>
>>     Revert "console: implement lockdep support for console_lock"
>>
>>     This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.
>>
>>     I'll requeue this after the console locking fixes, so lockdep
>>     is useful again for people until fbcon is fixed.
>>
>>     Signed-off-by: Dave Airlie <airlied@redhat.com>
>>
>> Thanks!
>>
>> Regards,
>> - Sedat
>>
>> [1] http://cgit.freedesktop.org/~airlied/linux/log/?h=fbcon-locking-fixes
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: Revert "console: implement lockdep support for console_lock"

[Sedat Dilek]

On Fri, Feb 1, 2013 at 9:42 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> On Fri, Feb 1, 2013 at 9:21 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>> people having the fbcon-locking-fixes [1] in their local GIT tree can
>> revert this change?
>
> Yeah, if you have all the fixes reverting this is fine and appreciated
> to increase testing. Dave will probably push the revert himself to
> drm-next soon.

When will that happen: drm-next inclusion?

Just FYI:
Pulling fbcon-locking-fixes into Linux-Next (next-20130205) shows some
ugly UTF-8 mismatch, means "fb: rework locking to fix lock ordering on
takeover" is not the same patch as in -next.
Just wanna let you know.

It would be good to inform Andrew and Stephen when this happened, so
Andrew can drop the two fb-fixes from his mmotm-tree.

Thanks!

- Sedat -

> -Daniel
>
>>
>> commit ff0d05bf73620eb7dc8aee7423e992ef87870bdf
>> Refs: v3.8-rc5-194-gff0d05b
>> Author:     Dave Airlie <airlied@gmail.com>
>> AuthorDate: Thu Jan 31 14:27:03 2013 +1100
>> Commit:     Dave Airlie <airlied@gmail.com>
>> CommitDate: Thu Jan 31 15:46:56 2013 +1100
>>
>>     Revert "console: implement lockdep support for console_lock"
>>
>>     This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.
>>
>>     I'll requeue this after the console locking fixes, so lockdep
>>     is useful again for people until fbcon is fixed.
>>
>>     Signed-off-by: Dave Airlie <airlied@redhat.com>
>>
>> Thanks!
>>
>> Regards,
>> - Sedat
>>
>> [1] http://cgit.freedesktop.org/~airlied/linux/log/?h=fbcon-locking-fixes
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: Revert "console: implement lockdep support for console_lock"

[Sedat Dilek]

[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]

On Tue, Feb 5, 2013 at 11:47 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Fri, Feb 1, 2013 at 9:42 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> On Fri, Feb 1, 2013 at 9:21 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>>> people having the fbcon-locking-fixes [1] in their local GIT tree can
>>> revert this change?
>>
>> Yeah, if you have all the fixes reverting this is fine and appreciated
>> to increase testing. Dave will probably push the revert himself to
>> drm-next soon.
>
> When will that happen: drm-next inclusion?
>
> Just FYI:
> Pulling fbcon-locking-fixes into Linux-Next (next-20130205) shows some
> ugly UTF-8 mismatch, means "fb: rework locking to fix lock ordering on
> takeover" is not the same patch as in -next.
> Just wanna let you know.
>
> It would be good to inform Andrew and Stephen when this happened, so
> Andrew can drop the two fb-fixes from his mmotm-tree.
>

Attached the UTF-8 "mismatch" in vt.c.

- Sedat -

> Thanks!
>
> - Sedat -
>
>> -Daniel
>>
>>>
>>> commit ff0d05bf73620eb7dc8aee7423e992ef87870bdf
>>> Refs: v3.8-rc5-194-gff0d05b
>>> Author:     Dave Airlie <airlied@gmail.com>
>>> AuthorDate: Thu Jan 31 14:27:03 2013 +1100
>>> Commit:     Dave Airlie <airlied@gmail.com>
>>> CommitDate: Thu Jan 31 15:46:56 2013 +1100
>>>
>>>     Revert "console: implement lockdep support for console_lock"
>>>
>>>     This reverts commit daee779718a319ff9f83e1ba3339334ac650bb22.
>>>
>>>     I'll requeue this after the console locking fixes, so lockdep
>>>     is useful again for people until fbcon is fixed.
>>>
>>>     Signed-off-by: Dave Airlie <airlied@redhat.com>
>>>
>>> Thanks!
>>>
>>> Regards,
>>> - Sedat
>>>
>>> [1] http://cgit.freedesktop.org/~airlied/linux/log/?h=fbcon-locking-fixes
>>
>>
>>
>> --
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

[-- Attachment #2: VT_C_UTF-8_CRAP.diff --]
[-- Type: application/octet-stream, Size: 1773 bytes --]

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 56dd69c..86b76f4 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3656,7 +3656,7 @@ EXPORT_SYMBOL_GPL(do_unregister_con_driver);
  *     when a driver wants to take over some existing consoles
  *     and become default driver for newly opened ones.
  *
- *      take_over_console is basically a register followed by unbind
+ *     take_over_console is basically a register followed by unbind
  */
 int do_take_over_console(const struct consw *csw, int first, int last, int deflt)
 {
@@ -3666,7 +3666,7 @@ int do_take_over_console(const struct consw *csw, int first, int last, int deflt
        /*
         * If we get an busy error we still want to bind the console driver
         * and return success, as we may have unbound the console driver
-        * but not unregistered it.
+        * but not unregistered it.
         */
        if (err == -EBUSY)
                err = 0;
@@ -3682,7 +3682,7 @@ EXPORT_SYMBOL_GPL(do_take_over_console);
  *     when a driver wants to take over some existing consoles
  *     and become default driver for newly opened ones.
  *
- *      take_over_console is basically a register followed by unbind
+ *     take_over_console is basically a register followed by unbind
  */
 int take_over_console(const struct consw *csw, int first, int last, int deflt)
 {
@@ -3692,7 +3692,7 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)
        /*
         * If we get an busy error we still want to bind the console driver
         * and return success, as we may have unbound the console driver
-        * but not unregistered it.
+        * but not unregistered it.
         */
        if (err == -EBUSY)
                err = 0;