From patchwork Tue Jun 28 16:17:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 71106 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1681572qgy; Tue, 28 Jun 2016 09:19:39 -0700 (PDT) X-Received: by 10.107.188.131 with SMTP id m125mr4800883iof.1.1467130779583; Tue, 28 Jun 2016 09:19:39 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 76si2368593ioh.135.2016.06.28.09.19.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 09:19:39 -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 1bHvhq-00072v-Js; Tue, 28 Jun 2016 16:17:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bHvho-00070z-QV for xen-devel@lists.xen.org; Tue, 28 Jun 2016 16:17:44 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 21/21-10191-823A2775; Tue, 28 Jun 2016 16:17:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTVd9cVG 4wepF6hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bGfS/YC6bzVEx7vIq5gfEpZxcjF4eQwCZG ic///jNDOKcZJVp7brN1MXJysAloStz5/IkJxBYRkJa49vkyI0gRs8AsRomjEy8BFXFwCAuES /SeiQUxWQRUJa680Qcp5xVwkbh8oZEFxJYQkJM4eWwyK4jNKeAqsWXKT7DxQkA1F07cYJnAyL 2AkWEVo0ZxalFZapGuoZleUlFmekZJbmJmjq6hoYlebmpxcWJ6ak5iUrFecn7uJkagf+sZGBh 3MH497XmIUZKDSUmU91tvUbgQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd6VC4FygkWp6akVaZk5 wECDSUtw8CiJ8HIvAkrzFhck5hZnpkOkTjEqSonz7gbpEwBJZJTmwbXBgvsSo6yUMC8jAwODE E9BalFuZgmq/CtGcQ5GJWHeayBTeDLzSuCmvwJazAS0mLU6H2RxSSJCSqqB0TnL7yVLqJXre5 2tuSdLOOfMrewsjXW+W3Rx4uIHCo0BCWdn3RedbMlzP/mbwcKrjTdPveUqCj1UFly+4EFdfId oW6RJ2ruYGyycx81f/5p8heN/9CrjplMuyfcOaTUxr55w2XVShN6ydi2/lS/cWfYeb7lt9E3a 2iNzT/QUTaVy0/fPL54/ocRSnJFoqMVcVJwIACo25jBpAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1467130662!48693172!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 61050 invoked from network); 28 Jun 2016 16:17:43 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-27.messagelabs.com with SMTP; 28 Jun 2016 16:17:43 -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 E28203A8; Tue, 28 Jun 2016 09:18:34 -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 B72853F21A; Tue, 28 Jun 2016 09:17:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 28 Jun 2016 17:17:11 +0100 Message-Id: <1467130643-23868-6-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467130643-23868-1-git-send-email-julien.grall@arm.com> References: <1467130643-23868-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, Jan Beulich , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH v5 05/17] 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_GFN. Signed-off-by: Julien Grall --- Cc: Suravee Suthikulpanit Cc: Jan Beulich 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));