Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH 11/12] device-dax: Add dis-contiguous resource support
To:     Dan Williams <dan.j.williams@intel.com>
Cc:     linux-mm@kvack.org, vishal.l.verma@intel.com,
        dave.hansen@linux.intel.com, hch@lst.de, linux-nvdimm@lists.01.org,
        linux-kernel@vger.kernel.org, jmoyer@redhat.com
References: <158500767138.2088294.17131646259803932461.stgit@dwillia2-desk3.amr.corp.intel.com>
 <158500773552.2088294.8756587190550753100.stgit@dwillia2-desk3.amr.corp.intel.com>
From:   Joao Martins <joao.m.martins@oracle.com>
Message-ID: <d7043cad-076d-d065-f933-b772b4e9c131@oracle.com>
Date:   Tue, 12 May 2020 15:36:50 +0100
MIME-Version: 1.0
In-Reply-To: <158500773552.2088294.8756587190550753100.stgit@dwillia2-desk3.amr.corp.intel.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 3/23/20 11:55 PM, Dan Williams wrote:
> @@ -561,13 +580,26 @@ static int __alloc_dev_dax_range(struct dev_dax *dev_dax, u64 start,
>  	if (start == U64_MAX)
>  		return -EINVAL;
>  
> +	ranges = krealloc(dev_dax->ranges, sizeof(*ranges)
> +			* (dev_dax->nr_range + 1), GFP_KERNEL);
> +	if (!ranges)
> +		return -ENOMEM;
> +
>  	alloc = __request_region(res, start, size, dev_name(dev), 0);
> -	if (!alloc)
> +	if (!alloc) {
> +		kfree(ranges);
>  		return -ENOMEM;
> +	}

Noticed this yesterday while looking at alloc_dev_dax_range().

Is it correct to free @ranges here on __request_region failure?

IIUC krealloc() would free dev_dax->ranges if it succeeds, leaving us without
any valid ranges if __request_region failure case indeed frees @ranges. These
@ranges are being used afterwards when we delete the interface and free the
assigned regions. Perhaps we should remove the kfree() above and set
dev_dax->ranges instead before __request_region; or alternatively change the
call order between krealloc and __request_region? FWIW, krealloc checks if the
object being reallocated already meets the requested size, so perhaps there's no
harm with going with the former.

	Joao