From patchwork Mon Oct 10 00:32:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9368775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A94D96048F for ; Mon, 10 Oct 2016 00:35:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CE7F288BA for ; Mon, 10 Oct 2016 00:35:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9161628B1B; Mon, 10 Oct 2016 00:35:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1DC75288C5 for ; Mon, 10 Oct 2016 00:35:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btOXF-0004gh-Bd; Mon, 10 Oct 2016 00:33:41 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btOXD-0004f4-Ni for xen-devel@lists.xen.org; Mon, 10 Oct 2016 00:33:39 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id BC/6E-28857-3E1EAF75; Mon, 10 Oct 2016 00:33:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsVywNykQvfRw1/ hBjOOyVss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkfFn9hLdgiWvG+exNjA+MXgS5GTg4hgUqJ yc2HGUFsCQFeiSPLZrB2MXIA2X4SvZ+Nuhi5gEp6GSU2b2hgB6lhE9CXWPH4ICuILSIgLXHt8 2VGkCJmgXuMElf+v2IBSQgL+Eh0Xj3NBGKzCKhK/Fu2hwlkKK+AjcTCBYEQu+QlLlw9BVbOKW ArsW3nShaIe2wkbs7oY53AyLuAkWEVo0ZxalFZapGukaVeUlFmekZJbmJmjq6hgZlebmpxcWJ 6ak5iUrFecn7uJkZgMDAAwQ7GA4sCDzFKcjApifImnvgRLsSXlJ9SmZFYnBFfVJqTWnyIUYaD Q0mC1/nBr3AhwaLU9NSKtMwcYFjCpCU4eJREeEtB0rzFBYm5xZnpEKlTjIpS4rw5IAkBkERGa R5cGywWLjHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYtxtkCk9mXgnc9FdAi5mAFrMs/gGyuC QRISXVwGjpcXfL6WP6glFCU1by1661SXDat8yO6R9nXvVOtc2bZ6yTY13JfGjtqYKseFte95Y X2fsCnuiZ9Hyc1vZARDUlae11me/H6lV59+9kLD5RcWin0Nn8VtWFbZJ3yzZNY1u7Ysq8sNhF kQ4v9rRYll71jlmXsOz1JynFIFXuD4xv2Z/zyZwxYFJiKc5INNRiLipOBAC2whougAIAAA== X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1476059616!31847519!1 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36831 invoked from network); 10 Oct 2016 00:33:38 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-14.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 10 Oct 2016 00:33:38 -0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP; 09 Oct 2016 17:33:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,469,1473145200"; d="scan'208";a="17867201" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.148]) by fmsmga005.fm.intel.com with ESMTP; 09 Oct 2016 17:33:34 -0700 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Mon, 10 Oct 2016 08:32:24 +0800 Message-Id: <20161010003235.4213-6-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161010003235.4213-1-haozhong.zhang@intel.com> References: <20161010003235.4213-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Andrew Cooper , Xiao Guangrong , Jan Beulich Subject: [Xen-devel] [RFC XEN PATCH 05/16] xen/x86: release pmem pages at domain destroy X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The host pmem pages mapped to a domain are unassigned at domain destroy so as to be used by other domains in future. Signed-off-by: Haozhong Zhang --- Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/domain.c | 5 +++++ xen/arch/x86/pmem.c | 41 +++++++++++++++++++++++++++++++++++++++++ xen/include/xen/pmem.h | 1 + 3 files changed, 47 insertions(+) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1bd5eb6..05ab389 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -2512,6 +2513,10 @@ int domain_relinquish_resources(struct domain *d) if ( ret ) return ret; + ret = pmem_teardown(d); + if ( ret ) + return ret; + /* Tear down paging-assistance stuff. */ ret = paging_teardown(d); if ( ret ) diff --git a/xen/arch/x86/pmem.c b/xen/arch/x86/pmem.c index e4dc685..50e496b 100644 --- a/xen/arch/x86/pmem.c +++ b/xen/arch/x86/pmem.c @@ -282,3 +282,44 @@ int pmem_populate(struct xen_pmemmap_args *args) args->nr_done = i; return rc; } + +static int pmem_teardown_preemptible(struct domain *d, int *preempted) +{ + struct page_info *pg, *next; + int rc = 0; + + spin_lock(&d->pmem_lock); + + page_list_for_each_safe (pg, next, &d->pmem_page_list ) + { + BUG_ON(page_get_owner(pg) != d); + BUG_ON(page_state_is(pg, free)); + + page_list_del(pg, &d->pmem_page_list); + page_set_owner(pg, NULL); + pg->count_info = (pg->count_info & ~PGC_count_mask) | PGC_state_free; + + if ( preempted && hypercall_preempt_check() ) + { + *preempted = 1; + goto out; + } + } + + out: + spin_unlock(&d->pmem_lock); + return rc; +} + +int pmem_teardown(struct domain *d) +{ + int preempted = 0; + + ASSERT(d->is_dying); + ASSERT(d != current->domain); + + if ( !has_hvm_container_domain(d) || !paging_mode_translate(d) ) + return -EINVAL; + + return pmem_teardown_preemptible(d, &preempted); +} diff --git a/xen/include/xen/pmem.h b/xen/include/xen/pmem.h index 60adf56..ffbef1c 100644 --- a/xen/include/xen/pmem.h +++ b/xen/include/xen/pmem.h @@ -37,5 +37,6 @@ int pmem_add(unsigned long spfn, unsigned long epfn, unsigned long rsv_spfn, unsigned long rsv_epfn, unsigned long data_spfn, unsigned long data_epfn); int pmem_populate(struct xen_pmemmap_args *args); +int pmem_teardown(struct domain *d); #endif /* __XEN_PMEM_H__ */