From patchwork Wed Jul 6 13:01:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 71456 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp854139qgy; Wed, 6 Jul 2016 06:04:11 -0700 (PDT) X-Received: by 10.36.111.81 with SMTP id x78mr19102044itb.6.1467810251617; Wed, 06 Jul 2016 06:04:11 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 189si3601596iou.91.2016.07.06.06.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jul 2016 06:04:11 -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 1bKmSE-00006q-VW; Wed, 06 Jul 2016 13:01:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKmSD-00006F-Tj for xen-devel@lists.xen.org; Wed, 06 Jul 2016 13:01:26 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 70/28-02783-5210D775; Wed, 06 Jul 2016 13:01:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTVeFsTb cYP0RQ4slHxezODB6HN39mymAMYo1My8pvyKBNWPxhC/sBQd4K3btjGhgfMrVxcjFISSwiVHi 8s+ZTBDOaUaJvqdv2LsYOTnYBDQl7nz+xARiiwhIS1z7fJkRpIhZ4BijxOe5p8CKhAXCJU7Mn wpWxCKgKrF01gewOK+Ai8TiuafYQGwJATmJk8cms4LYnAKuEtOvPQarEQKq2b54EvMERu4FjA yrGDWKU4vKUot0DU31kooy0zNKchMzc3QNDYz1clOLixPTU3MSk4r1kvNzNzECPcwABDsY12z 3PMQoycGkJMrL8q06XIgvKT+lMiOxOCO+qDQntfgQowwHh5IEb8P/mnAhwaLU9NSKtMwcYKjB pCU4eJREePVB0rzFBYm5xZnpEKlTjIpS4rydIAkBkERGaR5cGyy8LzHKSgnzMgIdIsRTkFqUm 1mCKv+KUZyDUUmY9xjIFJ7MvBK46a+AFjMBLf7pUg2yuCQRISXVwBgYVir6ul7r07lLip7rZJ OtAhW3uexdpcBft9a4QjWajb97le0fSQ+xt77Wm4PldvM1u4dkLM20eGGwV99M3l4+QN2UW3C mSvuuxpaQ+DUrpq28+yXdReJVVpIyU7XoDN3zusFVVpXP9ZyKN4YfLH7RUH7p5cVk6QMSPNMi 59rcPCare/u4EktxRqKhFnNRcSIA9sz4vWoCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1467810084!49120393!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 436 invoked from network); 6 Jul 2016 13:01:24 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-31.messagelabs.com with SMTP; 6 Jul 2016 13:01:24 -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 EA89EBA9; Wed, 6 Jul 2016 06:02:22 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 012E43F21A; Wed, 6 Jul 2016 06:01:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 6 Jul 2016 14:01:01 +0100 Message-Id: <1467810073-27971-3-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467810073-27971-1-git-send-email-julien.grall@arm.com> References: <1467810073-27971-1-git-send-email-julien.grall@arm.com> Cc: Andrew Cooper , Julien Grall , sstabellini@kernel.org, Suravee Suthikulpanit , Jan Beulich Subject: [Xen-devel] [PATCH v6 02/14] xen/passthrough: x86: Use INVALID_GFN rather than INVALID_MFN 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" A variable containing a guest frame should be compared to INVALID_GFN and not INVALID_MFN. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- Cc: Suravee Suthikulpanit Changes in v6: - Fix typo in the commit message - Add Andrew's and Jan' reviewed-by Changes in v5: - Patch added --- xen/drivers/passthrough/amd/iommu_map.c | 2 +- xen/drivers/passthrough/x86/iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 1b914ba..c758459 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -555,7 +555,7 @@ static int update_paging_mode(struct domain *d, unsigned long gfn) unsigned long old_root_mfn; struct domain_iommu *hd = dom_iommu(d); - if ( gfn == INVALID_MFN ) + if ( gfn == INVALID_GFN ) return -EADDRNOTAVAIL; ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index a18a608..cd435d7 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -61,7 +61,7 @@ int arch_iommu_populate_page_table(struct domain *d) unsigned long mfn = page_to_mfn(page); unsigned long gfn = mfn_to_gmfn(d, mfn); - if ( gfn != INVALID_MFN ) + if ( gfn != INVALID_GFN ) { ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); BUG_ON(SHARED_M2P(gfn));