[PATCH 1/3] hv: hv_util: move vmbus_open() to a later place

Vitaly Kuznetsov vkuznets at redhat.com
Thu Jan 29 13:12:33 UTC 2015


Dexuan Cui <decui at microsoft.com> writes:

> Before the line vmbus_open() returns, srv->util_cb can be already running
> and the variablies, like util_fw_version, are needed by the srv->util_cb.
>
> So we have to make sure the variables are initialized before the vmbus_open().
>
> CC: "K. Y. Srinivasan" <kys at microsoft.com>
> Signed-off-by: Dexuan Cui <decui at microsoft.com>

It is not said in the description but moving hv_set_drvdata() before
vmbus_open() make sense in case probe and remove can collide (can
they?).

Reviewed-by: Vitaly Kuznetsov <vkuznets at redhat.com>

> ---
>  drivers/hv/hv_util.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
> index 3b9c9ef..c5be773 100644
> --- a/drivers/hv/hv_util.c
> +++ b/drivers/hv/hv_util.c
> @@ -340,12 +340,8 @@ static int util_probe(struct hv_device *dev,
>
>  	set_channel_read_state(dev->channel, false);
>
> -	ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, 0,
> -			srv->util_cb, dev->channel);
> -	if (ret)
> -		goto error;
> -
>  	hv_set_drvdata(dev, srv);
> +
>  	/*
>  	 * Based on the host; initialize the framework and
>  	 * service version numbers we will negotiate.
> @@ -365,6 +361,11 @@ static int util_probe(struct hv_device *dev,
>  		hb_srv_version = HB_VERSION;
>  	}
>
> +	ret = vmbus_open(dev->channel, 4 * PAGE_SIZE, 4 * PAGE_SIZE, NULL, 0,
> +			srv->util_cb, dev->channel);
> +	if (ret)
> +		goto error;
> +
>  	return 0;
>
>  error:

-- 
  Vitaly


More information about the devel mailing list