From patchwork Mon Jul 14 16:27:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33617 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 BDB9120CAD for ; Mon, 14 Jul 2014 16:28:37 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf20436468oac.9 for ; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=nwHvTDHr2RzPEYkdihabFfL55OVmkOvIP0vcX4awub0=; b=WDsE+bWqrCcYijmeMv7Ks/NaWkVMCBVQ7gqLYanCXS0SkX4EvknCt/p6CLgawQvjjc Nr5C+2/jU58jq8UUxzIXJlE1HsKeKfEkOL3GuQQXj3icKmBXh3HSFq58vrlZZS1zofAf n1tRMwiNRD6brwieQjYFlA/DjZBLHlGhv4TGRKEdt8fc5KPLOb2DJbPtWXicn0X7UN+0 6M1oC6wf0DMwHocaI1BWfin5eA12JD+Q30Lx6xVCA62A5LB1BIhkTaIqcPrzU9sTeMTi oif3+f4VYnU2TBmr3xNxoUI+SXyA9GJvuevrpV+y6zbFz25d05HOKHzDW8C+/JdyJ6J4 Asjw== X-Gm-Message-State: ALoCoQlQXQBPLYlNLyJ46YNNBVEo9dOsFfZsqiwsWNjF1aX/QAmMzhobAR+GwPLGJ3Tgh0ZKmbi+ X-Received: by 10.42.15.197 with SMTP id m5mr9649088ica.31.1405355317380; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.166 with SMTP id d35ls1063810qge.3.gmail; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) X-Received: by 10.52.249.9 with SMTP id yq9mr14287841vdc.6.1405355317226; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id dr20si5537807veb.59.2014.07.14.09.28.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:28:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so974950vcb.8 for ; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr16958201vec.4.1405355317096; Mon, 14 Jul 2014 09:28:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp147834vcb; Mon, 14 Jul 2014 09:28:36 -0700 (PDT) X-Received: by 10.221.59.194 with SMTP id wp2mr1077118vcb.59.1405355316774; Mon, 14 Jul 2014 09:28:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id sb10si5509940vdc.89.2014.07.14.09.28.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 14 Jul 2014 09:28:36 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j6M-0006Jd-4r; Mon, 14 Jul 2014 16:27:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X6j6K-0006IL-At for xen-devel@lists.xen.org; Mon, 14 Jul 2014 16:27:40 +0000 Received: from [85.158.139.211:54575] by server-10.bemta-5.messagelabs.com id 01/8A-25335-BF404C35; Mon, 14 Jul 2014 16:27:39 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1405355256!10161150!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5889 invoked from network); 14 Jul 2014 16:27:38 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 14 Jul 2014 16:27:38 -0000 X-IronPort-AV: E=Sophos;i="5.01,659,1400025600"; d="scan'208";a="152689300" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 14 Jul 2014 16:27:09 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 14 Jul 2014 12:27:08 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X6j5o-0008Fs-19; Mon, 14 Jul 2014 17:27:09 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 14 Jul 2014 17:27:08 +0100 From: Ian Campbell To: Date: Mon, 14 Jul 2014 17:27:05 +0100 Message-ID: <1405355225-4623-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405355194.31863.2.camel@kazak.uk.xensource.com> References: <1405355194.31863.2.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 3/3] xen: arm: correctly handle removing a subset of a superpage mapping. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This can be exercised for example via ballooning which will remove 4K regions fromanywhere in the address space. Reported-by: Julien Grall Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a10cbaf..68a19bd 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -604,8 +604,33 @@ static int apply_one_level(struct domain *d, return P2M_ONE_PROGRESS_NOP; } - if ( level < 3 && p2m_table(orig_pte) ) - return P2M_ONE_DESCEND; + if ( level < 3 ) + { + if ( p2m_table(orig_pte) ) + return P2M_ONE_DESCEND; + + if ( op == REMOVE && + !is_mapping_aligned(*addr, end_gpaddr, + 0, /* maddr doesn't matter for remove */ + level_size) ) + { + /* + * Removing a mapping from the middle of a superpage. Shatter + * and descend. + */ + *flush = true; + rc = p2m_create_table(d, entry, + level_shift - PAGE_SHIFT, flush_cache); + if ( rc < 0 ) + return rc; + + p2m->stats.shattered[level]++; + p2m->stats.mappings[level]--; + p2m->stats.mappings[level+1] += LPAE_ENTRIES; + + return P2M_ONE_DESCEND; + } + } *flush = true;