[PATCH 3/4] nvme-pci: propagate (some) errors from host memory buffer setup

[Holger Hoffstätte]

On 09/06/17 15:55, Christoph Hellwig wrote:
> We want to catch command execution errors when resetting the device, so
> propagate errors from the Set Features when setting up the host memory
> buffer.  We keep ignoring memory allocation failures, as the spec
> clearly says that the controller must work without a host memory buffer.

Maybe I'm missing something but I think you forgot to update a bunch of
function signatures in terms of return type. Changing "return" to "return 0"
IMHO makes little sense otherwise.

-h

> @@ -1706,7 +1707,7 @@ static void nvme_setup_host_mem(struct nvme_dev *dev)
>  			"min host memory (%lld MiB) above limit (%d MiB).\n",
>  			min >> ilog2(SZ_1M), max_host_mem_size_mb);
>  		nvme_free_host_mem(dev);
> -		return;
> +		return 0;

[..]

> @@ -1723,7 +1724,7 @@ static void nvme_setup_host_mem(struct nvme_dev *dev)
>  		if (nvme_alloc_host_mem(dev, min, preferred)) {
>  			dev_warn(dev->ctrl.device,
>  				"failed to allocate host memory buffer.\n");
> -			return;
> +			return 0; /* controller must work without HMB */

[..]

> @@ -1731,8 +1732,10 @@ static void nvme_setup_host_mem(struct nvme_dev *dev)
>  			dev->host_mem_size >> ilog2(SZ_1M));
>  	}
>  
> -	if (nvme_set_host_mem(dev, enable_bits))
> +	ret = nvme_set_host_mem(dev, enable_bits);
> +	if (ret)
>  		nvme_free_host_mem(dev);
> +	return ret;