From: Daniel Vetter <daniel@ffwll.ch>
To: Jason Gunthorpe <jgg@nvidia.com>
Cc: David Airlie <airlied@linux.ie>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [PATCH] drm: remove pgprot_decrypted() before calls to io_remap_pfn_range()
Date: Thu, 5 Nov 2020 20:17:46 +0100 [thread overview]
Message-ID: <20201105191746.GC401619@phenom.ffwll.local> (raw)
In-Reply-To: <0-v1-2e6a0db57868+166-drm_sme_clean_jgg@nvidia.com>
On Thu, Nov 05, 2020 at 01:00:19PM -0400, Jason Gunthorpe wrote:
> commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
> pgprot_decrypted()") moves the pgprot_decrypted() into
> io_remap_pfn_range(). Delete any, now confusing, open coded calls that
> directly precede io_remap_pfn_range():
>
> - drm_io_prot() is only in drm_mmap_locked() to call io_remap_pfn_range()
>
> - fb_mmap() immediately calls vm_iomap_memory() which is a convenience
> wrapper for io_remap_pfn_range()
>
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
> drivers/gpu/drm/drm_vm.c | 3 ---
> drivers/video/fbdev/core/fbmem.c | 5 -----
> 2 files changed, 8 deletions(-)
>
> rc3 will have the dependent patch, this should not be merged to DRM until it
> has the rc3 commits.
>
> There are three other pgprot_decrypted() calls in DRM, I could not figure out
> what was what there, but other than very special cases I would expect code to
> use io_remap_pfn_range() instead.
There's 4 now, I think linux-next added one. It's another io_remap_pfn
Of the three you mentioned we have:
- ttm and i915 use vm_insert_pfn (and ttm also can do also do pud_mkhuge
entries)
- drm_gem is for all other drivers, some also use vm_insert_pfn, the
others I think use dma_mmap_* and friends, which I think underneath
boild down to io_remap_pfn. Or at least should be taking care of this
already.
I'll try and remember to merge this after -rc3. Yell if it's not in by
-rc4 please.
-Daniel
>
> diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
> index 1a636963378947..6d5a03b3223800 100644
> --- a/drivers/gpu/drm/drm_vm.c
> +++ b/drivers/gpu/drm/drm_vm.c
> @@ -70,9 +70,6 @@ static pgprot_t drm_io_prot(struct drm_local_map *map,
> {
> pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
>
> - /* We don't want graphics memory to be mapped encrypted */
> - tmp = pgprot_decrypted(tmp);
> -
> #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || \
> defined(__mips__)
> if (map->type == _DRM_REGISTERS && !(map->flags & _DRM_WRITE_COMBINING))
> diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
> index 8268bbee8cae11..63a27a67a05cfa 100644
> --- a/drivers/video/fbdev/core/fbmem.c
> +++ b/drivers/video/fbdev/core/fbmem.c
> @@ -1386,11 +1386,6 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
> mutex_unlock(&info->mm_lock);
>
> vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
> - /*
> - * The framebuffer needs to be accessed decrypted, be sure
> - * SME protection is removed
> - */
> - vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
> fb_pgprotect(file, vma, start);
>
> return vm_iomap_memory(vma, start, len);
> --
> 2.29.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2020-11-05 19:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 17:00 [PATCH] drm: remove pgprot_decrypted() before calls to io_remap_pfn_range() Jason Gunthorpe
2020-11-05 19:17 ` Daniel Vetter [this message]
2020-11-05 19:35 ` Jason Gunthorpe
2020-11-10 12:54 ` Daniel Vetter
2020-11-10 16:19 ` Daniel Vetter
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=20201105191746.GC401619@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@nvidia.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=tzimmermann@suse.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).