From patchwork Tue Dec 10 14:18:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22218 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 814A023908 for ; Tue, 10 Dec 2013 14:18:50 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf18809825obb.6 for ; Tue, 10 Dec 2013 06:18:50 -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=yG+87MTSaFXUYoeVUefpJLDlQPAkk7TYFsg1HyPxzNM=; b=I5zjkxsmEq6g/VG4re/8kHZlq/pCVZhbrZExhzOEDOwy8EORlSAzBpaK7b8nKvWFP2 vmm9aWagxC8k2Yhez0VS1dDt+uB9U08WfZZFubIG1beKu9z52fxEt4dSYNypMIh1jkpY wqclBkSu30o7YfshNHV1G65Vdd9RCMKNmHWauqWhdH96+uzQwvUM+eiSK66c0x19ZpjX KSJw4VJrG+Of/y1lZQ2oy2UT0jBN61fL3+qh2wduh+/5wKqYfLeyuSV1oha/ERZcheuB +SDJXXPCwYwo3wYM6kS3cjUlnl2vKWAoXVPKRhGmH8N78nRvEJLoDfnlJEDOgL9YIR2E mwzA== X-Gm-Message-State: ALoCoQlGlBNQw/ifoTCpovCnDp/gfARzKQIG2O0+UhK0vdULW5G2oP53Sg+hp71N9BBYpLwAEeW/ X-Received: by 10.182.109.200 with SMTP id hu8mr8875512obb.20.1386685130090; Tue, 10 Dec 2013 06:18:50 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.138 with SMTP id k10ls2345091qek.13.gmail; Tue, 10 Dec 2013 06:18:50 -0800 (PST) X-Received: by 10.53.9.201 with SMTP id du9mr160109vdd.36.1386685129974; Tue, 10 Dec 2013 06:18:49 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id xn8si5155003vdc.152.2013.12.10.06.18.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 06:18:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 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.174; Received: by mail-vc0-f174.google.com with SMTP id id10so4512569vcb.5 for ; Tue, 10 Dec 2013 06:18:49 -0800 (PST) X-Received: by 10.220.186.68 with SMTP id cr4mr20657vcb.55.1386685129878; Tue, 10 Dec 2013 06:18:49 -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 u4csp191435vcz; Tue, 10 Dec 2013 06:18:49 -0800 (PST) X-Received: by 10.180.92.230 with SMTP id cp6mr19523575wib.0.1386685128624; Tue, 10 Dec 2013 06:18:48 -0800 (PST) Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by mx.google.com with ESMTPS id q6si6820553wjx.41.2013.12.10.06.18.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 06:18:48 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.54 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.54; Received: by mail-wg0-f54.google.com with SMTP id n12so4910820wgh.21 for ; Tue, 10 Dec 2013 06:18:48 -0800 (PST) X-Received: by 10.194.90.144 with SMTP id bw16mr21087374wjb.1.1386685128198; Tue, 10 Dec 2013 06:18:48 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id nb16sm5556779wic.0.2013.12.10.06.18.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2013 06:18:46 -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 v3 08/10] xen/arm: Add relinquish_p2m_mapping to remove reference on every mapped page Date: Tue, 10 Dec 2013 14:18:20 +0000 Message-Id: <1386685102-563-9-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1386685102-563-1-git-send-email-julien.grall@linaro.org> References: <1386685102-563-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.174 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 reference on every new mapping but only for foreign mapping. Restrict the function only on foreign mapping. Signed-off-by: Julien Grall --- Changes in v3: - Rework title - Reuse create_p2m_entries to remove reference - Don't forget to set relmem! - Fix compilation (missing include) Changes in v2: - Introduce the patch --- xen/arch/arm/domain.c | 8 ++++++++ xen/arch/arm/p2m.c | 43 +++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/p2m.h | 15 +++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 1590708..4099e88 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -717,6 +717,14 @@ int domain_relinquish_resources(struct domain *d) if ( ret ) return ret; + d->arch.relmem = RELMEM_mapping; + /* Fallthrough */ + + 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 72946c6..778a07f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -6,6 +6,8 @@ #include #include #include +#include +#include /* First level P2M is 2 consecutive pages */ #define P2M_FIRST_ORDER 1 @@ -213,7 +215,8 @@ static int p2m_create_table(struct domain *d, enum p2m_operation { INSERT, ALLOCATE, - REMOVE + REMOVE, + RELINQUISH, }; static int create_p2m_entries(struct domain *d, @@ -231,6 +234,7 @@ static int create_p2m_entries(struct domain *d, unsigned long cur_first_page = ~0, cur_first_offset = ~0, cur_second_offset = ~0; + unsigned long count = 0; spin_lock(&p2m->lock); @@ -315,6 +319,7 @@ static int create_p2m_entries(struct domain *d, maddr += PAGE_SIZE; } break; + case RELINQUISH: case REMOVE: { lpae_t pte = third[third_table_offset(addr)]; @@ -334,6 +339,28 @@ static int create_p2m_entries(struct domain *d, if ( flush ) flush_tlb_all_local(); + + + count++; + + if ( op == RELINQUISH && count == 512 && hypercall_preempt_check() ) + { + p2m->next_gfn_to_relinquish = maddr >> PAGE_SHIFT; + rc = -EAGAIN; + goto out; + } + } + + /* When the function will remove mapping, p2m type should always + * be p2m_invalid. */ + 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; @@ -529,12 +556,26 @@ 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; + + return create_p2m_entries(d, RELINQUISH, + pfn_to_paddr(p2m->next_gfn_to_relinquish), + pfn_to_paddr(p2m->max_mapped_gfn), + pfn_to_paddr(INVALID_MFN), + MATTR_MEM, p2m_invalid); +} + 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 3d1696c..7f5d7b2 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 entry. @@ -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.