From patchwork Tue Dec 17 16:27:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22605 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43FD623FC6 for ; Tue, 17 Dec 2013 16:28:49 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id vb8sf22702559obc.0 for ; Tue, 17 Dec 2013 08:28:48 -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=uds1A03X3TOmhrtWTXdmkL4KSl6K7iVpJloovuVi4lA=; b=gsLdtFomizaB9HkNjVqmuRmw5J4SfybdNVJe/x05Bh+OtiPhtG71uj4gQ/vYgg6kCX oA4BzygvV4xcnyx22elSG4jhwg7YzRt1jgixfvb5scW6rBy21yyqB0f4S/GU8OKiP2Tf fX0pmUdUzSiPLd5+JJOcpt1OyUQF3WsLx+8dq3/uqiBLMQDh/gr47S974cYj99nW6kfU a6zrZJricJEYsftfyLPRP4Fm8SctxxBlIzJpFvYjHxhpo/hUSoNjDjqBjvLoL+V7Iriq /2LJX11XTyIDwvsJf1KtL8yQ9Ru14hbAHHvR70A3ZhpaPYw8rBVv0VGMoYbCjCRITqQ0 f2GA== X-Gm-Message-State: ALoCoQlJhGe+UWJfISy3BnvzTofjtejsZHHY70uOAlw7FP5xRTC3vpPs+EPkLYCoQAgAAShEjiM/ X-Received: by 10.182.243.166 with SMTP id wz6mr8458563obc.19.1387297728877; Tue, 17 Dec 2013 08:28:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.41 with SMTP id cz9ls2647010qeb.57.gmail; Tue, 17 Dec 2013 08:28:48 -0800 (PST) X-Received: by 10.58.210.39 with SMTP id mr7mr11083713vec.18.1387297728760; Tue, 17 Dec 2013 08:28:48 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id sx7si5021477vdc.133.2013.12.17.08.28.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 08:28:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.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.128.174; Received: by mail-ve0-f174.google.com with SMTP id pa12so4396088veb.5 for ; Tue, 17 Dec 2013 08:28:48 -0800 (PST) X-Received: by 10.52.72.227 with SMTP id g3mr53749vdv.93.1387297728651; Tue, 17 Dec 2013 08:28:48 -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 u4csp79599vcz; Tue, 17 Dec 2013 08:28:48 -0800 (PST) X-Received: by 10.14.119.136 with SMTP id n8mr23742781eeh.82.1387297727528; Tue, 17 Dec 2013 08:28:47 -0800 (PST) Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com [209.85.215.178]) by mx.google.com with ESMTPS id r9si5873274eeo.233.2013.12.17.08.28.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 08:28:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.178 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.178; Received: by mail-ea0-f178.google.com with SMTP id d10so2964020eaj.37 for ; Tue, 17 Dec 2013 08:28:47 -0800 (PST) X-Received: by 10.15.83.8 with SMTP id b8mr24136663eez.6.1387297727012; Tue, 17 Dec 2013 08:28:47 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id e3sm54411471eeg.11.2013.12.17.08.28.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2013 08:28:44 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, ian.campbell@citrix.com, ian.jackson@eu.citrix.com, Julien Grall Subject: [PATCH v6 08/10] xen/arm: Add relinquish_p2m_mapping to remove reference on every mapped page Date: Tue, 17 Dec 2013 16:27:56 +0000 Message-Id: <1387297678-17762-9-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1387297678-17762-1-git-send-email-julien.grall@linaro.org> References: <1387297678-17762-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.128.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 Acked-by: Ian Campbell --- Changes in v6: - Typoes - Rework preempt - Clean up if ( p2mt == ... || p2mt == ... ) Changes in v4: - Use LPAE_ENTRIES instead of hardcoded value 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 | 49 +++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/domain.h | 1 + xen/include/asm-arm/p2m.h | 15 +++++++++++++ 4 files changed, 72 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 410acb6..3f4ab37 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 @@ -224,7 +226,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, @@ -242,6 +245,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); @@ -326,13 +330,19 @@ static int create_p2m_entries(struct domain *d, maddr += PAGE_SIZE; } break; + case RELINQUISH: case REMOVE: { lpae_t pte = third[third_table_offset(addr)]; unsigned long mfn = pte.p2m.base; if ( !pte.p2m.valid ) + { + count++; break; + } + + count += 0x10; /* TODO: Handle other p2m type */ if ( p2m_is_foreign(pte.p2m.type) ) @@ -343,12 +353,35 @@ static int create_p2m_entries(struct domain *d, memset(&pte, 0x00, sizeof(pte)); write_pte(&third[third_table_offset(addr)], pte); + count++; } break; } if ( flush ) flush_tlb_all_local(); + + /* Preempt every 2MiB (mapped) or 32 MiB (unmapped) - arbitrary */ + if ( op == RELINQUISH && count >= 0x2000 ) + { + if ( hypercall_preempt_check() ) + { + p2m->next_gfn_to_relinquish = maddr >> PAGE_SHIFT; + rc = -EAGAIN; + goto out; + } + count = 0; + } + } + + if ( op == ALLOCATE || op == INSERT ) + { + 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; @@ -534,12 +567,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 53c9895..28d39a0 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -112,6 +112,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 5ccfa7f..8b7b6d0 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 + * Only takes 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 mappings are handled + */ +int relinquish_p2m_mapping(struct domain *d); + /* Allocate a new p2m table for a domain. * * Returns 0 for success or -errno.