From patchwork Fri Jun 30 15:54:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 106736 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2507568qge; Fri, 30 Jun 2017 08:57:13 -0700 (PDT) X-Received: by 10.107.58.86 with SMTP id h83mr20785834ioa.28.1498838233129; Fri, 30 Jun 2017 08:57:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498838233; cv=none; d=google.com; s=arc-20160816; b=P0lplXdtmlkqfXVvnElg+9InyUGS4GU5IKTH59AOrs2c2E5/AfhomRclKPdpJxFrCf w2zJlRTaLKHuJfGIHi7iiH8s20YB/KZwCEqao9QIE2rphFzJGyd5WKIOgHm8uZTv1aWz yxEITNsN8BiihnIodB0m1Djv7rm06fDKQcxoBDfCY7iQwV2t8uYRp7cAlI+8BTkIv5ZS 6mYp3PiJrMphJnE9BuRB1SoWGKPwysKe4BzSUhowmaeCV8ZL9CRb3Rh2+owNjBVYpZdS OSYTDlUp2GPF+rAuBPz//j0fNqyF0zXSRovlmcUEDpsQMx8Lm2d/VmLjoulCYVa1xopg gHAg== 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=hKioti75bBe1VwsN4yR5FQ+hgYVNJ/FlmuQNyCH2d8A=; b=brfLYU3FWachqjhKAvxSrYlyAY7idOOuJeyJCDXfUguHzON2L0Y+u3LBb1R9z/oAop rLYV01pz+72jYUb66QCyXdClzrBWWxMpSqhArgq7r76XqiLhpvpsdgdMAAuN7XJNGoxp NfRLCn1TFSg3TsI8E8Dqe03LVClGstF/r+EcWY0g1YmXm8NLyA4eJmeRJPOKXkp6FYNn UXrS0dcifDyWHk3FTLuODGzFdQKeyr/mjqnle3dYhJeO6uORFKZzc97QGevzHlJyXE00 X75BAz7+OTitZZPsjOhNwFLLui55PVUcl1RKjqzeXuZCvqsT3OwvG8uwRJlfHsKGz8g2 KpkQ== 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 n19si7945829ion.8.2017.06.30.08.57.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 08:57:13 -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-0000eF-C9; 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 1dQyFv-0000ab-IL for xen-devel@lists.xen.org; Fri, 30 Jun 2017 15:54:51 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 7C/88-03612-A4476595; Fri, 30 Jun 2017 15:54:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRWlGSWpSXmKPExsVysyfVTderJCz S4FGnlMWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmjH/xUumgrNSFeuuvGNsYFwp2MXIxSEksJlR 4u2Jj+wQzmlGiakH2hi7GDk52AQ0Je58/sQEYosISEtc+3wZLM4s4CDx5uM9FhBbWCBSomHff 6AaDg4WAVWJrQt8QcK8AlYSR3/sAiuREJCX2NV2kRXE5gSKH//3AGykkIClxOtZV1kmMHIvYG RYxahRnFpUllqka2Sql1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kR6F8GINjBuGp B4CFGSQ4mJVHelddCI4X4kvJTKjMSizPii0pzUosPMcpwcChJ8K4pCosUEixKTU+tSMvMAQYa TFqCg0dJhFc2CCjNW1yQmFucmQ6ROsVozLHi7a4vTByvJvz/xiTEkpeflyolzvsKZJIASGlGa R7cIFgEXGKUlRLmZQQ6TYinILUoN7MEVf4VozgHo5IwbwjIFJ7MvBK4fa+ATmECOkV4RgjIKS WJCCmpBsaqfsuglJmCW4rCt0q0Kh28F2swN3p/XJbAnMVf/BcXfJp3+HRO646KttoU6+laG3b uWPeTcUpgfXX+s8Oxn/bXvVrmkGF+/XLooRdxDebrAqdzbuYtEeWYGPxT+zWjSkBI1TVZbr51 Lm/Tc7Xy7erlek6ILgyYtPBwfJnIz+ZMD55zr7oW1SqxFGckGmoxFxUnAgB7NXRcewIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1498838089!45457977!1 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 3062 invoked from network); 30 Jun 2017 15:54:50 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-27.messagelabs.com with SMTP; 30 Jun 2017 15:54:50 -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 B4606164F; Fri, 30 Jun 2017 08:54:49 -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 212543F41F; 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:29 +0100 Message-Id: <20170630155431.23824-15-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 14/16] xen/arm: mm: Introduce temporary variable 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 is improving the code readability and avoid to dereference the table every single time we need to access the entry. 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 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 21b3df395f..ea4a35ed7a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -986,28 +986,30 @@ static int create_xen_entries(enum xenmap_operation op, { int rc; unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE; - lpae_t pte; + lpae_t pte, *entry; lpae_t *third = NULL; for(; addr < addr_end; addr += PAGE_SIZE, mfn = mfn_add(mfn, 1)) { - if ( !lpae_table(xen_second[second_linear_offset(addr)]) ) + entry = &xen_second[second_linear_offset(addr)]; + if ( !lpae_table(*entry) ) { - rc = create_xen_table(&xen_second[second_linear_offset(addr)]); + rc = create_xen_table(entry); if ( rc < 0 ) { printk("create_xen_entries: L2 failed\n"); goto out; } } - BUG_ON(!lpae_valid(xen_second[second_linear_offset(addr)])); + BUG_ON(!lpae_valid(*entry)); - third = mfn_to_virt(xen_second[second_linear_offset(addr)].pt.base); + third = mfn_to_virt(entry->pt.base); + entry = &third[third_table_offset(addr)]; switch ( op ) { case INSERT: case RESERVE: - if ( lpae_valid(third[third_table_offset(addr)]) ) + if ( lpae_valid(*entry) ) { printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", addr, mfn_x(mfn)); @@ -1017,11 +1019,11 @@ static int create_xen_entries(enum xenmap_operation op, break; pte = mfn_to_xen_entry(mfn, ai); pte.pt.table = 1; - write_pte(&third[third_table_offset(addr)], pte); + write_pte(entry, pte); break; case MODIFY: case REMOVE: - if ( !lpae_valid(third[third_table_offset(addr)]) ) + if ( !lpae_valid(*entry) ) { printk("create_xen_entries: trying to %s a non-existing mapping addr=%lx\n", op == REMOVE ? "remove" : "modify", addr); @@ -1031,7 +1033,7 @@ static int create_xen_entries(enum xenmap_operation op, pte.bits = 0; else { - pte = third[third_table_offset(addr)]; + pte = *entry; pte.pt.ro = PTE_RO_MASK(ai); pte.pt.xn = PTE_NX_MASK(ai); if ( !pte.pt.ro && !pte.pt.xn ) @@ -1041,7 +1043,7 @@ static int create_xen_entries(enum xenmap_operation op, return -EINVAL; } } - write_pte(&third[third_table_offset(addr)], pte); + write_pte(entry, pte); break; default: BUG();