From patchwork Fri Jan 13 16:59:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 135931 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C025DB6F67 for ; Sat, 14 Jan 2012 03:59:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758550Ab2AMQ7f (ORCPT ); Fri, 13 Jan 2012 11:59:35 -0500 Received: from smtp.citrix.com ([66.165.176.89]:8241 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344Ab2AMQ7d (ORCPT ); Fri, 13 Jan 2012 11:59:33 -0500 X-IronPort-AV: E=Sophos;i="4.71,505,1320642000"; d="scan'208";a="20853678" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Jan 2012 11:59:33 -0500 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Fri, 13 Jan 2012 11:59:32 -0500 Received: from testbox64.uk.xensource.com ([10.80.237.153]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id q0DGxQED016212; Fri, 13 Jan 2012 08:59:31 -0800 From: Wei Liu To: ian.campbell@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, netdev@vger.kernel.org CC: Wei Liu Subject: [RFC PATCH 2/6] netback: add module unload function. Date: Fri, 13 Jan 2012 16:59:05 +0000 Message-ID: <1326473949-22389-3-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1326473949-22389-1-git-send-email-wei.liu2@citrix.com> References: <1326473949-22389-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Enables users to unload netback module. Signed-off-by: Wei Liu --- drivers/net/xen-netback/common.h | 1 + drivers/net/xen-netback/netback.c | 14 ++++++++++++++ drivers/net/xen-netback/xenbus.c | 5 +++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 94b79c3..263df73 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -120,6 +120,7 @@ void xenvif_get(struct xenvif *vif); void xenvif_put(struct xenvif *vif); int xenvif_xenbus_init(void); +void xenvif_xenbus_exit(void); int xenvif_schedulable(struct xenvif *vif); diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 26af7b7..dd10c0d 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1653,5 +1653,19 @@ failed_init: module_init(netback_init); +static void __exit netback_exit(void) +{ + int i; + for (i = 0; i < xen_netbk_group_nr; i++) { + struct xen_netbk *netbk = &xen_netbk[i]; + del_timer(&netbk->net_timer); + kthread_stop(netbk->task); + } + vfree(xen_netbk); + page_pool_destroy(); + xenvif_xenbus_exit(); +} +module_exit(netback_exit); + MODULE_LICENSE("Dual BSD/GPL"); MODULE_ALIAS("xen-backend:vif"); diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 410018c..65d14f2 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c @@ -485,3 +485,8 @@ int xenvif_xenbus_init(void) { return xenbus_register_backend(&netback_driver); } + +void xenvif_xenbus_exit(void) +{ + return xenbus_unregister_driver(&netback_driver); +}