From: Kees Cook <keescook@chromium.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: jgross@suse.com, sstabellini@kernel.org,
intel-gfx@lists.freedesktop.org, x86@kernel.org,
linux-kernel@vger.kernel.org, chris@chris-wilson.co.uk,
linux-mm@kvack.org, boris.ostrovsky@oracle.com, hch@lst.de,
akpm@linux-foundation.org
Subject: Re: [Intel-gfx] [PATCH 6/7] i915: Convert to verify_page_range()
Date: Tue, 13 Apr 2021 20:04:12 -0700 [thread overview]
Message-ID: <202104132002.F03F8616DA@keescook> (raw)
In-Reply-To: <20210412080611.902470568@infradead.org>
On Mon, Apr 12, 2021 at 10:00:18AM +0200, Peter Zijlstra wrote:
> check_{present,absent}() only need R/O access, use verify_page_range()
> instead to remove modular use of apply_to_page_range().
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -1225,9 +1225,9 @@ static int igt_mmap_gpu(void *arg)
> return 0;
> }
>
> -static int check_present_pte(pte_t *pte, unsigned long addr, void *data)
> +static int check_present_pte(pte_t pte, unsigned long addr, void *data)
> {
> - if (!pte_present(*pte) || pte_none(*pte)) {
> + if (!pte_present(pte) || pte_none(pte)) {
> pr_err("missing PTE:%lx\n",
> (addr - (unsigned long)data) >> PAGE_SHIFT);
> return -EINVAL;
> @@ -1236,9 +1236,9 @@ static int check_present_pte(pte_t *pte,
> return 0;
> }
>
> -static int check_absent_pte(pte_t *pte, unsigned long addr, void *data)
> +static int check_absent_pte(pte_t pte, unsigned long addr, void *data)
> {
> - if (pte_present(*pte) && !pte_none(*pte)) {
> + if (pte_present(pte) && !pte_none(pte)) {
> pr_err("present PTE:%lx; expected to be revoked\n",
> (addr - (unsigned long)data) >> PAGE_SHIFT);
> return -EINVAL;
> @@ -1249,14 +1249,14 @@ static int check_absent_pte(pte_t *pte,
>
> static int check_present(unsigned long addr, unsigned long len)
> {
> - return apply_to_page_range(current->mm, addr, len,
> - check_present_pte, (void *)addr);
> + return verify_page_range(current->mm, addr, len,
> + check_present_pte, (void *)addr);
> }
And this would be:
static int check_present(unsigned long addr, unsigned long len)
unsigned long fail;
fail = verify_page_range(current->mm, addr, len, check_present_pte);
if (fail) {
pr_err("missing PTE:%lx\n", addr);
return -EINVAL;
}
}
(Oh, and I think I messed up the page shifting macro name in the earlier
one...)
--
Kees Cook
_______________________________________________
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: Kees Cook <keescook@chromium.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
boris.ostrovsky@oracle.com, jgross@suse.com,
sstabellini@kernel.org, x86@kernel.org,
jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com,
rodrigo.vivi@intel.com, chris@chris-wilson.co.uk,
intel-gfx@lists.freedesktop.org, linux-mm@kvack.org, hch@lst.de
Subject: Re: [PATCH 6/7] i915: Convert to verify_page_range()
Date: Tue, 13 Apr 2021 20:04:12 -0700 [thread overview]
Message-ID: <202104132002.F03F8616DA@keescook> (raw)
In-Reply-To: <20210412080611.902470568@infradead.org>
On Mon, Apr 12, 2021 at 10:00:18AM +0200, Peter Zijlstra wrote:
> check_{present,absent}() only need R/O access, use verify_page_range()
> instead to remove modular use of apply_to_page_range().
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -1225,9 +1225,9 @@ static int igt_mmap_gpu(void *arg)
> return 0;
> }
>
> -static int check_present_pte(pte_t *pte, unsigned long addr, void *data)
> +static int check_present_pte(pte_t pte, unsigned long addr, void *data)
> {
> - if (!pte_present(*pte) || pte_none(*pte)) {
> + if (!pte_present(pte) || pte_none(pte)) {
> pr_err("missing PTE:%lx\n",
> (addr - (unsigned long)data) >> PAGE_SHIFT);
> return -EINVAL;
> @@ -1236,9 +1236,9 @@ static int check_present_pte(pte_t *pte,
> return 0;
> }
>
> -static int check_absent_pte(pte_t *pte, unsigned long addr, void *data)
> +static int check_absent_pte(pte_t pte, unsigned long addr, void *data)
> {
> - if (pte_present(*pte) && !pte_none(*pte)) {
> + if (pte_present(pte) && !pte_none(pte)) {
> pr_err("present PTE:%lx; expected to be revoked\n",
> (addr - (unsigned long)data) >> PAGE_SHIFT);
> return -EINVAL;
> @@ -1249,14 +1249,14 @@ static int check_absent_pte(pte_t *pte,
>
> static int check_present(unsigned long addr, unsigned long len)
> {
> - return apply_to_page_range(current->mm, addr, len,
> - check_present_pte, (void *)addr);
> + return verify_page_range(current->mm, addr, len,
> + check_present_pte, (void *)addr);
> }
And this would be:
static int check_present(unsigned long addr, unsigned long len)
unsigned long fail;
fail = verify_page_range(current->mm, addr, len, check_present_pte);
if (fail) {
pr_err("missing PTE:%lx\n", addr);
return -EINVAL;
}
}
(Oh, and I think I messed up the page shifting macro name in the earlier
one...)
--
Kees Cook
next prev parent reply other threads:[~2021-04-14 3:04 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 8:00 [Intel-gfx] [PATCH 0/7] mm: Unexport apply_to_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:00 ` [Intel-gfx] [PATCH 1/7] mm: Unexport apply_to_existing_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:13 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:13 ` Christoph Hellwig
2021-04-12 8:00 ` [Intel-gfx] [PATCH 2/7] xen/gntdev, x86: Remove apply_to_page_range() use from module Peter Zijlstra
2021-04-12 8:00 ` [PATCH 2/7] xen/gntdev,x86: " Peter Zijlstra
2021-04-12 8:26 ` [Intel-gfx] [PATCH 2/7] xen/gntdev, x86: " Christoph Hellwig
2021-04-12 8:26 ` [PATCH 2/7] xen/gntdev,x86: " Christoph Hellwig
2021-04-12 9:20 ` [Intel-gfx] [PATCH 2/7] xen/gntdev, x86: " Peter Zijlstra
2021-04-12 9:20 ` [PATCH 2/7] xen/gntdev,x86: " Peter Zijlstra
2021-04-12 9:26 ` [Intel-gfx] [PATCH 2/7] xen/gntdev, x86: " Juergen Gross
2021-04-12 9:26 ` [PATCH 2/7] xen/gntdev,x86: " Juergen Gross
2021-04-12 8:00 ` [Intel-gfx] [PATCH 3/7] xen/gntdev: " Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:27 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:27 ` Christoph Hellwig
2021-04-12 9:02 ` [Intel-gfx] " Peter Zijlstra
2021-04-12 9:02 ` Peter Zijlstra
2021-04-12 8:00 ` [Intel-gfx] [PATCH 4/7] mm: Introduce verify_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:28 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:28 ` Christoph Hellwig
2021-04-12 9:17 ` [Intel-gfx] " Peter Zijlstra
2021-04-12 9:17 ` Peter Zijlstra
2021-04-12 20:05 ` [Intel-gfx] " Kees Cook
2021-04-12 20:05 ` Kees Cook
2021-04-13 6:54 ` [Intel-gfx] " Peter Zijlstra
2021-04-13 6:54 ` Peter Zijlstra
2021-04-19 23:36 ` [Intel-gfx] " Kees Cook
2021-04-19 23:36 ` Kees Cook
2021-04-13 7:36 ` [Intel-gfx] " Peter Zijlstra
2021-04-13 7:36 ` Peter Zijlstra
2021-04-14 3:01 ` [Intel-gfx] " Kees Cook
2021-04-14 3:01 ` Kees Cook
2021-04-14 7:00 ` [Intel-gfx] " Peter Zijlstra
2021-04-14 7:00 ` Peter Zijlstra
2021-04-12 8:00 ` [Intel-gfx] [PATCH 5/7] xen/privcmd: Use verify_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:28 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:28 ` Christoph Hellwig
2021-04-12 8:00 ` [Intel-gfx] [PATCH 6/7] i915: Convert to verify_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:28 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:28 ` Christoph Hellwig
2021-04-12 20:08 ` [Intel-gfx] " Kees Cook
2021-04-12 20:08 ` Kees Cook
2021-04-13 6:54 ` [Intel-gfx] " Peter Zijlstra
2021-04-13 6:54 ` Peter Zijlstra
2021-04-14 3:04 ` Kees Cook [this message]
2021-04-14 3:04 ` Kees Cook
2021-04-12 8:00 ` [Intel-gfx] [PATCH 7/7] mm: Unexport apply_to_page_range() Peter Zijlstra
2021-04-12 8:00 ` Peter Zijlstra
2021-04-12 8:28 ` [Intel-gfx] " Christoph Hellwig
2021-04-12 8:28 ` Christoph Hellwig
2021-04-12 9:00 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2021-04-12 9:23 ` Peter Zijlstra
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=202104132002.F03F8616DA@keescook \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=boris.ostrovsky@oracle.com \
--cc=chris@chris-wilson.co.uk \
--cc=hch@lst.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterz@infradead.org \
--cc=sstabellini@kernel.org \
--cc=x86@kernel.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.