From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51261C761A6 for ; Wed, 5 Apr 2023 15:17:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D37AF6B0074; Wed, 5 Apr 2023 11:17:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE7DA6B0078; Wed, 5 Apr 2023 11:17:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B88BD6B007B; Wed, 5 Apr 2023 11:17:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A9E636B0074 for ; Wed, 5 Apr 2023 11:17:41 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 677121A0C36 for ; Wed, 5 Apr 2023 15:17:41 +0000 (UTC) X-FDA: 80647691922.23.7E21A8B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 38958140024 for ; Wed, 5 Apr 2023 15:17:38 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eff6QLeI; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680707859; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0Khj7fGp65bIkZuQFK2A/k7JCX9p+b8UVeQzdSnDwvw=; b=BcGMrZbPlt0RINB33X23lZmha3pK/dNwzVjiiDRNd4OcG+BSbs2q4gtHZMy3OLjd6HcmuN omQ/VdXJ/nupTb5GiZ9+ymLtJkrO2RcmZR747Zkmcn0XeDWQkwLy+aGxpE/4q8RowaUTKZ NyTXQhEUGrT5wva7YH1D7RuFeWoaSKM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eff6QLeI; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680707859; a=rsa-sha256; cv=none; b=0fViuXl8MGFZTFdaGX7MH3SxKP5zcjpe6ZjEXl8U5np4JPIhwsU0QuEYXYzZmq9kpLHLcl OZRb31iDZWlCxbv4m0o4NRT+7qVSC/74fqwZI6MpwYTleX9fbEnoxtXVeKRLNrftZq59gN 8Fh1bAqUaD5hAopMfevQu9BhzYxBZ84= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680707858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Khj7fGp65bIkZuQFK2A/k7JCX9p+b8UVeQzdSnDwvw=; b=eff6QLeIG2NMoCmIJ3eagiAAIlyQL6aCQYV3vJD0caCgU9mAbHhlERGiW8z8TOdz89yo7H X62J+5OsEFIcWoruFo2qZgYdjDFqaUjp8GbVpc9YrCcselZgsOmSUrVoD3xZVRVqWOPZOD V6TC2rSzVoMuqEPrvrjs622nfEaaTzw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-4cyLGtAWMtyef9hwiu2f-A-1; Wed, 05 Apr 2023 11:17:34 -0400 X-MC-Unique: 4cyLGtAWMtyef9hwiu2f-A-1 Received: by mail-wm1-f70.google.com with SMTP id ay37-20020a05600c1e2500b003ee69edec16so19276970wmb.5 for ; Wed, 05 Apr 2023 08:17:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680707853; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0Khj7fGp65bIkZuQFK2A/k7JCX9p+b8UVeQzdSnDwvw=; b=o5UUxHe+arMlo3snob/iTntun1E/bTSCbFJsqYmH2ijMn/nrikBKOlHzU5DNBUD7x3 m0ojZkER3rsYfC245ymwTwe3IOl5xYmnV1Dnq0kc+jYivWw6lMWwQU9gCniuziq8xNMY TIQjZ5eapZY8VWpI3UT8NRzu4rudZgJVUFkgqIVm3Ck3ZoPxmcMujhUozAAEHKmWrH2k Zw/zJr2I3H+ZFvDHaAoOr8l3TzNWnJTEKTrMC4fQ03V3YYeG//FU+IhCUoUKp5C0mpT9 FbP7hOj/ye3HJ2RoAEkWoUPEslaKMgvM8aBs1Ia7rMAJ5IMxUvlJ3K1MHjIjhFiXhU34 i1wQ== X-Gm-Message-State: AAQBX9fdquwg6fUTR23kQFyB0hT+4jvf342FRCNO17bOv4fYVFD7ZsrP Tmmi7lqCjiFJUCFWoqS3+/7L9714zEkps+Uq5t/ErttN3hxEZdxUBlJdQ+tUsCrVrDgSo9qWMyo O6L2mww1ibpU= X-Received: by 2002:a05:600c:21cb:b0:3e1:f8af:8772 with SMTP id x11-20020a05600c21cb00b003e1f8af8772mr5063739wmj.9.1680707853189; Wed, 05 Apr 2023 08:17:33 -0700 (PDT) X-Google-Smtp-Source: AKy350bocAt4RSTmZaoEeHyJOCYXfUktWpTPaw9Y+yH03cnlXYDn9H9wtt0G+cONkQNJJY+ej69ctA== X-Received: by 2002:a05:600c:21cb:b0:3e1:f8af:8772 with SMTP id x11-20020a05600c21cb00b003e1f8af8772mr5063726wmj.9.1680707852818; Wed, 05 Apr 2023 08:17:32 -0700 (PDT) Received: from ?IPV6:2003:cb:c703:d00:ca74:d9ea:11e0:dfb? (p200300cbc7030d00ca74d9ea11e00dfb.dip0.t-ipconnect.de. [2003:cb:c703:d00:ca74:d9ea:11e0:dfb]) by smtp.gmail.com with ESMTPSA id e38-20020a5d5966000000b002d78a96cf5fsm15373262wri.70.2023.04.05.08.17.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Apr 2023 08:17:32 -0700 (PDT) Message-ID: Date: Wed, 5 Apr 2023 17:17:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH v1 1/2] mm/userfaultfd: fix uffd-wp handling for THP migration entries To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Muhammad Usama Anjum , stable@vger.kernel.org References: <20230405142535.493854-1-david@redhat.com> <20230405142535.493854-2-david@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: daazw8bgirmq37sa6nynydz9o1zddidt X-Rspam-User: X-Rspamd-Queue-Id: 38958140024 X-Rspamd-Server: rspam06 X-HE-Tag: 1680707858-623817 X-HE-Meta: U2FsdGVkX1+6lG7uuiIIMF2TXaY+zhBprE1cv6oqt4UJucnU7/qEjjh46ydTFUU75FExi+MsajW9cFytq4OwCyN9skFeBBlz+XhRYGvYD8U/gzAXkuZ3tmtNNZIuMrfIIihg2t4ezMGYKTM9NS+icB9tUv/Dg9+N9L0bMrnISIi4KHgdu56m0jGdtJh1Qq4jKCtSW2MGyDID5pyq6EN4Zuq6RsYlTKZaSm+oioO6ut295INHB6dAycDH0I+FqQN0kGtHeDXuVU/qcM3wzzYSG07PNSEp/7mf/bLRp68zoHp7QZlkx1ok6btXlbSKt8XMQHfICXuMS6px2TCWfd5YAAJOEo/YvaFaeuDuZyC5zr57K9Jz4Rk7TtyVoWoiReIa5zcS9ds24yWlpDGdwQ+ko1ryCYOb2JunNqJYWJU9wLr0U9Tip25F74GQzSUDPCdZXYocxnKnCxvBKSJpbUY6v+kxMul/KdzR5GhAsUN0ckaIn7gs5MKBm0bpVywAVBU9t+nM4nmOQtE0RcVKaw+xbjvvxxcMe+sfBYZzR27mjnlNKPJvKk7MYCg9yCWvMyRJPnyCesGnP12AZvjacuQagGFOED5BABQ4jjbvC3Rm4QdGtQPqISnv+H0t2uD++Fv7zN/3E3L+ruGfIXmEtB0L99u1OPnTOhPPHBN+C1h6TE84l06wSd/s/iSSc+slSFnSxiCOwB45WGOW3CteR7abzEmeR9NZejAKl2D7huABJlqpaZ2PSQpYTzUFunhAKNi8HeegCGb6qa9h1fHcoMscB+nPzjuvyvNvgw31OlP68eEyuOTjcG3p9oZXq0fb2nDbU8ritVBE1x7PnAUOq9JSwQ1+vZXzI8MbD4GPzZqFmL6V0LNKaBVc1/7Wq1W7fAPUrKMDOD3o29cr2cpvyIX0cj5kofZmut0ZqYjqhiKy29ZhsBe9mpYnhQEj5HllUxRW/31MXtOqL7AoO6wLPcy Ib5IHCnI rEd97fALJsgvSUryv8AdsEECpgfOn34XXOM72F5UuAT5tV3AYQV+YIVEM/zWaZAUJaHvyksDtqP4WAngtZQeLZBC4ft+y2AXKz4s+4XxQBJ28Z16ZtSNchYfANLpCkaIug4HVskC49xut6ImHEgKXt5U0KRtecnSWAy3FESsvWL44noA2Cfj9ab6/frEDoKuK/yM98+CLTYvNL/DavrdZPuWpmJcTW/wP2DRoViglrdq/r2mffJAC84/Wc8F8HP50c2tdcurmXNZY9G9y9aEcPZA9sf9B9oHRD/U7aQ5ViR41OTDr5EI+LLo73kfpRDjbhP5YyYzNcpeWqsnOjs6T22R8XQjag+knJcqOFWLcUcO9KmK++/+XZSFt+zhDOjuIE8/RFX6AmTkVc5SJC3ydFHFEx4CQQsybtTSygeR4q6/C1g1k619ZVxHHiPx3xbLV0ApXX+THR4oul6n4j3tRZmPW8SXL06i74Rk1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 05.04.23 17:12, Peter Xu wrote: > On Wed, Apr 05, 2023 at 04:25:34PM +0200, David Hildenbrand wrote: >> Looks like what we fixed for hugetlb in commit 44f86392bdd1 ("mm/hugetlb: >> fix uffd-wp handling for migration entries in hugetlb_change_protection()") >> similarly applies to THP. >> >> Setting/clearing uffd-wp on THP migration entries is not implemented >> properly. Further, while removing migration PMDs considers the uffd-wp >> bit, inserting migration PMDs does not consider the uffd-wp bit. >> >> We have to set/clear independently of the migration entry type in >> change_huge_pmd() and properly copy the uffd-wp bit in >> set_pmd_migration_entry(). >> >> Verified using a simple reproducer that triggers migration of a THP, that >> the set_pmd_migration_entry() no longer loses the uffd-wp bit. >> >> Fixes: f45ec5ff16a7 ("userfaultfd: wp: support swap and page migration") >> Cc: stable@vger.kernel.org >> Signed-off-by: David Hildenbrand > > Reviewed-by: Peter Xu > > Thanks, one trivial nitpick: > >> --- >> mm/huge_memory.c | 14 ++++++++++++-- >> 1 file changed, 12 insertions(+), 2 deletions(-) >> >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index 032fb0ef9cd1..bdda4f426d58 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -1838,10 +1838,10 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, >> if (is_swap_pmd(*pmd)) { >> swp_entry_t entry = pmd_to_swp_entry(*pmd); >> struct page *page = pfn_swap_entry_to_page(entry); >> + pmd_t newpmd; >> >> VM_BUG_ON(!is_pmd_migration_entry(*pmd)); >> if (is_writable_migration_entry(entry)) { >> - pmd_t newpmd; >> /* >> * A protection check is difficult so >> * just be safe and disable write >> @@ -1855,8 +1855,16 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, >> newpmd = pmd_swp_mksoft_dirty(newpmd); >> if (pmd_swp_uffd_wp(*pmd)) >> newpmd = pmd_swp_mkuffd_wp(newpmd); >> - set_pmd_at(mm, addr, pmd, newpmd); >> + } else { >> + newpmd = *pmd; >> } >> + >> + if (uffd_wp) >> + newpmd = pmd_swp_mkuffd_wp(newpmd); >> + else if (uffd_wp_resolve) >> + newpmd = pmd_swp_clear_uffd_wp(newpmd); >> + if (!pmd_same(*pmd, newpmd)) >> + set_pmd_at(mm, addr, pmd, newpmd); >> goto unlock; >> } >> #endif >> @@ -3251,6 +3259,8 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, >> pmdswp = swp_entry_to_pmd(entry); >> if (pmd_soft_dirty(pmdval)) >> pmdswp = pmd_swp_mksoft_dirty(pmdswp); >> + if (pmd_swp_uffd_wp(*pvmw->pmd)) >> + pmdswp = pmd_swp_mkuffd_wp(pmdswp); > > I think it's fine to use *pmd, but maybe still better to use pmdval? I > worry pmdp_invalidate()) can be something else in the future that may > affect the bit. Wondering how I ended up with that, I realized that it's actually wrong and might have worked by chance for my reproducer on x86. That should make it work: diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f977c965fdad..fffc953fa6ea 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3257,7 +3257,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, pmdswp = swp_entry_to_pmd(entry); if (pmd_soft_dirty(pmdval)) pmdswp = pmd_swp_mksoft_dirty(pmdswp); - if (pmd_swp_uffd_wp(*pvmw->pmd)) + if (pmd_uffd_wp(pmdval)) pmdswp = pmd_swp_mkuffd_wp(pmdswp); set_pmd_at(mm, address, pvmw->pmd, pmdswp); page_remove_rmap(page, vma, true); -- Thanks, David / dhildenb