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.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 80B61C07E9C for ; Wed, 14 Jul 2021 16:08:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2048E60FF2 for ; Wed, 14 Jul 2021 16:08:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2048E60FF2 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 4B82A6B0078; Wed, 14 Jul 2021 12:08:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 440CF6B0081; Wed, 14 Jul 2021 12:08:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26CE76B0083; Wed, 14 Jul 2021 12:08:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0042.hostedemail.com [216.40.44.42]) by kanga.kvack.org (Postfix) with ESMTP id EEDC16B0078 for ; Wed, 14 Jul 2021 12:08:11 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D7A3C18086592 for ; Wed, 14 Jul 2021 16:08:10 +0000 (UTC) X-FDA: 78361675140.01.B5BAA0C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 694AC500B490 for ; Wed, 14 Jul 2021 16:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626278889; 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: in-reply-to:in-reply-to:references:references; bh=HH+Au0Fkq26lvoJbZZLuQQG/8KQlhdV48YMU3sDbERU=; b=dAFn/lukZyVdEnoXf2aQ4TQSnfg5qFf9+IzqIwMtHJbgBQOReBij7iJGuNMbVa0QsyHNVe cumfDuiwXZl/UgRT/iSkXKxmvdUtlXpT5I+icoOh7rOB1nhMkjw3tW0V6gyVMFi4jYEgEG FCgKAaqOm6qrY15aZGpAspjzEnrXimY= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-469-B8BxJEt-MpmO6cPtlO1j0g-1; Wed, 14 Jul 2021 12:08:06 -0400 X-MC-Unique: B8BxJEt-MpmO6cPtlO1j0g-1 Received: by mail-qv1-f71.google.com with SMTP id r13-20020a0cf60d0000b02902f3a4c41d77so1955910qvm.18 for ; Wed, 14 Jul 2021 09:08:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HH+Au0Fkq26lvoJbZZLuQQG/8KQlhdV48YMU3sDbERU=; b=WAsULPFcmlm6V8dgg0gMEg+Xkq6xXS2mdeY+oUmxjRLR8Q5qAbGjQxrnzSsjQROUHl ZWItgFnHjEnLG0mGZsIpXCrvPPKjt2NDZcZ5ybFMKq1CX1fZmTwgJBET6/UiRqIo0HsP YHPFJM9eH9OPM+M8oTKyZbnNfvJwHzFpoL4zZOXeWFmhLkdaN/tTJEU08SZTn0dCj6Gv lcZwglGzTX4w6G93xWK9KR2Br0SmAkq6TAijay4ecoB0AAje9NiZLzEXvl2SVMAGDJdG LZNDAMg4p78NZBcHRRFhnRTejEo1o+XkE2p4COZPehg7VB87+GWtQ1QiuFBnHf8+A6S5 ebWA== X-Gm-Message-State: AOAM5325zZI3GsJvZLrt+55ln/kplH+ZVSFmNnp3lrJ1p+EJAwAxChhS xdyOsgZQFw/io+vR2zxnlATTIULBDcMMuMBKxWwVAipnx344b5/FWxQ34A6Hzj4INJEx+Yz/JAh KTuuqjWToQ5I= X-Received: by 2002:a05:620a:1526:: with SMTP id n6mr10604717qkk.401.1626278886233; Wed, 14 Jul 2021 09:08:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMZJjNXTcEoRJLHQHgDwywge6lSCX8DuheHLeq3r6bZDLM0okim6nQAN5BonsmlTokGR4f0g== X-Received: by 2002:a05:620a:1526:: with SMTP id n6mr10604690qkk.401.1626278885968; Wed, 14 Jul 2021 09:08:05 -0700 (PDT) Received: from t490s (bras-base-toroon474qw-grc-65-184-144-111-238.dsl.bell.ca. [184.144.111.238]) by smtp.gmail.com with ESMTPSA id c190sm660936qkg.46.2021.07.14.09.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 09:08:05 -0700 (PDT) Date: Wed, 14 Jul 2021 12:08:04 -0400 From: Peter Xu To: Tiberiu Georgescu Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, peterz@infradead.org, chinwen.chang@mediatek.com, linmiaohe@huawei.com, jannh@google.com, apopple@nvidia.com, christian.brauner@ubuntu.com, ebiederm@xmission.com, adobriyan@gmail.com, songmuchun@bytedance.com, axboe@kernel.dk, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, ivan.teterevkov@nutanix.com, florian.schmidt@nutanix.com, carl.waldspurger@nutanix.com, Hugh Dickins , Andrea Arcangeli Subject: Re: [RFC PATCH 1/1] pagemap: report swap location for shared pages Message-ID: References: <20210714152426.216217-1-tiberiu.georgescu@nutanix.com> <20210714152426.216217-2-tiberiu.georgescu@nutanix.com> MIME-Version: 1.0 In-Reply-To: <20210714152426.216217-2-tiberiu.georgescu@nutanix.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dAFn/luk"; spf=none (imf01.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 694AC500B490 X-Stat-Signature: a7idpy7xjnxxiyzzkzyj6fs45a198yga X-HE-Tag: 1626278890-7050 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: On Wed, Jul 14, 2021 at 03:24:26PM +0000, Tiberiu Georgescu wrote: > When a page allocated using the MAP_SHARED flag is swapped out, its pagemap > entry is cleared. In many cases, there is no difference between swapped-out > shared pages and newly allocated, non-dirty pages in the pagemap interface. > > This patch addresses the behaviour and modifies pte_to_pagemap_entry() to > make use of the XArray associated with the virtual memory area struct > passed as an argument. The XArray contains the location of virtual pages > in the page cache, swap cache or on disk. If they are on either of the > caches, then the original implementation still works. If not, then the > missing information will be retrieved from the XArray. > > Co-developed-by: Florian Schmidt > Signed-off-by: Florian Schmidt > Co-developed-by: Carl Waldspurger > Signed-off-by: Carl Waldspurger > Co-developed-by: Ivan Teterevkov > Signed-off-by: Ivan Teterevkov > Signed-off-by: Tiberiu Georgescu > --- > fs/proc/task_mmu.c | 37 +++++++++++++++++++++++++++++-------- > 1 file changed, 29 insertions(+), 8 deletions(-) > > diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c > index eb97468dfe4c..b17c8aedd32e 100644 > --- a/fs/proc/task_mmu.c > +++ b/fs/proc/task_mmu.c > @@ -1359,12 +1359,25 @@ static int pagemap_pte_hole(unsigned long start, unsigned long end, > return err; > } > > +static void *get_xa_entry_at_vma_addr(struct vm_area_struct *vma, > + unsigned long addr) > +{ > + struct inode *inode = file_inode(vma->vm_file); > + struct address_space *mapping = inode->i_mapping; > + pgoff_t offset = linear_page_index(vma, addr); > + > + return xa_load(&mapping->i_pages, offset); > +} > + > static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, > struct vm_area_struct *vma, unsigned long addr, pte_t pte) > { > u64 frame = 0, flags = 0; > struct page *page = NULL; > > + if (vma->vm_flags & VM_SOFTDIRTY) > + flags |= PM_SOFT_DIRTY; > + > if (pte_present(pte)) { > if (pm->show_pfn) > frame = pte_pfn(pte); > @@ -1374,13 +1387,22 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, > flags |= PM_SOFT_DIRTY; > if (pte_uffd_wp(pte)) > flags |= PM_UFFD_WP; > - } else if (is_swap_pte(pte)) { > + } else if (is_swap_pte(pte) || shmem_file(vma->vm_file)) { > swp_entry_t entry; > - if (pte_swp_soft_dirty(pte)) > - flags |= PM_SOFT_DIRTY; > - if (pte_swp_uffd_wp(pte)) > - flags |= PM_UFFD_WP; > - entry = pte_to_swp_entry(pte); > + if (is_swap_pte(pte)) { > + entry = pte_to_swp_entry(pte); > + if (pte_swp_soft_dirty(pte)) > + flags |= PM_SOFT_DIRTY; > + if (pte_swp_uffd_wp(pte)) > + flags |= PM_UFFD_WP; > + } else { > + void *xa_entry = get_xa_entry_at_vma_addr(vma, addr); > + > + if (xa_is_value(xa_entry)) > + entry = radix_to_swp_entry(xa_entry); > + else > + goto out; > + } > if (pm->show_pfn) > frame = swp_type(entry) | > (swp_offset(entry) << MAX_SWAPFILES_SHIFT); > @@ -1393,9 +1415,8 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, > flags |= PM_FILE; > if (page && page_mapcount(page) == 1) > flags |= PM_MMAP_EXCLUSIVE; > - if (vma->vm_flags & VM_SOFTDIRTY) > - flags |= PM_SOFT_DIRTY; IMHO moving this to the entry will only work for the initial iteration, however it won't really help anything, as soft-dirty should always be used in pair with clear_refs written with value "4" first otherwise all pages will be marked soft-dirty then the pagemap data is meaningless. After the "write 4" op VM_SOFTDIRTY will be cleared and I expect the test case to see all zeros again even with the patch. I think one way to fix this is to do something similar to uffd-wp: we leave a marker in pte showing that this is soft-dirtied pte even if swapped out. However we don't have a mechanism for that yet in current linux, and the uffd-wp series is the first one trying to introduce something like that. Thanks, -- Peter Xu