From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778AbdGZMuJ (ORCPT ); Wed, 26 Jul 2017 08:50:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37326 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668AbdGZMuH (ORCPT ); Wed, 26 Jul 2017 08:50:07 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B3B2BC06C9E7 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com Date: Wed, 26 Jul 2017 15:50:03 +0300 From: "Michael S. Tsirkin" To: Jason Wang Cc: Andrew Jones , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, Sebastian Andrzej Siewior Subject: Re: [PATCH] virtio-net: fix module unloading Message-ID: <20170726154927-mutt-send-email-mst@kernel.org> References: <20170724133832.27364-1-drjones@redhat.com> <37d51fa3-21e4-ae55-6d5b-6ade97ae4bc8@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <37d51fa3-21e4-ae55-6d5b-6ade97ae4bc8@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 26 Jul 2017 12:50:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 26, 2017 at 11:52:07AM +0800, Jason Wang wrote: > > > On 2017年07月24日 21:38, Andrew Jones wrote: > > Unregister the driver before removing multi-instance hotplug > > callbacks. This order avoids the warning issued from > > __cpuhp_remove_state_cpuslocked when the number of remaining > > instances isn't yet zero. > > > > Fixes: 8017c279196a ("net/virtio-net: Convert to hotplug state machine") > > Cc: Sebastian Andrzej Siewior > > Signed-off-by: Andrew Jones > > --- > > drivers/net/virtio_net.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index 99a26a9efec1..f41ab0ea942a 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -2743,9 +2743,9 @@ module_init(virtio_net_driver_init); > > static __exit void virtio_net_driver_exit(void) > > { > > + unregister_virtio_driver(&virtio_net_driver); > > cpuhp_remove_multi_state(CPUHP_VIRT_NET_DEAD); > > cpuhp_remove_multi_state(virtionet_online); > > - unregister_virtio_driver(&virtio_net_driver); > > } > > module_exit(virtio_net_driver_exit); > > Acked-by: Jason Wang Thanks for the review! I merged it before the tag and don't want to rebase. Sorry about that. -- MST