From patchwork Mon Dec 9 03:34:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22154 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B660623FD2 for ; Mon, 9 Dec 2013 03:34:24 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf12569888oag.5 for ; Sun, 08 Dec 2013 19:34:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=uXvYo5mrRqRhaIbWPDXdl/f/LqavDNGAFVsLOJTL1Ts=; b=knaEGQ4vf0WXllbIeGEHiPItCoYKeMjcMWPp+2SIYy8UCUT8JUfoNPbeyBiZRIAZ0A qTemTm/5589XyzhdSir0F3XEdOV3r6Rb/B/5A/wzXDWL7QjKml+neC3ikDQFhmMT7/4D /LtJEsRfTf14I5Ila6IJwGbioXNp/rx2YSOJLeGdO/qV89ksCtzOrP/nesAUu67EW7CI 4jxZsFsLokiUe+G2DgPk3h7iZ3GHTxWqwnn+le27Au6JhBrUuddKCuLtXuT3tap3DjYA 2y28G3vOLRTYXbHGMYcom1iBnj/UnNsrMrRfzzqolYDF3g7a15VyURCfGowPt/bC8+b9 vQ5w== X-Gm-Message-State: ALoCoQnKCaNPeYFjS3c8R6YVPU55tSRS1s9A73WZV2lXX6qrSnabhVUMieg+thC9EAgyOndBoB3u X-Received: by 10.182.218.12 with SMTP id pc12mr5525833obc.35.1386560064369; Sun, 08 Dec 2013 19:34:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.2 with SMTP id m2ls1938044qey.37.gmail; Sun, 08 Dec 2013 19:34:24 -0800 (PST) X-Received: by 10.220.3.144 with SMTP id 16mr783709vcn.33.1386560064250; Sun, 08 Dec 2013 19:34:24 -0800 (PST) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id m10si3167625vcm.132.2013.12.08.19.34.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 08 Dec 2013 19:34:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ks9so2922997vcb.26 for ; Sun, 08 Dec 2013 19:34:24 -0800 (PST) X-Received: by 10.220.2.9 with SMTP id 9mr209509vch.58.1386560064160; Sun, 08 Dec 2013 19:34:24 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp75729vcz; Sun, 8 Dec 2013 19:34:23 -0800 (PST) X-Received: by 10.14.29.66 with SMTP id h42mr11087774eea.4.1386560063265; Sun, 08 Dec 2013 19:34:23 -0800 (PST) Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by mx.google.com with ESMTPS id p46si7717656eem.105.2013.12.08.19.34.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 08 Dec 2013 19:34:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.180 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.180; Received: by mail-ea0-f180.google.com with SMTP id f15so1289649eak.11 for ; Sun, 08 Dec 2013 19:34:22 -0800 (PST) X-Received: by 10.14.108.6 with SMTP id p6mr10862200eeg.31.1386560062751; Sun, 08 Dec 2013 19:34:22 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id g7sm23681234eet.12.2013.12.08.19.34.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Dec 2013 19:34:22 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, ian.campbell@citrix.com, tim@xen.org, stefano.stabellini@citrix.com, Julien Grall Subject: [PATCH v2 07/10] xen/arm: Introduce relinquish_p2m_mapping to remove refcount every mapped page Date: Mon, 9 Dec 2013 03:34:04 +0000 Message-Id: <1386560047-17500-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386560047-17500-1-git-send-email-julien.grall@linaro.org> References: <1386560047-17500-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This function will be called when the domain relinquishes its memory. It removes refcount on every mapped page to a valid MFN. Currently, Xen doesn't take refcount on every new mapping but only for foreign mapping. Restrict the function only on foreign mapping. Signed-off-by: Julien Grall --- Changes in v2: - Introduce the patch --- xen/arch/arm/domain.c | 5 +++++ xen/arch/arm/p2m.c | 47 ++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/p2m.h | 15 ++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 1590708..e7c2f67 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -717,6 +717,11 @@ int domain_relinquish_resources(struct domain *d) if ( ret ) return ret; + case RELMEM_mapping: + ret = relinquish_p2m_mapping(d); + if ( ret ) + return ret; + d->arch.relmem = RELMEM_done; /* Fallthrough */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index f0bbaca..dbd6a06 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -6,6 +6,7 @@ #include #include #include +#include /* First level P2M is 2 consecutive pages */ #define P2M_FIRST_ORDER 1 @@ -320,6 +321,16 @@ static int create_p2m_entries(struct domain *d, flush_tlb_all_local(); } + if ( (t == p2m_ram_rw) || (t == p2m_ram_ro) || (t == p2m_map_foreign)) + { + unsigned long sgfn = paddr_to_pfn(start_gpaddr); + unsigned long egfn = paddr_to_pfn(end_gpaddr); + + p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn); + /* Use next_gfn_to_relinquish to store the lowest gfn mapped */ + p2m->next_gfn_to_relinquish = MIN(p2m->next_gfn_to_relinquish, sgfn); + } + rc = 0; out: @@ -503,12 +514,48 @@ int p2m_init(struct domain *d) p2m->first_level = NULL; + p2m->max_mapped_gfn = 0; + p2m->next_gfn_to_relinquish = ULONG_MAX; + err: spin_unlock(&p2m->lock); return rc; } +int relinquish_p2m_mapping(struct domain *d) +{ + struct p2m_domain *p2m = &d->arch.p2m; + unsigned long gfn, count = 0; + int rc = 0; + + for ( gfn = p2m->next_gfn_to_relinquish; + gfn < p2m->max_mapped_gfn; gfn++ ) + { + p2m_type_t t; + paddr_t p = p2m_lookup(d, gfn, &t); + unsigned long mfn = p >> PAGE_SHIFT; + + if ( mfn_valid(mfn) && p2m_is_foreign(t) ) + { + put_page(mfn_to_page(mfn)); + guest_physmap_remove_page(d, gfn, mfn, 0); + } + + count++; + + /* Preempt every 2MiB. Arbitrary */ + if ( (count == 512) && hypercall_preempt_check() ) + { + p2m->next_gfn_to_relinquish = gfn + 1; + rc = -EAGAIN; + break; + } + } + + return rc; +} + unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn) { paddr_t p = p2m_lookup(d, pfn_to_paddr(gpfn), NULL); diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 922eda3..4a4c018 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -75,6 +75,7 @@ struct arch_domain RELMEM_not_started, RELMEM_xen, RELMEM_page, + RELMEM_mapping, RELMEM_done, } relmem; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index b63204d..b0d3aea 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -18,6 +18,15 @@ struct p2m_domain { /* Current VMID in use */ uint8_t vmid; + + /* Highest guest frame that's ever been mapped in the p2m + * Take only into account ram and foreign mapping + */ + unsigned long max_mapped_gfn; + + /* When releasing mapped gfn's in a preemptible manner, recall where + * to resume the search */ + unsigned long next_gfn_to_relinquish; }; /* List of possible type for each page in the p2m @@ -48,6 +57,12 @@ int p2m_init(struct domain *d); /* Return all the p2m resources to Xen. */ void p2m_teardown(struct domain *d); +/* Remove mapping refcount on each mapping page in the p2m + * + * TODO: For the moment only foreign mapping is handled + */ +int relinquish_p2m_mapping(struct domain *d); + /* Allocate a new p2m table for a domain. * * Returns 0 for success or -errno.