From 477c66424129d71e7a0a4d63fcdae64751992546 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 14 Aug 2025 16:06:14 +0200 Subject: [PATCH] tests/pdx: define PAGE_SIZE as long MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise Coverity complains about possibly shifting an integer more than 31 bits. This also reverts the previous attempt to fix this Coverity reported issue, commit 4dd323029094d93dbc8d174fe744fd7f54f0a7a4. Suggested-by: Jan Beulich Coverity ID: 1662707 Fixes: cb50e4033717 ('test/pdx: add PDX compression unit tests') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- tools/tests/pdx/harness.h | 2 +- xen/common/pdx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/pdx/harness.h b/tools/tests/pdx/harness.h index 5bef7df650..a8852ac453 100644 --- a/tools/tests/pdx/harness.h +++ b/tools/tests/pdx/harness.h @@ -33,7 +33,7 @@ #define PAGE_SHIFT 12 /* Some libcs define PAGE_SIZE in limits.h. */ #undef PAGE_SIZE -#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_SIZE (1L << PAGE_SHIFT) #define MAX_ORDER 18 /* 2 * PAGETABLE_ORDER (9) */ #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 06536cc639..9e6b36086f 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -274,7 +274,7 @@ bool __init pfn_pdx_compression_setup(paddr_t base) pfn_pdx_hole_shift = hole_shift; pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = ((paddr_t)PAGE_SIZE << bottom_shift) - 1; + ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); ma_top_mask = pfn_top_mask << PAGE_SHIFT;