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=-16.5 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,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 E3506C47092 for ; Thu, 27 May 2021 20:23:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 93993613CC for ; Thu, 27 May 2021 20:23:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93993613CC 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 34DEF6B0075; Thu, 27 May 2021 16:23:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 323AE6B008A; Thu, 27 May 2021 16:23:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19D4D6B008C; Thu, 27 May 2021 16:23:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id DF76C6B0075 for ; Thu, 27 May 2021 16:23:47 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 88F23BBEB for ; Thu, 27 May 2021 20:23:47 +0000 (UTC) X-FDA: 78188136894.31.539D49C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 3243AA0003B1 for ; Thu, 27 May 2021 20:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622147026; 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=d+qr2gkGCf8UGCRyFBArhsHy6tP5+E2Jys4dwvbHGGg=; b=TBPKnwAuLTflpfUgu8K6NcXMn0d+Z7soPJnA21G8nOgEGcObbIIYwKArKhJV+Vu8S+Zezq /TIHjWql10wBe0+1DhNmycpWlsjMjcDVaKaY37OkARZ6XduDNywiKAsAZKBlQan4TBIteI 0/TnHWcu80ZDNb4/NsUKqWy1Q3AAob8= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-_cJHQhcGMZuJpMIeJESsBA-1; Thu, 27 May 2021 16:23:45 -0400 X-MC-Unique: _cJHQhcGMZuJpMIeJESsBA-1 Received: by mail-qt1-f199.google.com with SMTP id g21-20020ac870d50000b0290230013e97e6so842082qtp.21 for ; Thu, 27 May 2021 13:23:45 -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=d+qr2gkGCf8UGCRyFBArhsHy6tP5+E2Jys4dwvbHGGg=; b=n6DCAhxFApKoaBm4Kh2SiveRr56vPCyQDvQGKKTQfr7bxC6t4esgxcpi2kFhmIjIHm z+FiX5D5eOFK2AmaGa+9AJd6DdNnEfyLb/qPBilKVLAktcHSiXGC77QbPmcZl4Lb71gs F3S0wmkLcjmX+fmRsr3hBgNcN7gbBlIhE8FZPs8Uex5fInPN0ItEgBP6n+aYgsO+GCJw MVmZwzTH8yGK9YopxBTYEQE/82GAuuKSzLjnlS5+vBR4hmC3eJ1kfwlWJeJNBMjza8ga 2Hjrof0RgZ9oV+noySg0Q3CK1GMKVpGZIyz11LhBRaWJUwdalQ+B5rctQrnOd5tH80NV Ct7w== X-Gm-Message-State: AOAM530vIO2W7jcJ6aJPbp5pvJhDGxKQh+MxBrBpWYUyNxEEhAU3emhg ggE98zImIiRVp7BA09f1HplgZkJsN64S2mlSHW65MNqvD14iRnBPv8LkD3CjzUHGeAhzRoh/xy5 4G7y9TiYHMDg= X-Received: by 2002:a05:620a:751:: with SMTP id i17mr322481qki.87.1622147024828; Thu, 27 May 2021 13:23:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZVwpfNFKbYL8so0SPHDLq2pNae/ct+JgV8mbINE0J29tIc1QVdSRi+fw1P99ktJh8UsVEWg== X-Received: by 2002:a05:620a:751:: with SMTP id i17mr322450qki.87.1622147024615; Thu, 27 May 2021 13:23:44 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id 2sm2237729qtr.64.2021.05.27.13.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:23:44 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , peterx@redhat.com, Andrew Morton , Mike Kravetz , Jerome Glisse , Miaohe Lin , Nadav Amit , Hugh Dickins , Matthew Wilcox , Jason Gunthorpe , "Kirill A . Shutemov" , Andrea Arcangeli , Axel Rasmussen Subject: [PATCH v3 25/27] mm/pagemap: Recognize uffd-wp bit for shmem/hugetlbfs Date: Thu, 27 May 2021 16:23:40 -0400 Message-Id: <20210527202340.32306-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TBPKnwAu; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf23.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Stat-Signature: 5hcz455yaczm4stqoad1ajfobkqjw1mh X-Rspamd-Queue-Id: 3243AA0003B1 X-Rspamd-Server: rspam02 X-HE-Tag: 1622147020-364503 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: This requires the pagemap code to be able to recognize the newly introduc= ed swap special pte for uffd-wp, meanwhile the general case for hugetlb that= we recently start to support. It should make pagemap uffd-wp support comple= te. Signed-off-by: Peter Xu --- fs/proc/task_mmu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 9c5af77b5290..988e29fa1f00 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1389,6 +1389,8 @@ static pagemap_entry_t pte_to_pagemap_entry(struct = pagemapread *pm, flags |=3D PM_SWAP; if (is_pfn_swap_entry(entry)) page =3D pfn_swap_entry_to_page(entry); + } else if (pte_swp_uffd_wp_special(pte)) { + flags |=3D PM_UFFD_WP; } =20 if (page && !PageAnon(page)) @@ -1522,10 +1524,15 @@ static int pagemap_hugetlb_range(pte_t *ptep, uns= igned long hmask, if (page_mapcount(page) =3D=3D 1) flags |=3D PM_MMAP_EXCLUSIVE; =20 + if (huge_pte_uffd_wp(pte)) + flags |=3D PM_UFFD_WP; + flags |=3D PM_PRESENT; if (pm->show_pfn) frame =3D pte_pfn(pte) + ((addr & ~hmask) >> PAGE_SHIFT); + } else if (pte_swp_uffd_wp_special(pte)) { + flags |=3D PM_UFFD_WP; } =20 for (; addr !=3D end; addr +=3D PAGE_SIZE) { --=20 2.31.1