From patchwork Mon Dec 16 15:45:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 22521 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5E26623FC7 for ; Mon, 16 Dec 2013 15:46:09 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id r10sf15427706pdi.2 for ; Mon, 16 Dec 2013 07:46:09 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=xaB4ayBhYOn7DcKHEPhE9J8ONOuBxRojL62Sb/99lDk=; b=OwZvxUb4w7IEBY9mlOkdLuK6WtV2XV8Sxb3fdg8sji6Ek2Gr8Eu+igZibgMMsojAeu T/MLx3SC0kQshP6OWpgXA7OfoX5+PHVVTbR2hfOYbHkAGN9AE6Qlv+fcYqASvDtXMUAH Y/cEitT+axVk770I/Nydf6B9DdmpD5/FHpQu17bb96PK/X3xJcZwmoUMg+QejWuuj8Y3 fYUB0zVhnyozjDV8R+1ow/GckDcwgQY6NhnJy4/Rbz/LWW1Sbd+kVGhu10sWg9xUnrhD 7mY8ZGr59ugKR3a0SYVK81aqtCey2aSEggzn/U+HVUDGm7WvB5nrZ9Rvc/zEHwvC5BCT 4Q6g== X-Gm-Message-State: ALoCoQkjduRdrr1erlLDGM2ZBd/7S0DdZgl4udKHnxgRIdKWJ7ck6vO0iP+kj88A3UMLrwyK3IBl X-Received: by 10.66.153.137 with SMTP id vg9mr1008224pab.43.1387208768906; Mon, 16 Dec 2013 07:46:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.88.68 with SMTP id be4ls2034264qeb.46.gmail; Mon, 16 Dec 2013 07:46:08 -0800 (PST) X-Received: by 10.221.60.134 with SMTP id ws6mr2185861vcb.44.1387208768720; Mon, 16 Dec 2013 07:46:08 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id pv1si4083174veb.94.2013.12.16.07.46.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Dec 2013 07:46:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id db12so3370656veb.22 for ; Mon, 16 Dec 2013 07:46:08 -0800 (PST) X-Received: by 10.58.154.6 with SMTP id vk6mr623800veb.61.1387208768589; Mon, 16 Dec 2013 07:46:08 -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 u4csp113485vcz; Mon, 16 Dec 2013 07:46:07 -0800 (PST) X-Received: by 10.15.26.6 with SMTP id m6mr17719200eeu.80.1387208765231; Mon, 16 Dec 2013 07:46:05 -0800 (PST) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by mx.google.com with ESMTPS id p9si650489eew.118.2013.12.16.07.46.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Dec 2013 07:46:05 -0800 (PST) Received-SPF: neutral (google.com: 74.125.83.52 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.83.52; Received: by mail-ee0-f52.google.com with SMTP id d17so2291481eek.25 for ; Mon, 16 Dec 2013 07:46:04 -0800 (PST) X-Received: by 10.15.76.6 with SMTP id m6mr17761218eey.37.1387208763588; Mon, 16 Dec 2013 07:46:03 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id l4sm43593791een.13.2013.12.16.07.46.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2013 07:46:01 -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 , Keir Fraser , Jan Beulich Subject: [PATCH v3] xen/arm: Allow balooning working with 1:1 memory mapping Date: Mon, 16 Dec 2013 15:45:31 +0000 Message-Id: <1387208731-18534-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 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.177 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: , With the lake of iommu, dom0 must have a 1:1 memory mapping for all these guest physical address. When the ballon decides to give back a page to the kernel, this page must have the same address as previously. Otherwise, we will loose the 1:1 mapping and will break DMA-capable devices. Signed-off-by: Julien Grall Cc: Keir Fraser Cc: Jan Beulich --- Release: This is a bug that prevents DMA-capable devices to work after a guest has started. Changes in v3: - Remove spurious page = NULL - Rename is_dom0_mapped_11 to is_domain_direct_mapped - Coding style Changes in v2: - Drop CONFIG_ARM and add is_dom0_mapped_11 --- xen/arch/arm/domain_build.c | 5 +++++ xen/common/memory.c | 30 +++++++++++++++++++++++++++++- xen/include/asm-arm/domain.h | 2 ++ xen/include/asm-x86/domain.h | 2 ++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index faff88e..2bbee36 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -65,6 +65,11 @@ struct vcpu *__init alloc_dom0_vcpu0(void) return alloc_vcpu(dom0, 0, 0); } +int is_domain_direct_mapped(struct domain *d) +{ + return (dom0_11_mapping && d == dom0); +} + static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo) { paddr_t start; diff --git a/xen/common/memory.c b/xen/common/memory.c index 61791a4..45dbf07 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -122,7 +122,29 @@ static void populate_physmap(struct memop_args *a) } else { - page = alloc_domheap_pages(d, a->extent_order, a->memflags); + if ( is_domain_direct_mapped(d) ) + { + mfn = gpfn; + if ( !mfn_valid(mfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn 0x%"PRI_xen_pfn"\n", + mfn); + goto out; + } + + page = mfn_to_page(mfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn 0x%"PRI_xen_pfn" doesn't belong to dom0\n", + mfn); + goto out; + } + put_page(page); + } + else + page = alloc_domheap_pages(d, a->extent_order, a->memflags); + if ( unlikely(page == NULL) ) { if ( !opt_tmem || (a->extent_order != 0) ) @@ -270,6 +292,12 @@ static void decrease_reservation(struct memop_args *a) && p2m_pod_decrease_reservation(a->domain, gmfn, a->extent_order) ) continue; + /* With the lake for iommu on some ARM platform, dom0 must retrieve + * the same pfn when the hypercall populate_physmap is called. + */ + if ( is_domain_direct_mapped(a->domain) ) + continue; + for ( j = 0; j < (1 << a->extent_order); j++ ) if ( !guest_remove_page(a->domain, gmfn + j) ) goto out; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 28d39a0..dbc1389 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -86,6 +86,8 @@ enum domain_type { #define is_pv64_domain(d) (0) #endif +int is_domain_direct_mapped(struct domain *d); + struct vtimer { struct vcpu *v; int irq; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9d39061..2c7f809 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -16,6 +16,8 @@ #define is_pv_32on64_domain(d) (is_pv_32bit_domain(d)) #define is_pv_32on64_vcpu(v) (is_pv_32on64_domain((v)->domain)) +#define is_domain_direct_mapped(d) (0) + #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain))