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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AF8AC00140 for ; Wed, 24 Aug 2022 15:39:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7B106B0072; Wed, 24 Aug 2022 11:39:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2A7A940008; Wed, 24 Aug 2022 11:39:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF326940007; Wed, 24 Aug 2022 11:39:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AEC4C6B0072 for ; Wed, 24 Aug 2022 11:39:17 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7349FC0EC1 for ; Wed, 24 Aug 2022 15:39:17 +0000 (UTC) X-FDA: 79834895154.29.A1BA0A0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 456E780046 for ; Wed, 24 Aug 2022 15:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661355555; 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=4YDz+MpPZkiheMede1adKNb3LxgK1j3sRTyEv4HMpL0=; b=CqtJAQ+bQeR1Ag07/wiFxi4eOOI/Zpbg2jbHdGky6UnYBQekxEw9SjMLMTsyu29ruvvriu G6kpkSMPc/VLEe6ybT1myZLHz1pg+RjUprNoxxi4LK6F9NmBCOY76aFC3Z0Ca14ft5NM38 AqOPvwWe5oICeCZxZ5+1CEMK+qbsZxA= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-56-jC4MyR9hOtaTCahiXMTBSg-1; Wed, 24 Aug 2022 11:39:14 -0400 X-MC-Unique: jC4MyR9hOtaTCahiXMTBSg-1 Received: by mail-qk1-f200.google.com with SMTP id l15-20020a05620a28cf00b006b46997c070so15216708qkp.20 for ; Wed, 24 Aug 2022 08:39:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=4YDz+MpPZkiheMede1adKNb3LxgK1j3sRTyEv4HMpL0=; b=5bD1vBEcP7OeAaH93DHZPgcLasgiYRViq9BbYn6ksdyjkS4XDgrkhH+tyFgQUPDhre RV7DhVnI7odAeke9OPZuljQCl5/I6U/dXrtVGBmGGnJi9a8WDugfRI9mTMV/58E5t+Rc lPAT9CE9sQJcGuIlop/FB8oTEABiv+ph+mfTsSW57PKqUpnpuLuBVvE3oRlA+Y0W3tUh QkAAcPZo6s5KbBZDXJxG3L5ff6d6I2HhJrF9zfgk8Xd1gvsa8OFKGN1zTQSPEdENh52g rSnG9V+O0J71U6IFR4w/ryg9gXA2d9Ro2qgivmXfFDnbHYPXWVQqk6t7K0ELeCt1U3ZO 4TXQ== X-Gm-Message-State: ACgBeo2L63Rx43IxKwI8gGSYwLx9rueRJiIHMKTM7hDdinAW4vjJHpSf 9hdL/w0Wjj3jAdIE2e28g1q41a6KFynGpyTips4JGQ23zFcUVPtrKhq56wDNEEkdoXhK/aQSp8s nLQmQ5uB0qDU= X-Received: by 2002:ad4:5ae8:0:b0:496:f1c9:7bd with SMTP id c8-20020ad45ae8000000b00496f1c907bdmr10727648qvh.125.1661355554384; Wed, 24 Aug 2022 08:39:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR6lRAWqwQD0sX2sud09VmJ+0QpTsPmTlUS5jZn09b1qgoiwGEQmQlz8zOomOo+cNaaUWHVmfg== X-Received: by 2002:ad4:5ae8:0:b0:496:f1c9:7bd with SMTP id c8-20020ad45ae8000000b00496f1c907bdmr10727612qvh.125.1661355554146; Wed, 24 Aug 2022 08:39:14 -0700 (PDT) Received: from xz-m1.local (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id h4-20020ac87764000000b0034355a352d1sm12681683qtu.92.2022.08.24.08.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 08:39:13 -0700 (PDT) Date: Wed, 24 Aug 2022 11:39:11 -0400 From: Peter Xu To: Alistair Popple Cc: linux-mm@kvack.org, akpm@linux-foundation.org, Nadav Amit , huang ying , LKML , "Sierra Guiza, Alejandro (Alex)" , Felix Kuehling , Jason Gunthorpe , John Hubbard , David Hildenbrand , Ralph Campbell , Matthew Wilcox , Karol Herbst , Lyude Paul , Ben Skeggs , Logan Gunthorpe , paulus@ozlabs.org, linuxppc-dev@lists.ozlabs.org, stable@vger.kernel.org, Huang Ying Subject: Re: [PATCH v3 2/3] mm/migrate_device.c: Copy pte dirty bit to page Message-ID: References: <3b01af093515ce2960ac39bb16ff77473150d179.1661309831.git-series.apopple@nvidia.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661355556; a=rsa-sha256; cv=none; b=ZIbw9c6SCeWNIBIKlGZ79OZ25OB/DNlqwZCIjnXRbRYDIgEY2zT0IE9JVKYuIMH0SD3BcN hsS7Jebbmasv1/hz1oxch1N9SNa/s0JL0T+UkQbM1BTxAV1WJaNqT/1i5FgWXEVVR12Vog S3zh9eEnNK7aaCX3QmggZKgPpflTLeA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CqtJAQ+b; spf=pass (imf02.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661355556; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4YDz+MpPZkiheMede1adKNb3LxgK1j3sRTyEv4HMpL0=; b=aaHKB77NoaxVF5elyjCD2UbFJnrK6ncumyfJ6h3VxOVuOyGT//jVe4PH4Oa6kg49o1DeV5 nnrANv2o9OFigOIuJHrm0gTaXXHndJPri/Y+w1SZx7K7bYtEy1Ih5IOHnaARzVcO1auhqb QWLff2YlsX1yQZY7p63CrYIJWU37x9E= X-Rspam-User: X-Stat-Signature: 5twxgd4nie1ggy8tkc647a1g5kb3do5y X-Rspamd-Queue-Id: 456E780046 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CqtJAQ+b; spf=pass (imf02.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam01 X-HE-Tag: 1661355556-406032 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, Aug 24, 2022 at 01:03:38PM +1000, Alistair Popple wrote: > migrate_vma_setup() has a fast path in migrate_vma_collect_pmd() that > installs migration entries directly if it can lock the migrating page. > When removing a dirty pte the dirty bit is supposed to be carried over > to the underlying page to prevent it being lost. > > Currently migrate_vma_*() can only be used for private anonymous > mappings. That means loss of the dirty bit usually doesn't result in > data loss because these pages are typically not file-backed. However > pages may be backed by swap storage which can result in data loss if an > attempt is made to migrate a dirty page that doesn't yet have the > PageDirty flag set. > > In this case migration will fail due to unexpected references but the > dirty pte bit will be lost. If the page is subsequently reclaimed data > won't be written back to swap storage as it is considered uptodate, > resulting in data loss if the page is subsequently accessed. > > Prevent this by copying the dirty bit to the page when removing the pte > to match what try_to_migrate_one() does. > > Signed-off-by: Alistair Popple > Acked-by: Peter Xu > Reported-by: Huang Ying > Fixes: 8c3328f1f36a ("mm/migrate: migrate_vma() unmap page from vma while collecting pages") > Cc: stable@vger.kernel.org > > --- > > Changes for v3: > > - Defer TLB flushing > - Split a TLB flushing fix into a separate change. > > Changes for v2: > > - Fixed up Reported-by tag. > - Added Peter's Acked-by. > - Atomically read and clear the pte to prevent the dirty bit getting > set after reading it. > - Added fixes tag > --- > mm/migrate_device.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/mm/migrate_device.c b/mm/migrate_device.c > index 6a5ef9f..51d9afa 100644 > --- a/mm/migrate_device.c > +++ b/mm/migrate_device.c > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -196,7 +197,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, > anon_exclusive = PageAnon(page) && PageAnonExclusive(page); > if (anon_exclusive) { > flush_cache_page(vma, addr, pte_pfn(*ptep)); > - ptep_clear_flush(vma, addr, ptep); > + pte = ptep_clear_flush(vma, addr, ptep); > > if (page_try_share_anon_rmap(page)) { > set_pte_at(mm, addr, ptep, pte); > @@ -206,11 +207,15 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, > goto next; > } > } else { > - ptep_get_and_clear(mm, addr, ptep); > + pte = ptep_get_and_clear(mm, addr, ptep); > } I remember that in v2 both flush_cache_page() and ptep_get_and_clear() are moved above the condition check so they're called unconditionally. Could you explain the rational on why it's changed back (since I think v2 was the correct approach)? The other question is if we want to split the patch, would it be better to move the tlb changes to patch 1, and leave the dirty bit fix in patch 2? > > migrate->cpages++; > > + /* Set the dirty flag on the folio now the pte is gone. */ > + if (pte_dirty(pte)) > + folio_mark_dirty(page_folio(page)); > + > /* Setup special migration page table entry */ > if (mpfn & MIGRATE_PFN_WRITE) > entry = make_writable_migration_entry( > -- > git-series 0.9.1 > -- Peter Xu