From patchwork Tue Apr 27 16:13:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12226897 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 9BFE1C433ED for ; Tue, 27 Apr 2021 16:14:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 375FD61151 for ; Tue, 27 Apr 2021 16:14:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 375FD61151 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 701236B0089; Tue, 27 Apr 2021 12:13:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AFE86B008A; Tue, 27 Apr 2021 12:13:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 505B06B008C; Tue, 27 Apr 2021 12:13:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 2999E6B0089 for ; Tue, 27 Apr 2021 12:13:52 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DC913181AF5E1 for ; Tue, 27 Apr 2021 16:13:51 +0000 (UTC) X-FDA: 78078643062.04.E0EA17A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 3A14040002EC for ; Tue, 27 Apr 2021 16:13:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619540030; 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=h4WOl7CIm3ueQ8RREsb6vElg27yEJH2OFi487xgNXDI=; b=h7i9vHHa5vS7splKub2P/H0n2FUL1ONvGay6uWcrZvRQ94Ft2DFQE4V78vMX2tlWYaRG1c 9YWVPXcsYaikSjxh168wg7qWuDX3IsDQ7xdBoyu54+9gUoShpO815omfoE44el93EGGaDs aeHvuS7E5epcwlWiIorTDXRuEmduXPY= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-VfZ7r2h3NJmo48uFbaly9A-1; Tue, 27 Apr 2021 12:13:49 -0400 X-MC-Unique: VfZ7r2h3NJmo48uFbaly9A-1 Received: by mail-qv1-f70.google.com with SMTP id l61-20020a0c84430000b02901a9a7e363edso17903940qva.16 for ; Tue, 27 Apr 2021 09:13:49 -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=h4WOl7CIm3ueQ8RREsb6vElg27yEJH2OFi487xgNXDI=; b=ih/PrHcOLFJYWBz6u1ieNkOB+5Lpyyml95iLb8BZOSE/0Zo7xkQAou9Ap3dzSGDoH/ QYwJP2MrGQGBUlr0zSs9Yff6Zo9dX26b45bsATZTHUAmp9tnzjmuwqB0G0/qjT5IHHjn amhja+9quvEKMnBqrCfh97I2aJave6kTcj5BpIqzTbsFYufk1D8m3NzMAsxRAJGRkzrZ L6pCpItA8E9i1agxRUSsbKnjossTqaD4AE/yx+5S3AfIyYrDg1s6HZn078/usFj7cdnj vn086XP5sLSP8HGiSaweOp578rEyAp/x+c34mqNpFWuKhA0QBtEUarSgq7s8dDDwQJ3C tNCQ== X-Gm-Message-State: AOAM533b2l/1GCMeH0StwRm2buwIDoTdhhXDEdbuSgye7dzGLG8ZsGtv PXs/diaMhNKOiQN9MNf4EYc6Bti7hLmqbsjno0TKQROKl8+tzGDQv+XngK7yidzAHpiiZg8IpmQ ann6UG6sjOZQ24nH2H9ft0sLzi8SYEFnsq403wlWMOv81x2AsgHutWZqTAhEh X-Received: by 2002:a05:622a:100e:: with SMTP id d14mr22854324qte.143.1619540028325; Tue, 27 Apr 2021 09:13:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJmDOOgfUngR5oU8MYAl3vjcwLrudb8BiqqgyPc5TSA0H5CdeRhdgWrf0J20xAaMh3sJ7dfQ== X-Received: by 2002:a05:622a:100e:: with SMTP id d14mr22854291qte.143.1619540028034; Tue, 27 Apr 2021 09:13:48 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 09:13:47 -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 16/24] hugetlb/userfaultfd: Hook page faults for uffd write protection Date: Tue, 27 Apr 2021 12:13:09 -0400 Message-Id: <20210427161317.50682-17-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210427161317.50682-1-peterx@redhat.com> References: <20210427161317.50682-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-Rspamd-Queue-Id: 3A14040002EC X-Stat-Signature: ygd8k6sc6ks5fsuegccbnbs3z91kuxyy X-Rspamd-Server: rspam02 Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf10; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619540021-881733 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: Hook up hugetlbfs_fault() with the capability to handle userfaultfd-wp faults. We do this slightly earlier than hugetlb_cow() so that we can avoid taking some extra locks that we definitely don't need. Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu --- mm/hugetlb.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 629aa4c2259c8..8e234ee9a15e2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4802,6 +4802,25 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (unlikely(!pte_same(entry, huge_ptep_get(ptep)))) goto out_ptl; + /* Handle userfault-wp first, before trying to lock more pages */ + if (userfaultfd_pte_wp(vma, huge_ptep_get(ptep)) && + (flags & FAULT_FLAG_WRITE) && !huge_pte_write(entry)) { + struct vm_fault vmf = { + .vma = vma, + .address = haddr, + .flags = flags, + }; + + spin_unlock(ptl); + if (pagecache_page) { + unlock_page(pagecache_page); + put_page(pagecache_page); + } + mutex_unlock(&hugetlb_fault_mutex_table[hash]); + i_mmap_unlock_read(mapping); + return handle_userfault(&vmf, VM_UFFD_WP); + } + /* * hugetlb_cow() requires page locks of pte_page(entry) and * pagecache_page, so here we need take the former one