From: Muhammad Usama Anjum <usama.anjum@collabora.com>
To: Ryan Roberts <ryan.roberts@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@redhat.com>,
Peter Xu <peterx@redhat.com>
Cc: Muhammad Usama Anjum <usama.anjum@collabora.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH v1] fs/proc/task_mmu: Fix loss of young/dirty bits during pagemap scan
Date: Mon, 29 Apr 2024 18:28:53 +0500 [thread overview]
Message-ID: <700ae50c-2fd6-4bcc-8840-f426558b847f@collabora.com> (raw)
In-Reply-To: <20240429114017.182570-1-ryan.roberts@arm.com>
Thanks!
On 4/29/24 4:40 PM, Ryan Roberts wrote:
> make_uffd_wp_pte() was previously doing:
>
> pte = ptep_get(ptep);
> ptep_modify_prot_start(ptep);
> pte = pte_mkuffd_wp(pte);
> ptep_modify_prot_commit(ptep, pte);
>
> But if another thread accessed or dirtied the pte between the first 2
> calls, this could lead to loss of that information. Since
> ptep_modify_prot_start() gets and clears atomically, the following is
> the correct pattern and prevents any possible race. Any access after the
> first call would see an invalid pte and cause a fault:
>
> pte = ptep_modify_prot_start(ptep);
> pte = pte_mkuffd_wp(pte);
> ptep_modify_prot_commit(ptep, pte);
>
> Fixes: 52526ca7fdb9 ("fs/proc/task_mmu: implement IOCTL to get and optionally clear info about PTEs")
> Signed-off-by: Ryan Roberts <ryan.roberts@arm.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Tested-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
> ---
> fs/proc/task_mmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
> index 23fbab954c20..af4bc1da0c01 100644
> --- a/fs/proc/task_mmu.c
> +++ b/fs/proc/task_mmu.c
> @@ -1825,7 +1825,7 @@ static void make_uffd_wp_pte(struct vm_area_struct *vma,
> pte_t old_pte;
>
> old_pte = ptep_modify_prot_start(vma, addr, pte);
> - ptent = pte_mkuffd_wp(ptent);
> + ptent = pte_mkuffd_wp(old_pte);
> ptep_modify_prot_commit(vma, addr, pte, old_pte, ptent);
> } else if (is_swap_pte(ptent)) {
> ptent = pte_swp_mkuffd_wp(ptent);
> --
> 2.25.1
>
--
BR,
Muhammad Usama Anjum
next prev parent reply other threads:[~2024-04-29 13:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 11:40 [PATCH v1] fs/proc/task_mmu: Fix loss of young/dirty bits during pagemap scan Ryan Roberts
2024-04-29 12:23 ` David Hildenbrand
2024-04-29 13:28 ` Muhammad Usama Anjum [this message]
2024-04-29 15:55 ` Ryan Roberts
2024-04-29 17:23 ` Andrew Morton
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=700ae50c-2fd6-4bcc-8840-f426558b847f@collabora.com \
--to=usama.anjum@collabora.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterx@redhat.com \
--cc=ryan.roberts@arm.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).