From: Dexuan Cui <decui@microsoft.com>
To: KY Srinivasan <kys@microsoft.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
        "olaf@aepfle.de" <olaf@aepfle.de>,
        "apw@canonical.com" <apw@canonical.com>,
        "jasowang@redhat.com" <jasowang@redhat.com>,
        "vkuznets@redhat.com" <vkuznets@redhat.com>
CC: KY Srinivasan <kys@microsoft.com>
Subject: RE: [PATCH net-next 1/1] hv_netvsc: Wait for sub-channels to be
 processed during probe
Thread-Topic: [PATCH net-next 1/1] hv_netvsc: Wait for sub-channels to be
 processed during probe
Thread-Index: AQHQv/BG8tKnHymnuUOSalik/ODCIp3faxCw
Date: Fri, 17 Jul 2015 10:00:43 +0000
Message-ID: <4fd650437f864cf2a58e8334253f5dcd@SIXPR30MB031.064d.mgd.msft.net>
References: <1437074222-13020-1-git-send-email-kys@microsoft.com>
In-Reply-To: <1437074222-13020-1-git-send-email-kys@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
CY1PR0301MB0667: X-MS-Exchange-Organization-RulesExecuted
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2015 10:00:51.9100
 (UTC)
X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=72f988bf-86f1-41af-91ab-2d7cd011db47;Ip=[206.191.229.116];Helo=[064-smtp-out.microsoft.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0667
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1862
Lines: 52

> From: K. Y. Srinivasan 
> Sent: Friday, July 17, 2015 3:17
> Subject: [PATCH net-next 1/1] hv_netvsc: Wait for sub-channels to be processed
> during probe
> diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
> ...
> @@ -1116,6 +1127,9 @@ int rndis_filter_device_add(struct hv_device *dev,
>  	num_possible_rss_qs = cpumask_weight(node_cpu_mask);
>  	net_device->num_chn = min(num_possible_rss_qs, num_rss_qs);
> 
> +	num_rss_qs = net_device->num_chn - 1;
> +	net_device->num_sc_offered = num_rss_qs;
> +
>  	if (net_device->num_chn == 1)
>  		goto out;
> 
> @@ -1157,11 +1171,22 @@ int rndis_filter_device_add(struct hv_device *dev,
> 
>  	ret = rndis_filter_set_rss_param(rndis_device, net_device->num_chn);
> 
> +	/*
> +	 * Wait for the host to send us the sub-channel offers.
> +	 */
> +	spin_lock_irqsave(&net_device->sc_lock, flags);
> +	sc_delta = net_device->num_chn - 1 - num_rss_qs;
> +	net_device->num_sc_offered -= sc_delta;

Hi KY,
IMO here the "-= " should be "+="?

I think sc_delta is usually <= 0, meaning the host may allocate less subchannels than
we expect.
With "-=", net_device->num_sc_offered can become bigger -- this doesn't seem correct.

Why not use 
"net_device->num_sc_offered = net_device->num_chn - 1;" directly?
At this point, net_device->num_chn has been the number of the actual channels.


> +	spin_unlock_irqrestore(&net_device->sc_lock, flags);
> +
> +	if (net_device->num_sc_offered != 0)
> +		wait_for_completion(&net_device->channel_init_wait);

BTW, I also tested the patch and I can confirm the panic I saw disappeared with the patch.

-- Dexuan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/