[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/6] xen/arm: fix math in add_hwdom_free_regions
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Stewart Hildebrand <stewart.hildebrand@xxxxxxx>
- Date: Thu, 8 May 2025 09:20:31 -0400
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PS22mzhff6xyNXazuoc1lhnF/LmLLmyfr0SuzpVE+S0=; b=Cyy5qzrzxBzLcoThoY+ypwvxcVgq0IkdUN1VKbjtRVp6jaLh8mxbYRy2N4Adf0N4uot9jecQJTAd04AQ7shav/tWcyCIRQHTb0JAG41iWiEYIvFCncJd0c6TIJ/abGns+5CmsfQ6jmF00ADhiw3WWZfvTJT7YAE4O8hjbJJgXh0FnAjToUaE0ojae2HTcZSBYtHkdEVeJhHdb9lYHa4PlbU7v1xoFYCNjKP/yFs4XUbx/E1tICxDrdLaLvnUlj8puGzOg/nbgB1XBIgl07TR2n2VVdyIo5Xwtuer4lwRvxS9xtS6IFX+CbgU+HhwdKexL0oY3Gw8wARGQRtrAJ0dxw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ogK46fMNF/5T7TVjIfBzK0mhJwOz3Mn+baTQbFJ4ZdHw24W9G5Xlc+mLAk2khCdKtPdnFaT4UTYPbY/mOYqmxstlyMq0rVsvY4TIJ3SH0+nMab2pjXxF4QusP94RmsYo0dmU2yRo7iUyjvzt7z9IwmOPAlgem+a6seShpNBaBbVEC0K7+o2OPXbw6Jd5ZvDn24qjaONq+HO//Pvp/9L3vQhwIXPfoOu4uRbzx83B4ovg7px70hH7dIWhVo/yOfJC/B8iqPPo2vs3e+Kq9e3+Gyu7Xvnd8sbtw+SHyM/lRD1IFcCyzEeFCMopAfAPfaYpdU2LIT3HUfhkkiYhCj+/bA==
- Cc: Stewart Hildebrand <stewart.hildebrand@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>
- Delivery-date: Thu, 08 May 2025 13:21:22 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Erroneous logic was duplicated from add_ext_regions() into
add_hwdom_free_regions(). Frame numbers are converted to addresses, but
the end address (e) is rounded down to page size alignment. The logic to
calculate the size assumes e points to the last address, not page,
effectively leading to the region size being erroneously calculated to
be 2M smaller than the actual size of the region.
Fix by adding 1 to the frame number before converting back to address.
Fixes: 02975cc38389 ("xen/arm: permit non direct-mapped Dom0 construction")
Signed-off-by: Stewart Hildebrand <stewart.hildebrand@xxxxxxx>
Acked-by: Michal Orzel <michal.orzel@xxxxxxx>
---
v1->v2:
* add Michal's A-b
* rebase
---
xen/common/device-tree/domain-build.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/common/device-tree/domain-build.c
b/xen/common/device-tree/domain-build.c
index 762b63e2b00a..9556af43e019 100644
--- a/xen/common/device-tree/domain-build.c
+++ b/xen/common/device-tree/domain-build.c
@@ -109,7 +109,7 @@ static int __init add_hwdom_free_regions(unsigned long
s_gfn,
struct membanks *free_regions = data;
paddr_t start, size;
paddr_t s = pfn_to_paddr(s_gfn);
- paddr_t e = pfn_to_paddr(e_gfn);
+ paddr_t e = pfn_to_paddr(e_gfn + 1) - 1;
unsigned int i, j;
if ( free_regions->nr_banks >= free_regions->max_banks )
--
2.49.0
|
