From patchwork Tue Apr 27 16:12:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12226865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD3DAC433B4 for ; Tue, 27 Apr 2021 16:13:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1CDA0613C2 for ; Tue, 27 Apr 2021 16:13:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CDA0613C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7263F6B0036; Tue, 27 Apr 2021 12:13:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FE1C6B006E; Tue, 27 Apr 2021 12:13:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 576EA6B0070; Tue, 27 Apr 2021 12:13:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0196.hostedemail.com [216.40.44.196]) by kanga.kvack.org (Postfix) with ESMTP id 336FD6B0036 for ; Tue, 27 Apr 2021 12:13:25 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E6323824999B for ; Tue, 27 Apr 2021 16:13:24 +0000 (UTC) X-FDA: 78078641928.26.A8D8737 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 20380A00018A for ; Tue, 27 Apr 2021 16:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619540003; 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; bh=dvdXPY/vIXbwJK2L+TwNnSzbosTvqkUYu+IRlTdBfLA=; b=gVYvw1wmi2Kpn/SnCM+sVSaAJrCKRUZ5DjFTWgWf+4A4rn0Ijt9OuZ6pMzAY5c0cFTh6fT kTK+Yxgn/lQUiVCbhSnFY5Yjf/KCxEOg/p+UPbapwWZTl6Ho85cc9fI+T0VwWNsSKoZEBm 3vkLwm6BZDCq2sKWZ0aIAiuR+bmbhsE= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-150-Md-QyQx7NciUQuDcIAS4Jw-1; Tue, 27 Apr 2021 12:13:21 -0400 X-MC-Unique: Md-QyQx7NciUQuDcIAS4Jw-1 Received: by mail-qk1-f199.google.com with SMTP id h15-20020a37de0f0000b029029a8ada2e18so23258753qkj.11 for ; Tue, 27 Apr 2021 09:13:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TTUZmZlysPQmfImZFfZ2Wgp7vh1kYkUqotHTouR6XKE=; b=YeSGbArnuvYvqmws3ZQSkekzRPBtCChSq2tpvnmuUmwPG5dnaA9bWS5vf1CdCpjq4T EdbkEcNY6Ob8PWAZ2pk/QgrYGiKBPJ2y+hxvSxRcYOJ1Sr3B+z0UdKYq8klxP5sV+0Ci wrH1V89dUFULs/tFQiD6z+aT9eQsI99c10J6Lq58/AeCvlwvyutMt04UjKRNgql8MlHo S1dQW40tCCrT3yAkkbxD1o1miEi+8UKJSpFp8KEQcjirUcRj+6b5zYrVBwNSSwrrqFh1 6p4GRiKfZLAtf0qEr4cshI03pxD1e5ym4leEZdLnZYDsGoWaijXkQhU5z3iYlz0Clkxs fIxg== X-Gm-Message-State: AOAM531cUr3VLv+lZ1691g/PxeUTRhjfA2mc1g4OZI5t4MrOIaXWPkJA 5FBcfoUDEKzRB5KgLyzvCjI6y5i3QuPnIP3pzaxVwcTOwXyAn4ScwHpD9WmaBE5O/1YwAduTcrs zJDS2ug4cPN9EECPLYEeTQl9PEzA3osnieLn6adHR8hQY6IFggOcDUOkzIH9a X-Received: by 2002:a37:a1c9:: with SMTP id k192mr23683197qke.169.1619540000260; Tue, 27 Apr 2021 09:13:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSEuXfr5EdC22VCGUNbURreOwpVuLnyHWGn2DHfr0rUs32K/lK1rKowH6nHjPWtW6P9DpUrg== X-Received: by 2002:a37:a1c9:: with SMTP id k192mr23683136qke.169.1619539999670; Tue, 27 Apr 2021 09:13:19 -0700 (PDT) Received: from xz-x1.redhat.com (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id v66sm3103621qkd.113.2021.04.27.09.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 09:13:19 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Nadav Amit , Miaohe Lin , Mike Rapoport , Andrea Arcangeli , Hugh Dickins , peterx@redhat.com, Jerome Glisse , Mike Kravetz , Jason Gunthorpe , Matthew Wilcox , Andrew Morton , Axel Rasmussen , "Kirill A . Shutemov" Subject: [PATCH v2 00/24] userfaultfd-wp: Support shmem and hugetlbfs Date: Tue, 27 Apr 2021 12:12:53 -0400 Message-Id: <20210427161317.50682-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 20380A00018A X-Stat-Signature: rfqdrwhwox4khiubx4qyk5w8x54zurqs Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf24; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619539993-789277 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: This is v2 of uffd-wp shmem & hugetlbfs support, which completes uffd-wp as a kernel full feature, as it only supports anonymous before this series. This patchset is based mostly on tag v5.12-rc8-mmots-2021-04-21-23-08, however I dropped some patches there otherwise I'll get some weird build errors. I think I should have kept most of the -mm-next materials, so hopefully when Andrew gets a new -mm tree, this series can be applied cleanly upon it. I'll respin otherwise. The whole series can also be found online [1]. The major change from v1->v2 is that I dropped the FAULT_FLAG_UFFD_WP flag in previous v1, as I think it's not needed and checking of the flag: vmf->flags & FAULT_FLAG_UFFD_WP Can be replaced safely by: pte_swp_uffd_wp_special(vmf->orig_pte) So we don't need to introduce yet another flag, and the code actually even shrinked a few more lines, which is good. Also per discussion with Mike, I dropped the READ emulation when a thread faulted on a uffd-wp special swap pte, as I'll keep the WRITE fault as is in this series. Nothing big really changed otherwise. Full changelog listed below. v2: - Add R-bs - Added patch "mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h" as noticed/suggested by Mike Kravets - Fix commit message of patch "hugetlb/userfaultfd: Only drop uffd-wp special pte if required" [MikeK] - Removing comments for fields in zap_details since they're either incorrect or not helping [Matthew] - Rephrase commit message in patch "hugetlb/userfaultfd: Take care of UFFDIO_COPY_MODE_WP" to explain better on why set dirty bit for UFFDIO_COPY in hugetlbfs [MikeK] - Don't emulate READ for uffd-wp-special on both shmem & hugetlbfs. - Drop FAULT_FLAG_UFFD_WP flag, by checking vmf->orig_pte directly against pte_swp_uffd_wp_special() - Fix race condition of page fault handling on uffd-wp-special [Mike] About Swap Special PTE ====================== In short, the so-called "swap special pte" in this patchset is a new type of pte that doesn't exist in the past, but it got used initially in this series in file-backed memories. It is used to persist information even if the ptes got dropped meanwhile when the page cache still existed. For example, when splitting a file-backed huge pmd, we could be simply dropping the pmd entry then wait until another fault coming. It's okay in the past since all information in the pte can be retained from the page cache when the next page fault triggers. However in this case, uffd-wp is per-pte information which cannot be kept in page cache, so that information needs to be maintained somehow still in the pgtable entry, even if the pgtable entry is going to be dropped. Here instead of replacing with a none entry, we used the "swap special pte". Then when the next page fault triggers, we can observe orig_pte to retain this information. I'm copy-pasting some commit message from the patch "mm/swap: Introduce the idea of special swap ptes", where it tried to explain this pte in another angle: We used to have special swap entries, like migration entries, hw-poison entries, device private entries, etc. Those "special swap entries" reside in the range that they need to be at least swap entries first, and their types are decided by swp_type(entry). This patch introduces another idea called "special swap ptes". It's very easy to get confused against "special swap entries", but a speical swap pte should never contain a swap entry at all. It means, it's illegal to call pte_to_swp_entry() upon a special swap pte. Make the uffd-wp special pte to be the first special swap pte. Before this patch, is_swap_pte()==true means one of the below: (a.1) The pte has a normal swap entry (non_swap_entry()==false). For example, when an anonymous page got swapped out. (a.2) The pte has a special swap entry (non_swap_entry()==true). For example, a migration entry, a hw-poison entry, etc. After this patch, is_swap_pte()==true means one of the below, where case (b) is added: (a) The pte contains a swap entry. (a.1) The pte has a normal swap entry (non_swap_entry()==false). For example, when an anonymous page got swapped out. (a.2) The pte has a special swap entry (non_swap_entry()==true). For example, a migration entry, a hw-poison entry, etc. (b) The pte does not contain a swap entry at all (so it cannot be passed into pte_to_swp_entry()). For example, uffd-wp special swap pte. Hugetlbfs needs similar thing because it's also file-backed. I directly reused the same special pte there, though the shmem/hugetlb change on supporting this new pte is different since they don't share code path a lot. Patch layout ============ Part (1): Shmem support, this is where the special swap pte is introduced. Some zap rework is needed within the process: shmem/userfaultfd: Take care of UFFDIO_COPY_MODE_WP mm: Clear vmf->pte after pte_unmap_same() returns mm/userfaultfd: Introduce special pte for unmapped file-backed mem mm/swap: Introduce the idea of special swap ptes shmem/userfaultfd: Handle uffd-wp special pte in page fault handler mm: Drop first_index/last_index in zap_details mm: Introduce zap_details.zap_flags mm: Introduce ZAP_FLAG_SKIP_SWAP mm: Pass zap_flags into unmap_mapping_pages() shmem/userfaultfd: Persist uffd-wp bit across zapping for file-backed shmem/userfaultfd: Allow wr-protect none pte for file-backed mem shmem/userfaultfd: Allows file-back mem to be uffd wr-protected on thps shmem/userfaultfd: Handle the left-overed special swap ptes shmem/userfaultfd: Pass over uffd-wp special swap pte when fork() Part (2): Hugetlb support, we need to disable huge pmd sharing for uffd-wp because not compatible just like uffd minor mode. The rest is the changes required to teach hugetlbfs understand the special swap pte too that introduced with the uffd-wp change: mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h hugetlb/userfaultfd: Hook page faults for uffd write protection hugetlb/userfaultfd: Take care of UFFDIO_COPY_MODE_WP hugetlb/userfaultfd: Handle UFFDIO_WRITEPROTECT hugetlb: Pass vma into huge_pte_alloc() hugetlb/userfaultfd: Forbid huge pmd sharing when uffd enabled mm/hugetlb: Introduce huge version of special swap pte helpers mm/hugetlb: Move flush_hugetlb_tlb_range() into hugetlb.h hugetlb/userfaultfd: Unshare all pmds for hugetlbfs when register wp hugetlb/userfaultfd: Handle uffd-wp special pte in hugetlb pf handler hugetlb/userfaultfd: Allow wr-protect none ptes hugetlb/userfaultfd: Only drop uffd-wp special pte if required Part (3): Enable both features in code and test userfaultfd: Enable write protection for shmem & hugetlbfs userfaultfd/selftests: Enable uffd-wp for shmem/hugetlbfs Tests ===== I've tested it using either userfaultfd kselftest program, but also with umapsort [2] which should be even stricter. Tested page swapping in/out during umapsort. If anyone would like to try umapsort, need to use an extremely hacked version of umap library [3], because by default umap only supports anonymous. So to test it we need to build [3] then [2]. Any comment would be greatly welcomed. Thanks, [1] https://github.com/xzpeter/linux/tree/uffd-wp-shmem-hugetlbfs [2] https://github.com/LLNL/umap-apps [3] https://github.com/xzpeter/umap/tree/peter-shmem-hugetlbfs Peter Xu (24): shmem/userfaultfd: Take care of UFFDIO_COPY_MODE_WP mm: Clear vmf->pte after pte_unmap_same() returns mm/userfaultfd: Introduce special pte for unmapped file-backed mem mm/swap: Introduce the idea of special swap ptes shmem/userfaultfd: Handle uffd-wp special pte in page fault handler mm: Drop first_index/last_index in zap_details mm: Introduce zap_details.zap_flags mm: Introduce ZAP_FLAG_SKIP_SWAP mm: Pass zap_flags into unmap_mapping_pages() shmem/userfaultfd: Persist uffd-wp bit across zapping for file-backed shmem/userfaultfd: Allow wr-protect none pte for file-backed mem shmem/userfaultfd: Allows file-back mem to be uffd wr-protected on thps shmem/userfaultfd: Handle the left-overed special swap ptes shmem/userfaultfd: Pass over uffd-wp special swap pte when fork() mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h hugetlb/userfaultfd: Hook page faults for uffd write protection hugetlb/userfaultfd: Take care of UFFDIO_COPY_MODE_WP hugetlb/userfaultfd: Handle UFFDIO_WRITEPROTECT mm/hugetlb: Introduce huge version of special swap pte helpers hugetlb/userfaultfd: Handle uffd-wp special pte in hugetlb pf handler hugetlb/userfaultfd: Allow wr-protect none ptes hugetlb/userfaultfd: Only drop uffd-wp special pte if required mm/userfaultfd: Enable write protection for shmem & hugetlbfs userfaultfd/selftests: Enable uffd-wp for shmem/hugetlbfs arch/arm64/kernel/mte.c | 2 +- arch/x86/include/asm/pgtable.h | 28 +++ fs/dax.c | 10 +- fs/hugetlbfs/inode.c | 15 +- fs/proc/task_mmu.c | 14 +- fs/userfaultfd.c | 39 ++-- include/asm-generic/hugetlb.h | 10 + include/asm-generic/pgtable_uffd.h | 3 + include/linux/hugetlb.h | 30 ++- include/linux/mm.h | 48 ++++- include/linux/mm_inline.h | 43 +++++ include/linux/shmem_fs.h | 5 +- include/linux/swapops.h | 39 +++- include/linux/userfaultfd_k.h | 47 +++++ include/uapi/linux/userfaultfd.h | 7 +- mm/gup.c | 2 +- mm/hmm.c | 2 +- mm/hugetlb.c | 160 +++++++++++++--- mm/khugepaged.c | 14 +- mm/madvise.c | 4 +- mm/memcontrol.c | 2 +- mm/memory.c | 226 +++++++++++++++++------ mm/migrate.c | 4 +- mm/mincore.c | 2 +- mm/mprotect.c | 63 ++++++- mm/mremap.c | 2 +- mm/page_vma_mapped.c | 6 +- mm/rmap.c | 8 + mm/shmem.c | 40 +++- mm/swapfile.c | 2 +- mm/truncate.c | 17 +- mm/userfaultfd.c | 37 ++-- tools/testing/selftests/vm/userfaultfd.c | 9 +- 33 files changed, 753 insertions(+), 187 deletions(-)