From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 34B12C11D10 for ; Thu, 20 Feb 2020 16:31:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E595D206F4 for ; Thu, 20 Feb 2020 16:31:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XHD2qfHs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E595D206F4 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 2BB256B000C; Thu, 20 Feb 2020 11:31:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F6536B000D; Thu, 20 Feb 2020 11:31:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEA016B000E; Thu, 20 Feb 2020 11:31:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0152.hostedemail.com [216.40.44.152]) by kanga.kvack.org (Postfix) with ESMTP id D884D6B000C for ; Thu, 20 Feb 2020 11:31:25 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 86B4C180AD82F for ; Thu, 20 Feb 2020 16:31:25 +0000 (UTC) X-FDA: 76511045730.25.shade83_297cd3242d555 X-HE-Tag: shade83_297cd3242d555 X-Filterd-Recvd-Size: 6128 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 16:31:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582216284; 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=fvNsZNnSZK3TqdzkI+Yk7njnXmWltDYkHjjqKSYiaTg=; b=XHD2qfHssMedNduJ2uW8zUWfFGeH4bEkLyTiabNPYgy9uROr4BZ1nmEpjIzNbajl5t0js+ mZPsZcGhAwYGG2fsS63KE4V2UA6iAYt5CUyMiQq4Wv8r2m2rpQweiXUWu+X7BzcEz0JQlH eSTLK3Km16ttmEfthfNZJQovFIJQxyk= 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-326-pZhzQCdCNWO4xk6ctrQHyQ-1; Thu, 20 Feb 2020 11:31:22 -0500 Received: by mail-qv1-f70.google.com with SMTP id z9so2727112qvo.10 for ; Thu, 20 Feb 2020 08:31:22 -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=T0Q4v7uJDYavZUf8Hlp8Jd5LPvHFjkbI0A9qHDGmMac=; b=pX5yMCu0i7obY/vp+722g+Qi7+svTu5I6MSXaru0kbdf2sMgmW8DTR76Dg3vIFaS6x JVLD5bOvbmQU/Vxc50qHzMBEPwgi59JAgv8gqcXjg8sGFsjfWUoPnKSDjZGxJnosljxW gcPpq+kA+gru5DLlE036L0ksi8mZzy7AtppSKyjbY8rmhMgdxrfx466CPN+gCujIF/Ly Yi0oySdEg0nXtZ1e8oAijCt1pB1keEec2KE2a960KKWDQESfu3CpW2iQMcwmOEhtNia9 EQfYNKc872qysEZZKQq1d8jcdP5mHgabnH4OmJol+H7Puj4tm3MyBbfhJSsHQsK0/QhA TEYQ== X-Gm-Message-State: APjAAAV0dgQSzWvAinmu64QMH2yZmBKzvu+6fZlH/qXzFBJtuoyPWvoK XCSL5sNwoXNK8upY9cLRJUcxUnMcuI+74LXiJU4Q3DXa7HE//hOCiiBJSMGcHywKy2nAL3/OyOe 37FQc6Y4YpN0= X-Received: by 2002:a05:620a:14ac:: with SMTP id x12mr29253245qkj.83.1582216282172; Thu, 20 Feb 2020 08:31:22 -0800 (PST) X-Google-Smtp-Source: APXvYqyzx3IkiiiVgVAaTh7a4kw6Mc673lSAsZGzglgZZcPuUu32OVy7fqunSXnxNaPdoptMpBsIIA== X-Received: by 2002:a05:620a:14ac:: with SMTP id x12mr29253209qkj.83.1582216281942; Thu, 20 Feb 2020 08:31:21 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id l19sm42366qkl.3.2020.02.20.08.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 08:31:21 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Brian Geffon , Pavel Emelyanov , Mike Kravetz , David Hildenbrand , peterx@redhat.com, Martin Cracauer , Andrea Arcangeli , Mel Gorman , Bobby Powers , Mike Rapoport , "Kirill A . Shutemov" , Maya Gokhale , Johannes Weiner , Marty McFadden , Denis Plotnikov , Hugh Dickins , "Dr . David Alan Gilbert" , Jerome Glisse Subject: [PATCH v6 04/19] userfaultfd: wp: userfaultfd_pte/huge_pmd_wp() helpers Date: Thu, 20 Feb 2020 11:30:57 -0500 Message-Id: <20200220163112.11409-5-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220163112.11409-1-peterx@redhat.com> References: <20200220163112.11409-1-peterx@redhat.com> MIME-Version: 1.0 X-MC-Unique: pZhzQCdCNWO4xk6ctrQHyQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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: From: Andrea Arcangeli Implement helpers methods to invoke userfaultfd wp faults more selectively: not only when a wp fault triggers on a vma with vma->vm_flags VM_UFFD_WP set, but only if the _PAGE_UFFD_WP bit is set in the pagetable too. Signed-off-by: Andrea Arcangeli Reviewed-by: Jerome Glisse Reviewed-by: Mike Rapoport Signed-off-by: Peter Xu --- include/linux/userfaultfd_k.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index 5dc247af0f2e..7b91b76aac58 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -14,6 +14,8 @@ #include /* linux/include/uapi/linux/userfaultfd.h *= / =20 #include +#include +#include =20 /* * CAREFUL: Check include/uapi/asm-generic/fcntl.h when defining @@ -57,6 +59,18 @@ static inline bool userfaultfd_wp(struct vm_area_struct = *vma) =09return vma->vm_flags & VM_UFFD_WP; } =20 +static inline bool userfaultfd_pte_wp(struct vm_area_struct *vma, +=09=09=09=09 pte_t pte) +{ +=09return userfaultfd_wp(vma) && pte_uffd_wp(pte); +} + +static inline bool userfaultfd_huge_pmd_wp(struct vm_area_struct *vma, +=09=09=09=09=09 pmd_t pmd) +{ +=09return userfaultfd_wp(vma) && pmd_uffd_wp(pmd); +} + static inline bool userfaultfd_armed(struct vm_area_struct *vma) { =09return vma->vm_flags & (VM_UFFD_MISSING | VM_UFFD_WP); @@ -106,6 +120,19 @@ static inline bool userfaultfd_wp(struct vm_area_struc= t *vma) =09return false; } =20 +static inline bool userfaultfd_pte_wp(struct vm_area_struct *vma, +=09=09=09=09 pte_t pte) +{ +=09return false; +} + +static inline bool userfaultfd_huge_pmd_wp(struct vm_area_struct *vma, +=09=09=09=09=09 pmd_t pmd) +{ +=09return false; +} + + static inline bool userfaultfd_armed(struct vm_area_struct *vma) { =09return false; --=20 2.24.1