All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH i-g-t 2/5] gem_wsim: Round mmap to page size
Date: Thu, 28 Feb 2019 14:18:25 +0000	[thread overview]
Message-ID: <20190228141828.2567-2-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190228141828.2567-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

mmap(2) mandates size is page aligned.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 benchmarks/gem_wsim.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index 0a5abc08d8c2..57ceb983cf82 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -737,6 +737,7 @@ init_bb(struct w_step *w, unsigned int flags)
 {
 	const unsigned int arb_period =
 			get_bb_sz(w->preempt_us) / sizeof(uint32_t);
+	const unsigned int mmap_len = ALIGN(w->bb_sz, 4096);
 	unsigned int i;
 	uint32_t *ptr;
 
@@ -746,12 +747,12 @@ init_bb(struct w_step *w, unsigned int flags)
 	gem_set_domain(fd, w->bb_handle,
 		       I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
 
-	ptr = gem_mmap__wc(fd, w->bb_handle, 0, w->bb_sz, PROT_WRITE);
+	ptr = gem_mmap__wc(fd, w->bb_handle, 0, mmap_len, PROT_WRITE);
 
 	for (i = arb_period; i < w->bb_sz / sizeof(uint32_t); i += arb_period)
 		ptr[i] = 0x5 << 23; /* MI_ARB_CHK */
 
-	munmap(ptr, w->bb_sz);
+	munmap(ptr, mmap_len);
 }
 
 static void
@@ -771,7 +772,7 @@ terminate_bb(struct w_step *w, unsigned int flags)
 		batch_start -= 12 * sizeof(uint32_t);
 
 	mmap_start = rounddown(batch_start, PAGE_SIZE);
-	mmap_len = w->bb_sz - mmap_start;
+	mmap_len = ALIGN(w->bb_sz - mmap_start, PAGE_SIZE);
 
 	gem_set_domain(fd, w->bb_handle,
 		       I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t 2/5] gem_wsim: Round mmap to page size
Date: Thu, 28 Feb 2019 14:18:25 +0000	[thread overview]
Message-ID: <20190228141828.2567-2-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190228141828.2567-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

mmap(2) mandates size is page aligned.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 benchmarks/gem_wsim.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index 0a5abc08d8c2..57ceb983cf82 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -737,6 +737,7 @@ init_bb(struct w_step *w, unsigned int flags)
 {
 	const unsigned int arb_period =
 			get_bb_sz(w->preempt_us) / sizeof(uint32_t);
+	const unsigned int mmap_len = ALIGN(w->bb_sz, 4096);
 	unsigned int i;
 	uint32_t *ptr;
 
@@ -746,12 +747,12 @@ init_bb(struct w_step *w, unsigned int flags)
 	gem_set_domain(fd, w->bb_handle,
 		       I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
 
-	ptr = gem_mmap__wc(fd, w->bb_handle, 0, w->bb_sz, PROT_WRITE);
+	ptr = gem_mmap__wc(fd, w->bb_handle, 0, mmap_len, PROT_WRITE);
 
 	for (i = arb_period; i < w->bb_sz / sizeof(uint32_t); i += arb_period)
 		ptr[i] = 0x5 << 23; /* MI_ARB_CHK */
 
-	munmap(ptr, w->bb_sz);
+	munmap(ptr, mmap_len);
 }
 
 static void
@@ -771,7 +772,7 @@ terminate_bb(struct w_step *w, unsigned int flags)
 		batch_start -= 12 * sizeof(uint32_t);
 
 	mmap_start = rounddown(batch_start, PAGE_SIZE);
-	mmap_len = w->bb_sz - mmap_start;
+	mmap_len = ALIGN(w->bb_sz - mmap_start, PAGE_SIZE);
 
 	gem_set_domain(fd, w->bb_handle,
 		       I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2019-02-28 14:18 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-28 14:18 [igt-dev] [PATCH i-g-t 1/5] lib/i915: Assert mmap size alignment Tvrtko Ursulin
2019-02-28 14:18 ` Tvrtko Ursulin
2019-02-28 14:18 ` Tvrtko Ursulin [this message]
2019-02-28 14:18   ` [PATCH i-g-t 2/5] gem_wsim: Round mmap to page size Tvrtko Ursulin
2019-02-28 14:25   ` [Intel-gfx] " Chris Wilson
2019-02-28 14:25     ` Chris Wilson
2019-02-28 14:41     ` [igt-dev] [Intel-gfx] " Tvrtko Ursulin
2019-02-28 14:41       ` Tvrtko Ursulin
2019-02-28 14:44       ` [igt-dev] [Intel-gfx] " Chris Wilson
2019-02-28 14:44         ` Chris Wilson
2019-02-28 14:18 ` [igt-dev] [PATCH i-g-t 3/5] gem_wsim: Remove some unused struct members Tvrtko Ursulin
2019-02-28 14:18   ` Tvrtko Ursulin
2019-02-28 14:30   ` [igt-dev] " Chris Wilson
2019-02-28 14:30     ` Chris Wilson
2019-02-28 14:18 ` [igt-dev] [PATCH i-g-t 4/5] autoconf: Silence void pointer arithmetic warnings Tvrtko Ursulin
2019-02-28 14:18   ` Tvrtko Ursulin
2019-02-28 14:31   ` [igt-dev] " Chris Wilson
2019-02-28 14:31     ` Chris Wilson
2019-02-28 14:42     ` Tvrtko Ursulin
2019-02-28 14:42       ` Tvrtko Ursulin
2019-02-28 14:18 ` [Intel-gfx] [PATCH i-g-t 5/5] tests/i915/pm_rc6_residency: Fix linking Tvrtko Ursulin
2019-02-28 14:18   ` Tvrtko Ursulin
2019-02-28 14:33   ` [igt-dev] " Chris Wilson
2019-02-28 14:33     ` Chris Wilson
2019-02-28 14:48     ` Tvrtko Ursulin
2019-02-28 14:48       ` Tvrtko Ursulin
2019-02-28 14:24 ` [igt-dev] [PATCH i-g-t 1/5] lib/i915: Assert mmap size alignment Chris Wilson
2019-02-28 14:24   ` Chris Wilson
2019-02-28 14:38   ` Tvrtko Ursulin
2019-02-28 14:38     ` Tvrtko Ursulin
2019-02-28 15:17 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/5] " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190228141828.2567-2-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.