public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] i915/gem_tiled_w[bc]: Tighten computation of upper bound
@ 2019-03-14 17:49 Chris Wilson
  2019-03-14 18:26 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-03-14 17:49 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

Fix the off-by-one in computing the last page that caused us to try and
mmap the page beyond the end of the object.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_tiled_wb.c | 4 ++--
 tests/i915/gem_tiled_wc.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/i915/gem_tiled_wb.c b/tests/i915/gem_tiled_wb.c
index 67d54bd30..827c2d9d6 100644
--- a/tests/i915/gem_tiled_wb.c
+++ b/tests/i915/gem_tiled_wb.c
@@ -174,8 +174,8 @@ igt_simple_main
 			len = size;
 		}
 
-		first_page = offset & ~(PAGE_SIZE-1);
-		last_page = (offset + len + PAGE_SIZE) & ~(PAGE_SIZE-1);
+		first_page = offset & -PAGE_SIZE;
+		last_page = (offset + len + PAGE_SIZE - 1) & -PAGE_SIZE;
 		offset -= first_page;
 
 		linear = gem_mmap__cpu(fd, handle, first_page, last_page - first_page, PROT_READ);
diff --git a/tests/i915/gem_tiled_wc.c b/tests/i915/gem_tiled_wc.c
index 21390729d..67ebbc940 100644
--- a/tests/i915/gem_tiled_wc.c
+++ b/tests/i915/gem_tiled_wc.c
@@ -149,8 +149,8 @@ igt_simple_main
 			len = size;
 		}
 
-		first_page = offset & ~(PAGE_SIZE-1);
-		last_page = (offset + len + PAGE_SIZE) & ~(PAGE_SIZE-1);
+		first_page = offset & -PAGE_SIZE;
+		last_page = (offset + len + PAGE_SIZE - 1) & -PAGE_SIZE;
 
 		linear = gem_mmap__wc(fd, handle, first_page, last_page - first_page, PROT_READ);
 
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-03-15  3:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-14 17:49 [igt-dev] [PATCH i-g-t] i915/gem_tiled_w[bc]: Tighten computation of upper bound Chris Wilson
2019-03-14 18:26 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-03-14 21:24 ` [igt-dev] [PATCH i-g-t] " Antonio Argenziano
2019-03-15  3:00 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox