From patchwork Fri Jan 15 17:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12023359 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 AF08BC433E0 for ; Fri, 15 Jan 2021 17:10:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 66CD62333E for ; Fri, 15 Jan 2021 17:10:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66CD62333E 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 BECF88D01B3; Fri, 15 Jan 2021 12:10:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2C768D01B2; Fri, 15 Jan 2021 12:10:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9766A8D01B3; Fri, 15 Jan 2021 12:10:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0228.hostedemail.com [216.40.44.228]) by kanga.kvack.org (Postfix) with ESMTP id 8080A8D01B2 for ; Fri, 15 Jan 2021 12:10:05 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 46367181D6067 for ; Fri, 15 Jan 2021 17:10:05 +0000 (UTC) X-FDA: 77708647170.23.songs80_060398027531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 1C83DC711C for ; Fri, 15 Jan 2021 17:10:05 +0000 (UTC) X-HE-Tag: songs80_060398027531 X-Filterd-Recvd-Size: 7093 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610730604; 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=7v8QDeNoG8OU/p7s9fC8RzrSPTHJdCM/pVMqrxY8yjM=; b=b8XsYxSdE+yPX879bXMNQLV7VZFL7hd17+ocHuTVmkrjGNRlCtRrIfudujpkbzBmbc/pr2 hsmppwdxvQf82t9KLz0nClsaogT12O6xDFU7MbMA9d6nXfKSlusJ0WtAdz8MWGefiaZmz/ 0T/UctK5eHKmalOXnhVXE0cCHU47WzY= 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-470-gtLgVmfONYSNm8QkeGj7sA-1; Fri, 15 Jan 2021 12:09:59 -0500 X-MC-Unique: gtLgVmfONYSNm8QkeGj7sA-1 Received: by mail-qk1-f197.google.com with SMTP id g5so8595495qke.22 for ; Fri, 15 Jan 2021 09:09:59 -0800 (PST) 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=7v8QDeNoG8OU/p7s9fC8RzrSPTHJdCM/pVMqrxY8yjM=; b=aJ6h1U2lMaLzLoJbyamcj4Yw9C98mwE0X22UGqsAUqVq70R/q4/9KK2ZmFAxlO2PNT jZbPEuiXj+gx/CFPSsdGtWGhv8fhbX4ArhVVeP4Hzh1ELhu5txpTMwWAdln6Z6gYWGNT r6nE7xQHVaXCcQjklBIQcqJMWEaxLaKI332op47AqjmAL/VMNK+Emw8PcYuburbolipX B6QsFfmAahx0hUK/sC8AhIiq9yejFKEdJ8TneeA8b0cVBVks1y2NEQoHLjs1Ql17nyEN Xs0LaERhJ2of0A2uP6vyOacg5rxPcXXEyjj/UU+yY/vfvOgySC6f5MEbfMTmcJnK9eI5 p/vw== X-Gm-Message-State: AOAM530W0N2E1JHurJphJARf1CzPMbd4CWgDezRtedJpHJpOxJTvJ6YW y+UgN5UMQExzucvARPecVqtcTkFpmoi+Cb6e2lSuyndNSO57L6Knn3MwXB6CZVyuWT9qL6QXhtP SCT8EHmTBHIk= X-Received: by 2002:aed:3964:: with SMTP id l91mr1920024qte.32.1610730598760; Fri, 15 Jan 2021 09:09:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBMs/Rjdvzmsm9NCdgZQkWUAdVthi7FvD5c8VyUB4WKoACNSo+uWAgz6uRc12xEta7mwRbgA== X-Received: by 2002:aed:3964:: with SMTP id l91mr1919997qte.32.1610730598498; Fri, 15 Jan 2021 09:09:58 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id d123sm5187840qke.95.2021.01.15.09.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 09:09:57 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , Mike Kravetz , peterx@redhat.com, Jerome Glisse , "Kirill A . Shutemov" , Hugh Dickins , Axel Rasmussen , Matthew Wilcox , Andrew Morton , Andrea Arcangeli , Nadav Amit Subject: [PATCH RFC 25/30] hugetlb/userfaultfd: Unshare all pmds for hugetlbfs when register wp Date: Fri, 15 Jan 2021 12:09:02 -0500 Message-Id: <20210115170907.24498-26-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115170907.24498-1-peterx@redhat.com> References: <20210115170907.24498-1-peterx@redhat.com> 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-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: Huge pmd sharing for hugetlbfs is racy with userfaultfd-wp because userfaultfd-wp is always based on pgtable entries, so they cannot be shared. Walk the hugetlb range and unshare all such mappings if there is, right before UFFDIO_REGISTER will succeed and return to userspace. This will pair with want_pmd_share() in hugetlb code so that huge pmd sharing is completely disabled for userfaultfd-wp registered range. Signed-off-by: Peter Xu --- fs/userfaultfd.c | 43 ++++++++++++++++++++++++++++++++++++ include/linux/mmu_notifier.h | 1 + 2 files changed, 44 insertions(+) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 3537a43b69c9..3190dff39d6c 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -1198,6 +1199,45 @@ static ssize_t userfaultfd_read(struct file *file, char __user *buf, } } +/* + * This function will unconditionally remove all the shared pmd pgtable entries + * within the specific vma for a hugetlbfs memory range. + */ +static void hugetlb_unshare_all_pmds(struct vm_area_struct *vma) +{ + struct hstate *h = hstate_vma(vma); + unsigned long sz = huge_page_size(h); + struct mm_struct *mm = vma->vm_mm; + struct mmu_notifier_range range; + unsigned long address; + spinlock_t *ptl; + pte_t *ptep; + + /* + * No need to call adjust_range_if_pmd_sharing_possible(), because + * we're going to operate on the whole vma + */ + mmu_notifier_range_init(&range, MMU_NOTIFY_HUGETLB_UNSHARE, + 0, vma, mm, vma->vm_start, vma->vm_end); + mmu_notifier_invalidate_range_start(&range); + i_mmap_lock_write(vma->vm_file->f_mapping); + for (address = vma->vm_start; address < vma->vm_end; address += sz) { + ptep = huge_pte_offset(mm, address, sz); + if (!ptep) + continue; + ptl = huge_pte_lock(h, mm, ptep); + huge_pmd_unshare(mm, vma, &address, ptep); + spin_unlock(ptl); + } + flush_hugetlb_tlb_range(vma, vma->vm_start, vma->vm_end); + i_mmap_unlock_write(vma->vm_file->f_mapping); + /* + * No need to call mmu_notifier_invalidate_range(), see + * Documentation/vm/mmu_notifier.rst. + */ + mmu_notifier_invalidate_range_end(&range); +} + static void __wake_userfault(struct userfaultfd_ctx *ctx, struct userfaultfd_wake_range *range) { @@ -1456,6 +1496,9 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, vma->vm_flags = new_flags; vma->vm_userfaultfd_ctx.ctx = ctx; + if (is_vm_hugetlb_page(vma) && uffd_disable_huge_pmd_share(vma)) + hugetlb_unshare_all_pmds(vma); + skip: prev = vma; start = vma->vm_end; diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index b8200782dede..ff50c8528113 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -51,6 +51,7 @@ enum mmu_notifier_event { MMU_NOTIFY_SOFT_DIRTY, MMU_NOTIFY_RELEASE, MMU_NOTIFY_MIGRATE, + MMU_NOTIFY_HUGETLB_UNSHARE, }; #define MMU_NOTIFIER_RANGE_BLOCKABLE (1 << 0)