Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <5a1a600a-5a1f-d93b-e854-2586c412e505@kernel.org>
Date:   Wed, 8 Jun 2022 09:44:12 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 33/36] tty/vt: consolemap: change refcount only if needed
 in con_do_clear_unimap()
Content-Language: en-US
To:     =?UTF-8?Q?Ilpo_J=c3=a4rvinen?= <ilpo.jarvinen@linux.intel.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-serial <linux-serial@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
References: <20220607104946.18710-1-jslaby@suse.cz>
 <20220607104946.18710-33-jslaby@suse.cz>
 <ce9f52c5-4b46-77a8-8dd4-1de787e5b8b@linux.intel.com>
From:   Jiri Slaby <jirislaby@kernel.org>
In-Reply-To: <ce9f52c5-4b46-77a8-8dd4-1de787e5b8b@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 07. 06. 22, 17:31, Ilpo Järvinen wrote:
> On Tue, 7 Jun 2022, Jiri Slaby wrote:
> 
>> con_do_clear_unimap() currently decreases and increases refcount of old
>> dictionary in a back and forth fashion. This makes the code really hard
>> to follow. Decrease the refcount only if everything went well and we
>> really allocated a new one and decoupled from the old dictionary.
>>
>> I sincerelly hope I did not make a mistake in this (ill) logic.
>>
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> 
> It seems fine:
> 
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> 
> One unrelated comment below for additional cleanup opportunity.
> 
>> ---
>>   drivers/tty/vt/consolemap.c | 13 +++++++------
>>   1 file changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
>> index 01b7e49f1f91..4d8efe74315c 100644
>> --- a/drivers/tty/vt/consolemap.c
>> +++ b/drivers/tty/vt/consolemap.c
>> @@ -535,22 +535,23 @@ static int con_do_clear_unimap(struct vc_data *vc)
>>   {
>>   	struct uni_pagedict *old = *vc->vc_uni_pagedir_loc;
>>   
>> -	if (!old || --old->refcount) {
>> +	if (!old || old->refcount > 1) {
>>   		struct uni_pagedict *new = kzalloc(sizeof(*new), GFP_KERNEL);
>> -		if (!new) {
>> -			if (old)
>> -				old->refcount++;
>> +		if (!new)
>>   			return -ENOMEM;
>> -		}
>> +
>>   		new->refcount = 1;
>>   		*vc->vc_uni_pagedir_loc = new;
>> +
>> +		if (old)
>> +			old->refcount--;
>>   	} else {
>>   		if (old == dflt)
>>   			dflt = NULL;
> 
> This seems unnecessary as con_release_unimap() already does it.

Good point -- the code is real mess... Now, the mess is more apparent, 
at least ;).

I will create a separate patch for this.

thanks,
-- 
js
suse labs