Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] lightnvm: pblk: add lock protection to list operations
To:     Javier Gonzalez <javier@cnexlabs.com>,
        Hua Su <suhua.tanke@gmail.com>
Cc:     Jens Axboe <axboe@kernel.dk>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <20181128091352.5088-1-suhua.tanke@gmail.com>
 <930717BD-D32A-4BE2-AEE6-579594E70842@cnexlabs.com>
From:   =?UTF-8?Q?Matias_Bj=c3=b8rling?= <mb@lightnvm.io>
Message-ID: <ad41a638-4c59-e079-e272-9ebd98ab929b@lightnvm.io>
Date:   Fri, 30 Nov 2018 09:36:11 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <930717BD-D32A-4BE2-AEE6-579594E70842@cnexlabs.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-GB
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 11/28/2018 10:16 AM, Javier Gonzalez wrote:
>> On 28 Nov 2018, at 10.13, Hua Su <suhua.tanke@gmail.com> wrote:
>>
>> Protect the list_add on the pblk_line_init_bb() error
>> path in case this code is used for some other purpose
>> in the future.
>>
>> Signed-off-by: Hua Su <suhua.tanke@gmail.com>
>> ---
>> drivers/lightnvm/pblk-core.c | 13 ++++++++++---
>> 1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
>> index 6944aac43b01..247112e1db94 100644
>> --- a/drivers/lightnvm/pblk-core.c
>> +++ b/drivers/lightnvm/pblk-core.c
>> @@ -1295,15 +1295,22 @@ int pblk_line_recov_alloc(struct pblk *pblk, struct pblk_line *line)
>>
>> 	ret = pblk_line_alloc_bitmaps(pblk, line);
>> 	if (ret)
>> -		return ret;
>> +		goto fail;
>>
>> 	if (!pblk_line_init_bb(pblk, line, 0)) {
>> -		list_add(&line->list, &l_mg->free_list);
>> -		return -EINTR;
>> +		ret = -EINTR;
>> +		goto fail;
>> 	}
>>
>> 	pblk_rl_free_lines_dec(&pblk->rl, line, true);
>> 	return 0;
>> +
>> +fail:
>> +	spin_lock(&l_mg->free_lock);
>> +	list_add(&line->list, &l_mg->free_list);
>> +	spin_unlock(&l_mg->free_lock);
>> +
>> +	return ret;
>> }
>>
>> void pblk_line_recov_close(struct pblk *pblk, struct pblk_line *line)
>> --
>> 2.19.1
> 
> Looks good to me.
> 
> Reviewed-by: Javier González <javier@cnexlabs.com>
> 

Picked up for 4.21.