Re: [PATCH printk v2 09/38] netconsole: use console_is_enabled()

John Ogness
2022-11-04T15:13:14Z

On 2022-10-21, Petr Mladek <pmladek@suse.com> wrote:
>> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
>> index bdff9ac5056d..073e59a06f21 100644
>> --- a/drivers/net/netconsole.c
>> +++ b/drivers/net/netconsole.c
>> @@ -332,7 +332,7 @@ static ssize_t enabled_store(struct config_item *item,
>> }
>>
>> if (enabled) { /* true */
>> - if (nt->extended && !(netconsole_ext.flags & CON_ENABLED)) {
>> + if (nt->extended && !console_is_enabled(&netconsole_ext)) {
>> netconsole_ext.flags |= CON_ENABLED;
>> register_console(&netconsole_ext);
>> }
>> @@ -915,7 +915,7 @@ static int __init init_netconsole(void)
>> if (err)
>> goto undonotifier;
>>
>> - if (netconsole_ext.flags & CON_ENABLED)
>> + if (console_is_enabled(&netconsole_ext))
>> register_console(&netconsole_ext);
>> register_console(&netconsole);
>> pr_info("network logging started\n");
>
> This looks like a (mis)use of CON_ENABLED flag.

Yes. When @netconsole_ext is registered, CON_ENABLED is always set. So
it should be set in the static initialization. The first hunk should be
using the new console_is_registered(). The second hunk should be using a
local @extended bool variable. Also, in cleanup_netconsole() it should
check if the console is registered:

if (console_is_registered(&netconsole_ext))
unregister_console(&netconsole_ext);

I will make all of these changes for v3. Then there will be no
checking/setting of CON_ENABLED in the driver.

John Ogness