From patchwork Wed Mar 14 18:19:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 131711 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp157074ljb; Wed, 14 Mar 2018 11:22:38 -0700 (PDT) X-Google-Smtp-Source: AG47ELsy58toJAbw/286rafDrni7btG9A69iFCP0QDpE8O69YM1uzBFsNsvEkx4TfK313A/BZgea X-Received: by 10.107.97.17 with SMTP id v17mr5807809iob.256.1521051758046; Wed, 14 Mar 2018 11:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521051758; cv=none; d=google.com; s=arc-20160816; b=oLvteGTDoqBaje7J5UgB8xyON7iPZp4BnNw42aln31qDifevcte3KDVhA7HDirkZdO Nfy0EJfKjaTzDNqM6iHDuNGlZASV4eSewDGz+luoP25t+JZtXkQ6Mp1+J2/OhvBgZUuE XLaR4iseZjqo4xmE35axSjWarsUQ5V7/OstFAQRnm2RNP6BoqBOxTRWxsR85SRNnIqwr X2Imyuri3kSHxH7f0Rj6U/pGgEsMvHA3Mn1BZgTommDkqgbNcOsrHJOJeeg5jxxhEYmx IEJ5Nbzgv2qBY0Hv5g4U72FTIYEthXiKD16bvcpzuejlYuFMBvWGtUosBq7+mi5tfpzf zTig== 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=2Mw6kjphbqr7JTTPZUiFHKKsA2abioDNRyqMvpNJPqE=; b=h+PGemNL1Bdd2OxwIASMS+l83JF0QIXk47VYr+bvAeHcv+5GXuEa2s9m1o2wEGmOMz g2g9t/dfAupZA30ejj8DRRpW2c0MZZoYz8zLx66rB/g3+qlO2BO9MuXIuqzimbjuZSAm UPYnPMmTMPvZb/PPv0/uDze5vmpqdUlDsN9NoilbAUg8dpxT0cSQhj0NRDbPG8uEusi/ K50BFwt8riQPYmCdYWfDi7wxoHbJV7Wv2WUp/BU6mGRuWDU3g3+0F0x3lm5PuUftj30N HnKRKU3B4VAqNCRhzbWbAnV0Ah5ix3RtrwmK2E0U6cSDU4DBYVmQPv1F3FQci3YGzwLe Ufyg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id o19si1976605iod.55.2018.03.14.11.22.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 11:22:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.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 1ewB0k-0006mt-9s; Wed, 14 Mar 2018 18:20:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewB0i-0006kN-Ro for xen-devel@lists.xen.org; Wed, 14 Mar 2018 18:20:24 +0000 X-Inumbo-ID: 5dfa2f79-27b4-11e8-8248-2fda3a446a53 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 5dfa2f79-27b4-11e8-8248-2fda3a446a53; Wed, 14 Mar 2018 18:20:26 +0000 (UTC) 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 A323E15AB; Wed, 14 Mar 2018 11:20:18 -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 0AB903F53D; Wed, 14 Mar 2018 11:20:17 -0700 (PDT) From: julien.grall@arm.com To: xen-devel@lists.xen.org Date: Wed, 14 Mar 2018 18:19:54 +0000 Message-Id: <20180314182009.14274-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180314182009.14274-1-julien.grall@arm.com> References: <20180314182009.14274-1-julien.grall@arm.com> Cc: Wei Liu Subject: [Xen-devel] [PATCH v5 01/16] x86/mm: skip incrementing mfn if it is not a valid mfn X-BeenThere: xen-devel@lists.xenproject.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.xenproject.org Sender: "Xen-devel" From: Wei Liu The function is called to fill in page table entries in populate_pt_range. Skip incrementing mfn if it is invalid. Signed-off-by: Wei Liu Reviewed-by: Jan Beulich --- Changes in v5: - Patch added --- xen/arch/x86/mm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9b559448a7..5f5577c7c2 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4731,7 +4731,8 @@ int map_pages_to_xen( } virt += 1UL << L3_PAGETABLE_SHIFT; - mfn += 1UL << (L3_PAGETABLE_SHIFT - PAGE_SHIFT); + if ( !mfn_eq(_mfn(mfn), INVALID_MFN) ) + mfn += 1UL << (L3_PAGETABLE_SHIFT - PAGE_SHIFT); nr_mfns -= 1UL << (L3_PAGETABLE_SHIFT - PAGE_SHIFT); continue; } @@ -4756,7 +4757,8 @@ int map_pages_to_xen( if ( i > nr_mfns ) i = nr_mfns; virt += i << PAGE_SHIFT; - mfn += i; + if ( !mfn_eq(_mfn(mfn), INVALID_MFN) ) + mfn += i; nr_mfns -= i; continue; } @@ -4824,7 +4826,8 @@ int map_pages_to_xen( } virt += 1UL << L2_PAGETABLE_SHIFT; - mfn += 1UL << PAGETABLE_ORDER; + if ( !mfn_eq(_mfn(mfn), INVALID_MFN) ) + mfn += 1UL << PAGETABLE_ORDER; nr_mfns -= 1UL << PAGETABLE_ORDER; } else @@ -4853,7 +4856,8 @@ int map_pages_to_xen( if ( i > nr_mfns ) i = nr_mfns; virt += i << L1_PAGETABLE_SHIFT; - mfn += i; + if ( !mfn_eq(_mfn(mfn), INVALID_MFN) ) + mfn += i; nr_mfns -= i; goto check_l3; } @@ -4898,7 +4902,8 @@ int map_pages_to_xen( } virt += 1UL << L1_PAGETABLE_SHIFT; - mfn += 1UL; + if ( !mfn_eq(_mfn(mfn), INVALID_MFN) ) + mfn += 1UL; nr_mfns -= 1UL; if ( (flags == PAGE_HYPERVISOR) &&