From patchwork Thu Jan 28 22:48:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Rasmussen X-Patchwork-Id: 12054683 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,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 6DB60C433E0 for ; Thu, 28 Jan 2021 22:48:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0A75864D9E for ; Thu, 28 Jan 2021 22:48:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A75864D9E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8FA1A6B007E; Thu, 28 Jan 2021 17:48:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AD196B0080; Thu, 28 Jan 2021 17:48:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79BE26B0081; Thu, 28 Jan 2021 17:48:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0036.hostedemail.com [216.40.44.36]) by kanga.kvack.org (Postfix) with ESMTP id 57AC06B007E for ; Thu, 28 Jan 2021 17:48:39 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 23453181AC9BF for ; Thu, 28 Jan 2021 22:48:39 +0000 (UTC) X-FDA: 77756674758.04.skin62_2603bdd275a3 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id F13B38013258 for ; Thu, 28 Jan 2021 22:48:38 +0000 (UTC) X-HE-Tag: skin62_2603bdd275a3 X-Filterd-Recvd-Size: 5883 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 22:48:38 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id h16so4606206qta.12 for ; Thu, 28 Jan 2021 14:48:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ZyNXN+vY7+byGEzXckl2cjsPvL1+MihL3e0jf1aRuY0=; b=hInQaWuhlmhVzsJQOOP66wxpBpJkZz0jp3JdPNaTamPFbqY2Iw7tYezAFSsj/X/h0l T//j35IRMXVjHvbnrOMRm67QMdJNZC4EVEFLwXjxKbG2ItZIlriMw4yPfN8SL0+axm10 nB3lG6H5halTcOohKo2Bunr1Mhiv0S6uvccIRFE2yavExj+oydg1TXJPsp2+5JIPJEUI iLlqvTWsvE5vTvctddRV6sDEkokg+J+axchFI7fLCP3v0fRC7iBag6zrKuQHOaIQoC6f C8HmrO04qOrB5OSzTgypkr0jqRAv7jVcvbkbd+9FxJRfviJoAvrCOhjbuY7/dlG/jqqn HHCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ZyNXN+vY7+byGEzXckl2cjsPvL1+MihL3e0jf1aRuY0=; b=VNPFRUrDlnKWbpyJdq7C3OfvQf6PMINRrwqtmxtcaPr1x3ep3TsrDU5HmMH/XTsMcR L21LGuNdofDi2LDQhWVxK933D6QB6RuMf8vE7nwteR6A1SBDbwDBZ9+DGqYehCRnSE3q gKrdShNGPTGYRno1yYgctprlpDJbyB1/C+iuFuKHBq7JghDKAmmNPRECr3KsjGsMjFNT 4Cv4iY0YVGxtRqR4hwrShs7PE8KVVXBk5bpGg3XQhbIDTQoBr5ITz4IAYS36w+3QKffs gvr+BbWgEDvqRP+NifDZ/j/gd4/io5BMi/ggtoK30xUXLtIX+LBwSBtgoNv3rXRRzY7m 5WaA== X-Gm-Message-State: AOAM530EuqZsCLCmVd//8sw5ZRHU5bUtryhFhe4X3u1wq+y/A5IvbVvy TIlG1cgJ5u4X4Yl0DV162PUBhQCklfuNKAUCKEJx X-Google-Smtp-Source: ABdhPJyHrrCangWtMdVH/noVU09GiXPhxfCnDmS90lrLcv56JYZpgSU6zPBSDzBuR3Gym8HoUHwHDj38s9I65tdP/sDJ X-Received: from ajr0.svl.corp.google.com ([2620:15c:2cd:203:f693:9fff:feef:c8f8]) (user=axelrasmussen job=sendgmr) by 2002:ad4:544b:: with SMTP id h11mr1850894qvt.24.1611874117664; Thu, 28 Jan 2021 14:48:37 -0800 (PST) Date: Thu, 28 Jan 2021 14:48:16 -0800 In-Reply-To: <20210128224819.2651899-1-axelrasmussen@google.com> Message-Id: <20210128224819.2651899-7-axelrasmussen@google.com> Mime-Version: 1.0 References: <20210128224819.2651899-1-axelrasmussen@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v3 6/9] userfaultfd: disable huge PMD sharing for MINOR registered VMAs From: Axel Rasmussen To: Alexander Viro , Alexey Dobriyan , Andrea Arcangeli , Andrew Morton , Anshuman Khandual , Catalin Marinas , Chinwen Chang , Huang Ying , Ingo Molnar , Jann Horn , Jerome Glisse , Lokesh Gidra , "Matthew Wilcox (Oracle)" , Michael Ellerman , " =?utf-8?q?Michal_Koutn=C3=BD?= " , Michel Lespinasse , Mike Kravetz , Mike Rapoport , Nicholas Piggin , Peter Xu , Shaohua Li , Shawn Anastasio , Steven Rostedt , Steven Price , Vlastimil Babka Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Adam Ruprecht , Axel Rasmussen , Cannon Matthews , "Dr . David Alan Gilbert" , David Rientjes , Oliver Upton 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: As the comment says: for the MINOR fault use case, although the page might be present and populated in the other (non-UFFD-registered) half of the shared mapping, it may be out of date, and we explicitly want userspace to get a minor fault so it can check and potentially update the page's contents. Huge PMD sharing would prevent these faults from occurring for suitably aligned areas, so disable it upon UFFD registration. Reviewed-by: Peter Xu Signed-off-by: Axel Rasmussen --- include/linux/userfaultfd_k.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 0390e5ac63b3..fb9abaeb4194 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -56,12 +56,18 @@ static inline bool is_mergeable_vm_userfaultfd_ctx(struct vm_area_struct *vma, } /* - * Never enable huge pmd sharing on uffd-wp registered vmas, because uffd-wp - * protect information is per pgtable entry. + * Never enable huge pmd sharing on some uffd registered vmas: + * + * - VM_UFFD_WP VMAs, because write protect information is per pgtable entry. + * + * - VM_UFFD_MINOR VMAs, because we explicitly want minor faults to occur even + * when the other half of a shared mapping is populated (even though the page + * is there, in our use case it may be out of date, so userspace needs to + * check for this and possibly update it). */ static inline bool uffd_disable_huge_pmd_share(struct vm_area_struct *vma) { - return vma->vm_flags & VM_UFFD_WP; + return vma->vm_flags & (VM_UFFD_WP | VM_UFFD_MINOR); } static inline bool userfaultfd_missing(struct vm_area_struct *vma)