From: "Christian König" <christian.koenig@amd.com>
To: "Thomas Hellström (VMware)" <thomas_os@shipmail.org>,
dri-devel@lists.freedesktop.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
linux-graphics-maintainer@vmware.com
Cc: "Thomas Hellstrom" <thellstrom@vmware.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Michal Hocko" <mhocko@suse.com>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
"Ralph Campbell" <rcampbell@nvidia.com>,
"Jérôme Glisse" <jglisse@redhat.com>
Subject: Re: [PATCH 1/2] mm: Add and export vmf_insert_mixed_prot()
Date: Wed, 27 Nov 2019 09:42:45 +0100 [thread overview]
Message-ID: <e1a5ce03-1b8d-8118-de95-b53901e94b50@amd.com> (raw)
In-Reply-To: <20191126202717.30762-1-thomas_os@shipmail.org>
Am 26.11.19 um 21:27 schrieb Thomas Hellström (VMware):
> From: Thomas Hellstrom <thellstrom@vmware.com>
>
> The TTM module today uses a hack to be able to set a different page
> protection than struct vm_area_struct::vm_page_prot. To be able to do
> this properly, add and export vmf_insert_mixed_prot().
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
> Cc: Ralph Campbell <rcampbell@nvidia.com>
> Cc: "Jérôme Glisse" <jglisse@redhat.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> include/linux/mm.h | 2 ++
> mm/memory.c | 15 +++++++++++----
> 2 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index cc292273e6ba..29575d3c1e47 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2548,6 +2548,8 @@ vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr,
> unsigned long pfn, pgprot_t pgprot);
> vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
> pfn_t pfn);
> +vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr,
> + pfn_t pfn, pgprot_t pgprot);
> vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma,
> unsigned long addr, pfn_t pfn);
> int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);
> diff --git a/mm/memory.c b/mm/memory.c
> index b1ca51a079f2..28f162e28144 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -1719,9 +1719,9 @@ static bool vm_mixed_ok(struct vm_area_struct *vma, pfn_t pfn)
> }
>
> static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma,
> - unsigned long addr, pfn_t pfn, bool mkwrite)
> + unsigned long addr, pfn_t pfn, pgprot_t pgprot,
> + bool mkwrite)
> {
> - pgprot_t pgprot = vma->vm_page_prot;
> int err;
>
> BUG_ON(!vm_mixed_ok(vma, pfn));
> @@ -1764,10 +1764,17 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma,
> return VM_FAULT_NOPAGE;
> }
>
> +vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr,
> + pfn_t pfn, pgprot_t pgprot)
> +{
> + return __vm_insert_mixed(vma, addr, pfn, pgprot, false);
> +}
> +EXPORT_SYMBOL(vmf_insert_mixed_prot);
> +
> vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
> pfn_t pfn)
> {
> - return __vm_insert_mixed(vma, addr, pfn, false);
> + return __vm_insert_mixed(vma, addr, pfn, vma->vm_page_prot, false);
> }
> EXPORT_SYMBOL(vmf_insert_mixed);
>
> @@ -1779,7 +1786,7 @@ EXPORT_SYMBOL(vmf_insert_mixed);
> vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma,
> unsigned long addr, pfn_t pfn)
> {
> - return __vm_insert_mixed(vma, addr, pfn, true);
> + return __vm_insert_mixed(vma, addr, pfn, vma->vm_page_prot, true);
> }
> EXPORT_SYMBOL(vmf_insert_mixed_mkwrite);
>
next prev parent reply other threads:[~2019-11-27 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 20:27 [PATCH 1/2] mm: Add and export vmf_insert_mixed_prot() Thomas Hellström (VMware)
2019-11-26 20:27 ` [PATCH 2/2] drm/ttm: Fix vm page protection handling Thomas Hellström (VMware)
2019-11-27 8:43 ` Christian König
2019-11-27 8:42 ` Christian König [this message]
2019-12-03 7:54 [PATCH 0/2] mm, drm/ttm: Fix pte insertion with customized protection Thomas Hellström (VMware)
2019-12-03 7:54 ` [PATCH 1/2] mm: Add and export vmf_insert_mixed_prot() Thomas Hellström (VMware)
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=e1a5ce03-1b8d-8118-de95-b53901e94b50@amd.com \
--to=christian.koenig@amd.com \
--cc=akpm@linux-foundation.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jglisse@redhat.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=rcampbell@nvidia.com \
--cc=thellstrom@vmware.com \
--cc=thomas_os@shipmail.org \
--cc=willy@infradead.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 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).