From patchwork Thu Jul 15 20:16:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12380969 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 BDB62C636C9 for ; Thu, 15 Jul 2021 20:16:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 70533613CF for ; Thu, 15 Jul 2021 20:16:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70533613CF 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 D5E458D0100; Thu, 15 Jul 2021 16:16:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D34FF8D00FC; Thu, 15 Jul 2021 16:16:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAF0F8D0100; Thu, 15 Jul 2021 16:16:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0166.hostedemail.com [216.40.44.166]) by kanga.kvack.org (Postfix) with ESMTP id 997708D00FC for ; Thu, 15 Jul 2021 16:16:50 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 75EFB824805A for ; Thu, 15 Jul 2021 20:16:49 +0000 (UTC) X-FDA: 78365930538.18.74AF5EF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 1B7F1500FC35 for ; Thu, 15 Jul 2021 20:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626380208; 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=j48lYufpqnekDYwYR8maWxTIFb6q7AlY4/eyZPbLcoo=; b=R78sXo/NNao2WRCsJ3TcmiDkMTa1+UbDiy8mmdGbMGi0dSmlUcIPYbsDgfLEb4v9mn40d7 jUXIgE4Lz4CUccJ4UIfbjySMoMB8kQXstpVJDJAI4cztbyXcvCDpJX+TrdbaZMzIiyXh2x SbIXn6IPTnzbFnGxfRUw5dCpWkYjrhE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-emycma_YOu6j-0kheRXAqg-1; Thu, 15 Jul 2021 16:16:47 -0400 X-MC-Unique: emycma_YOu6j-0kheRXAqg-1 Received: by mail-qk1-f197.google.com with SMTP id f203-20020a379cd40000b02903b861bec838so4686501qke.7 for ; Thu, 15 Jul 2021 13:16:47 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=j48lYufpqnekDYwYR8maWxTIFb6q7AlY4/eyZPbLcoo=; b=k1brOGRYFJFB9RGH0Rqh8vURGUcQ+6Zo//mYS6zsIER3OwhqIdVMa3UYyXPfbsh1nF ulylEqWt9kVy9kFvccRsYOCfO6ZmiLJJFtmPNDvzje3oZ9kmOxIWXxpOeVdIVpRSI5If /8pp3IwfTB+KBZ5IfsosU0U4KU7GAJN6TcEUmmcv/hgzgG419VqzRvnijMoCRmovfut2 WALaqNHHo9v/Ym+0Bo4CshRhz/obRh8oUrnzA6kv40u32DGY0/jya2cJKXh2J5OL0pwB syfmHaG1NyHloXjNyq5Y9C7/husxr8H2mt+PdqxwmBDO0b+CAchnKlWFCRaZUxJdqbmb pi7A== X-Gm-Message-State: AOAM533T/XSUv8DLWZDCwIkSpjKMKoPnuWNMLvrbkoiLYFqH3h9VaJcQ 4TlQpV7S8dgQjhH+SS8NN0Ai+wAlSvfCjD6LEanE1OkPxfL34FRYrH8AP/AP5G4OPyroV5tns33 Da2R5Zpw7CHk= X-Received: by 2002:a05:622a:14:: with SMTP id x20mr1157160qtw.150.1626380207060; Thu, 15 Jul 2021 13:16:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUeSgIltwtBR9YaKWY8pjrogeHtEb79B0itIbQGnhHcPRL3nBEDK9p6jBUBX/+9Gp665PuVQ== X-Received: by 2002:a05:622a:14:: with SMTP id x20mr1157126qtw.150.1626380206833; Thu, 15 Jul 2021 13:16:46 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-65-184-144-111-238.dsl.bell.ca. [184.144.111.238]) by smtp.gmail.com with ESMTPSA id b6sm2512324qtg.1.2021.07.15.13.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 13:16:46 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Axel Rasmussen , Nadav Amit , Jerome Glisse , "Kirill A . Shutemov" , Jason Gunthorpe , Alistair Popple , Andrew Morton , David Hildenbrand , peterx@redhat.com, Andrea Arcangeli , Matthew Wilcox , Mike Kravetz , Tiberiu Georgescu , Hugh Dickins , Miaohe Lin , Mike Rapoport Subject: [PATCH v5 22/26] hugetlb/userfaultfd: Allow wr-protect none ptes Date: Thu, 15 Jul 2021 16:16:43 -0400 Message-Id: <20210715201643.212033-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715201422.211004-1-peterx@redhat.com> References: <20210715201422.211004-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1B7F1500FC35 X-Stat-Signature: fa8adgkyc5etyj4d9gphp7swngc9ngg4 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="R78sXo/N"; spf=none (imf05.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1626380208-349564 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: Teach hugetlbfs code to wr-protect none ptes just in case the page cache existed for that pte. Meanwhile we also need to be able to recognize a uffd-wp marker pte and remove it for uffd_wp_resolve. Since at it, introduce a variable "psize" to replace all references to the huge page size fetcher. Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu --- mm/hugetlb.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5941b5cd7ecc..875adf3b000c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5561,7 +5561,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, pte_t *ptep; pte_t pte; struct hstate *h = hstate_vma(vma); - unsigned long pages = 0; + unsigned long pages = 0, psize = huge_page_size(h); bool shared_pmd = false; struct mmu_notifier_range range; bool uffd_wp = cp_flags & MM_CP_UFFD_WP; @@ -5581,13 +5581,19 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, mmu_notifier_invalidate_range_start(&range); i_mmap_lock_write(vma->vm_file->f_mapping); - for (; address < end; address += huge_page_size(h)) { + for (; address < end; address += psize) { spinlock_t *ptl; - ptep = huge_pte_offset(mm, address, huge_page_size(h)); + ptep = huge_pte_offset(mm, address, psize); if (!ptep) continue; ptl = huge_pte_lock(h, mm, ptep); if (huge_pmd_unshare(mm, vma, &address, ptep)) { + /* + * When uffd-wp is enabled on the vma, unshare + * shouldn't happen at all. Warn about it if it + * happened due to some reason. + */ + WARN_ON_ONCE(uffd_wp || uffd_wp_resolve); pages++; spin_unlock(ptl); shared_pmd = true; @@ -5612,12 +5618,21 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, else if (uffd_wp_resolve) newpte = pte_swp_clear_uffd_wp(newpte); set_huge_swap_pte_at(mm, address, ptep, - newpte, huge_page_size(h)); + newpte, psize); pages++; } spin_unlock(ptl); continue; } + if (unlikely(is_swap_special_pte(pte))) { + WARN_ON_ONCE(!pte_swp_uffd_wp_special(pte)); + /* + * This is changing a non-present pte into a none pte, + * no need for huge_ptep_modify_prot_start/commit(). + */ + if (uffd_wp_resolve) + huge_pte_clear(mm, address, ptep, psize); + } if (!huge_pte_none(pte)) { pte_t old_pte; unsigned int shift = huge_page_shift(hstate_vma(vma)); @@ -5631,6 +5646,12 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, pte = huge_pte_clear_uffd_wp(pte); huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte); pages++; + } else { + /* None pte */ + if (unlikely(uffd_wp)) + /* Safe to modify directly (none->non-present). */ + set_huge_pte_at(mm, address, ptep, + pte_swp_mkuffd_wp_special(vma)); } spin_unlock(ptl); }