From patchwork Wed Sep 13 17:59:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112465 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1226595qgf; Wed, 13 Sep 2017 11:02:23 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCjZR4GetusZLzfA/KvHFsp44kG1I/Brgpsdr7irYj/DR+wa2gRyLx3+8YW39v+oi/0Vt3E X-Received: by 10.107.167.129 with SMTP id q123mr7458405ioe.90.1505325743683; Wed, 13 Sep 2017 11:02:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505325743; cv=none; d=google.com; s=arc-20160816; b=UU/+MTxgoQ/wCcMN3eWorH0f3xfcmveUrMNHyN7V2ed0qgigludzob45CsBcBcHjDL hx/DCrHWHnncTE4VBs3WoHR0noiK2hSTh3serVbbrjs9Mw/TkyC2Ijmji2kV2P8lDuYn qxzWEIA18liUBbjn7JXVSnuvhmpggdB8lhdC/nxYZWZUxwxp23PQeYlhdNyeMKjJpnPi v7wtXVqNb+3tL7pq/aE+zk/V0f6UaqEczYTae0jDqsdpWwRJLFKJslNA5OG8IZpSpny9 GqbPJ4uATMyXJg2yS1pIJ72eIsLuCAoxGNddIdozrRVAIGzVNS5FgDlowASwGTJmdprj h/lw== 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=cA8RINJNvCgPxQeKyTDPiYL5ZaziesHbDw2yhqxhbpY=; b=FNCn2xTJsASEKXbgMbrTEJS38S62pfklQdPuUGFjfItkkIxZEsq15DhU4D6GKvIUJp hKRSUzFHaMyuR0oLMgSWrzepxSLyd83qFNx8QByyeRY1SDEPWmFU9fnt/mz58y3l94U8 i+/8le5y7Ds+2AOWg1ZU3jW2ZC8rnLX1pHCvawIONX6NdoW+d2vUSDWPMpDoN0Wg0UEm MGd9Xgk8BH4pBRlCC7ApIAsfqSfIetpd9ivYr0nm4YQaWCKmEWgo+5QEUcDN9vST+m5M MJBszu4B4h+volOLJ21RBRXMi8veULpkzpkYVlMCRiEHOP8Co9PLqqXtQcabTaZf+lm9 Vc0A== 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 w8si432869ite.79.2017.09.13.11.02.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Sep 2017 11:02:23 -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 1dsBxM-0007rF-6Y; Wed, 13 Sep 2017 18:00:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dsBxL-0007qG-4l for xen-devel@lists.xen.org; Wed, 13 Sep 2017 18:00:11 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id 81/76-17770-A2279B95; Wed, 13 Sep 2017 18:00:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVysyfVTVejaGe kwYEuDoslHxezODB6HN39mymAMYo1My8pvyKBNePD/7vMBQ/5K3p2X2BrYFzK08XIxSEksJlR 4vyvtSwQzmlGiSvrOxi7GDk52AQ0Je58/sQEYosISEtc+3yZEaSIWWAxo8Tn/b3MXYwcHMIC8 RIH1pWA1LAIqEoc2nAOrJ5XwFLi1JYPbCC2hIC8xK62i6wgNqeAlcTMrwuYQFqFgGpO90RNYO RewMiwilGjOLWoLLVI18hUL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMj0L8MQLC DcdWCwEOMkhxMSqK8e3V3RgrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4JUoBMoJFqWmp1akZeYA Aw0mLcHBoyTCqw2S5i0uSMwtzkyHSJ1i1OXouHn3D5MQS15+XqqUOO/6AqAiAZCijNI8uBGwo L/EKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlYd5vIFN4MvNK4Da9AjqCCeiIM6d3gBxRkoiQkm pgLKvbc10o1l3tfmrSta4r8c9bWde3SancsS+ICpBdLmAvetjl91G2368vhhwqDT7wXeVnbPz Jztwa6TkmFx75/nbXZuyTahXSrme8fdH7ItuD/b03FvIXWvN4HX9S6CZy8eN0jQieXikVqdV8 RjmNxeoR2s5R645MMXJqN/iZYNy190FmUrASS3FGoqEWc1FxIgA91wS4dQIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1505325607!116688117!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.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31535 invoked from network); 13 Sep 2017 18:00:07 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-27.messagelabs.com with SMTP; 13 Sep 2017 18:00:07 -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 68ED8169E; Wed, 13 Sep 2017 11:00:07 -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 567643F587; Wed, 13 Sep 2017 11:00:06 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 13 Sep 2017 18:59:43 +0100 Message-Id: <20170913175953.16942-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913175953.16942-1-julien.grall@arm.com> References: <20170913175953.16942-1-julien.grall@arm.com> Cc: George Dunlap , Andrew Cooper , Julien Grall , Jan Beulich Subject: [Xen-devel] [PATCH 05/15] xen/x86: p2m-pod: Avoid redundant assignments in p2m_pod_demand_populate 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" gfn_aligned is assigned 3 times with the exact same formula. All the variables used are not modified, so consolidate in a single assignment at the beginning of the function. Signed-off-by: Julien Grall --- Cc: George Dunlap Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/mm/p2m-pod.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index f04d6e03e2..bcc87aee03 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -1079,7 +1079,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, unsigned long gfn, { struct domain *d = p2m->domain; struct page_info *p = NULL; /* Compiler warnings */ - unsigned long gfn_aligned; + unsigned long gfn_aligned = (gfn >> order) << order; mfn_t mfn; unsigned long i; @@ -1102,7 +1102,6 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, unsigned long gfn, if ( order == PAGE_ORDER_1G ) { pod_unlock(p2m); - gfn_aligned = (gfn >> order) << order; /* * Note that we are supposed to call p2m_set_entry() 512 times to * split 1GB into 512 2MB pages here. But We only do once here because @@ -1147,8 +1146,6 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, unsigned long gfn, BUG_ON((mfn_x(mfn) & ((1UL << order) - 1)) != 0); - gfn_aligned = (gfn >> order) << order; - p2m_set_entry(p2m, gfn_aligned, mfn, order, p2m_ram_rw, p2m->default_access); @@ -1200,7 +1197,6 @@ remap_and_retry: * NOTE: In a p2m fine-grained lock scenario this might * need promoting the gfn lock from gfn->2M superpage. */ - gfn_aligned = (gfn >> order) << order; for ( i = 0; i < (1UL << order); i++ ) p2m_set_entry(p2m, gfn_aligned + i, INVALID_MFN, PAGE_ORDER_4K, p2m_populate_on_demand, p2m->default_access);