From patchwork Mon Jun 19 16:57:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9796855 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D53A600C5 for ; Mon, 19 Jun 2017 17:00:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E968D1FF0B for ; Mon, 19 Jun 2017 17:00:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD665269A3; Mon, 19 Jun 2017 17:00:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 85C8E1FF0B for ; Mon, 19 Jun 2017 17:00:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dN00I-0003zI-S1; Mon, 19 Jun 2017 16:58:18 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dN00I-0003wv-0U for xen-devel@lists.xen.org; Mon, 19 Jun 2017 16:58:18 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 90/3E-02956-9A208495; Mon, 19 Jun 2017 16:58:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTXcFk0e kwar5+hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8amY2tZC+5KVjT/3MbawHhBoIuRk0NIYDOj xIG5Xl2MXED2aUaJ39+bWUASbAKaEnc+f2ICsUUEpCWufb7MCGIzCzhIvPl4D6xGWCBSYtr24 +wgNouAqsT9LR/AangFrCSW/X7MDGJLCMhL7Gq7yApicwLFv8+/xgix2FLi+JNbbBMYuRcwMq xi1ChOLSpLLdI1NNdLKspMzyjJTczM0TU0MNPLTS0uTkxPzUlMKtZLzs/dxAj0LwMQ7GC8vTH gEKMkB5OSKO+s/+6RQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4NzF6RAoJFqWmp1akZeYAAw0m LcHBoyTCW/MbqJW3uCAxtzgzHSJ1ilGXY8XbXV+YhFjy8vNSpcR5T4LMEAApyijNgxsBC/pLj LJSwryMQEcJ8RSkFuVmlqDKv2IU52BUEuZ9CjKFJzOvBG7TK6AjmICOYD7jAnJESSJCSqqB0X DOOQ5h0XW3ZesXOzQnulYtjphzp2nOlXVCbg8KLLXSpCQjVDZYHci4nP3Rp/FX0o31iZVyKS3 mPQ85V7qcUc559yBm9c6zGy7pMIRVMS/cuV4xR9Uy5ss62775nyfKm0WuF+cwnjlBWX33ye9h VrGsAWe7lz16PtPx8Fb3SbPrObKyVC54KLEUZyQaajEXFScCAOpHi2B1AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1497891496!103807769!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.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21722 invoked from network); 19 Jun 2017 16:58:16 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-27.messagelabs.com with SMTP; 19 Jun 2017 16:58:16 -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 178E01684; Mon, 19 Jun 2017 09:58:16 -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 6A71E3F41F; Mon, 19 Jun 2017 09:58:15 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 19 Jun 2017 17:57:52 +0100 Message-Id: <20170619165753.25049-16-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170619165753.25049-1-julien.grall@arm.com> References: <20170619165753.25049-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 15/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" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 6241c53821..657fee0b17 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();