From patchwork Fri Jun 30 15:54:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 106730 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2507513qge; Fri, 30 Jun 2017 08:57:09 -0700 (PDT) X-Received: by 10.107.199.198 with SMTP id x189mr22111859iof.14.1498838229092; Fri, 30 Jun 2017 08:57:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498838229; cv=none; d=google.com; s=arc-20160816; b=uyb9AxJx81yi/5Jd1oKfnpdnjwfsVjFLPgRie7yFnpeLklTAkz6vox7/8Tbhr7a5Nb RFfjli8cWMT5kwqgEec8C3+0U19oANMwSU6WsGM9b4kxQampDE3fUt/40jgO0yl+tmPA oZtdG0pupC7bmp8BZaEeUImzx7JymVYah1BgCtOlukzrboacD8wvlcB7iWtF0QDR2evG qrSmuOOH9HoB3wRiiTLAZtjmfPkr/5i7LeImMNMhfqCZbPHpo2VKv71dCU0MlQsy+fiR G0V8nIxV8hV2a4pvseXx/oyHTswLtmpSrtvgdlYCmGYP0q+vbPwF5cXJhDfJNjwt8muv mQDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=9CoTVoylmVKcUFj+vPIkXacT+ACgOM0uNtq035VPmM0=; b=FEnBBhKzND49rRWu5w1gq1A1OibzuAHU4ErTjo/bZH6ln0lgRR3wfxY1Oln1142yzt 3bmtyMu54KvwyuWKeh2D+nVJRhAgx5HmIoygmFQdm2jDTmbepi2JHR2NWHLGmcDqetic a9ydMBfESEl6s5LPjdKNcoxKo9LRwZfPkZ4FtIFafIDocO6p47jkydy6fbEmREHVhFWs 2LPywA4n4iQMo9rGDLVik7hEc4sqa/GTt5t0DjCJmd+egeKYBLnHviB44RaDqWnlep8H QqnDIOGn3dNFE28YT5US8y8pgpgdSp6iGi6cKABgYPa+plIo1M3LcMAGS+2TRAjoqHCu IDdw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id h187si4487458ita.115.2017.06.30.08.57.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 08:57:09 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyFx-0000ex-Ki; Fri, 30 Jun 2017 15:54:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyFw-0000Ut-83 for xen-devel@lists.xen.org; Fri, 30 Jun 2017 15:54:52 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 2B/83-03032-C4476595; Fri, 30 Jun 2017 15:54:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRWlGSWpSXmKPExsVysyfVTdezJCz SYM4EAYslHxezODB6HN39mymAMYo1My8pvyKBNePTiZnMBUsFK5p/zWJpYNzG08XIySEksJlR 4uUchS5GLiD7NKPEvstz2UESbAKaEnc+f2ICsUUEpCWufb7MCGIzCzhIvPl4jwXEFhaIkni7s BksziKgKrF18U2gOAcHr4CVxIP3liBhCQF5iV1tF1lBbE6g8PF/D5gg9lpKvJ51lWUCI/cCRo ZVjBrFqUVlqUW6RgZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiB3mUAgh2Mv5Y FHGKU5GBSEuVdeS00UogvKT+lMiOxOCO+qDQntfgQowwHh5IEr2JxWKSQYFFqempFWmYOMMxg 0hIcPEoivLJBQGne4oLE3OLMdIjUKUZjjhVvd31h4ng14f83JiGWvPy8VClx3hCQSQIgpRmle XCDYOF/iVFWSpiXEeg0IZ6C1KLczBJU+VeM4hyMSsK8ziBTeDLzSuD2vQI6hQnoFOEZISCnlC QipKQaGFvOFYdsTPrpOcPF+ME35vMLnry/khQp9Ou0J+fS54sZvrne73swfaKyrHBijIZJxfY f/a9s1DpD+mJndu52FnENmL70rUYWS+pR8/57nwVYNz+/ybHox59t757daZTTTXmz8fu1mMWJ rrpxTNMMjzzKMnwYmDAh+qbEWefPj2av32BU7Ma2zVmJpTgj0VCLuag4EQDNi3W+egIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1498838087!64493537!2 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10015 invoked from network); 30 Jun 2017 15:54:49 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-10.tower-21.messagelabs.com with SMTP; 30 Jun 2017 15:54:49 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DA34E1610; Fri, 30 Jun 2017 08:54:48 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 476BC3F41F; Fri, 30 Jun 2017 08:54:48 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 30 Jun 2017 16:54:28 +0100 Message-Id: <20170630155431.23824-14-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630155431.23824-1-julien.grall@arm.com> References: <20170630155431.23824-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 13/16] xen/arm: mm: Use lpae_valid and lpae_table in create_xen_entries X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" This newly introduced lpae_valid and lpae_table helpers will recude the code and make more readable. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Patch added Changes in v3: - Add Stefano's reviewed-by --- xen/arch/arm/mm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index c732771444..21b3df395f 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -991,8 +991,7 @@ static int create_xen_entries(enum xenmap_operation op, for(; addr < addr_end; addr += PAGE_SIZE, mfn = mfn_add(mfn, 1)) { - if ( !xen_second[second_linear_offset(addr)].pt.valid || - !xen_second[second_linear_offset(addr)].pt.table ) + if ( !lpae_table(xen_second[second_linear_offset(addr)]) ) { rc = create_xen_table(&xen_second[second_linear_offset(addr)]); if ( rc < 0 ) { @@ -1001,14 +1000,14 @@ static int create_xen_entries(enum xenmap_operation op, } } - BUG_ON(!xen_second[second_linear_offset(addr)].pt.valid); + BUG_ON(!lpae_valid(xen_second[second_linear_offset(addr)])); third = mfn_to_virt(xen_second[second_linear_offset(addr)].pt.base); switch ( op ) { case INSERT: case RESERVE: - if ( third[third_table_offset(addr)].pt.valid ) + if ( lpae_valid(third[third_table_offset(addr)]) ) { printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", addr, mfn_x(mfn)); @@ -1022,7 +1021,7 @@ static int create_xen_entries(enum xenmap_operation op, break; case MODIFY: case REMOVE: - if ( !third[third_table_offset(addr)].pt.valid ) + if ( !lpae_valid(third[third_table_offset(addr)]) ) { printk("create_xen_entries: trying to %s a non-existing mapping addr=%lx\n", op == REMOVE ? "remove" : "modify", addr);