From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id 0EF6B6B0281 for ; Mon, 2 Jul 2018 17:06:41 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id a4-v6so10560503pls.16 for ; Mon, 02 Jul 2018 14:06:41 -0700 (PDT) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id bi1-v6si16653066plb.126.2018.07.02.14.06.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 14:06:39 -0700 (PDT) Date: Mon, 2 Jul 2018 14:06:38 -0700 From: Andrew Morton Subject: Re: [PATCHi v2] mm: do not drop unused pages when userfaultd is running Message-Id: <20180702140638.eb3edfaa611ba9fa018f92eb@linux-foundation.org> In-Reply-To: <20180702075049.9157-1-borntraeger@de.ibm.com> References: <20180702075049.9157-1-borntraeger@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Christian Borntraeger Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, Janosch Frank , David Hildenbrand , Cornelia Huck , linux-kernel@vger.kernel.org, Martin Schwidefsky , Andrea Arcangeli , Mike Rapoport On Mon, 2 Jul 2018 09:50:49 +0200 Christian Borntraeger wrote: > KVM guests on s390 can notify the host of unused pages. This can result > in pte_unused callbacks to be true for KVM guest memory. > > If a page is unused (checked with pte_unused) we might drop this page > instead of paging it. This can have side-effects on userfaultd, when the > page in question was already migrated: > > The next access of that page will trigger a fault and a user fault > instead of faulting in a new and empty zero page. As QEMU does not > expect a userfault on an already migrated page this migration will fail. > > The most straightforward solution is to ignore the pte_unused hint if a > userfault context is active for this VMA. > > ... > > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -64,6 +64,7 @@ > #include > #include > #include > +#include > > #include > > @@ -1481,7 +1482,7 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, > set_pte_at(mm, address, pvmw.pte, pteval); > } > > - } else if (pte_unused(pteval)) { > + } else if (pte_unused(pteval) && !userfaultfd_armed(vma)) { > /* > * The guest indicated that the page content is of no > * interest anymore. Simply discard the pte, vmscan A reader of this code will wonder why we're checking userfaultfd_armed(). So the writer of this code should add a comment which explains this to them ;) Please.