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=-10.8 required=3.0 tests=BAYES_00,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 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 0EBCEC433E1 for ; Mon, 24 Aug 2020 15:49:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C3118205CB for ; Mon, 24 Aug 2020 15:49:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="czwGU0PH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3118205CB 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 47C476B0003; Mon, 24 Aug 2020 11:49:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42C3F6B0006; Mon, 24 Aug 2020 11:49:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F31B6B0007; Mon, 24 Aug 2020 11:49:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id 151796B0003 for ; Mon, 24 Aug 2020 11:49:16 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A51D43623 for ; Mon, 24 Aug 2020 15:49:15 +0000 (UTC) X-FDA: 77185896270.26.pets42_020497527054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 3E5CF18010A51 for ; Mon, 24 Aug 2020 15:44:56 +0000 (UTC) X-HE-Tag: pets42_020497527054 X-Filterd-Recvd-Size: 4809 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598283895; 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=n4X+McYKm2HPSDcgicm1bNMEAs9UALlLnJpaukedpRI=; b=czwGU0PHc+WLbgrWXDbA2b7NgeP8XCpXxv+BFIbdKCySx1FNzvZyfjOb8cKGsRbo2u7wkN 4Vmfe3FmzfbaxfCUnnlcs5KzpPHlbOOyqVinNdNz0FmqXDidDbGG2UhK4pLRpT4QcvGxnt unWdyRWYP1c/OIheAT5P7FEneOACRkU= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-e3lt6AI6MeG9UknNSpgGLg-1; Mon, 24 Aug 2020 11:44:51 -0400 X-MC-Unique: e3lt6AI6MeG9UknNSpgGLg-1 Received: by mail-qt1-f197.google.com with SMTP id b1so7094173qto.17 for ; Mon, 24 Aug 2020 08:44:51 -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=n4X+McYKm2HPSDcgicm1bNMEAs9UALlLnJpaukedpRI=; b=p94qulLF4RU3/hr0/paW2nZng/r9GzZI8dpRzvXYHG1f8YcEVlpNdUu+fTm2mjSFMr Aa/AkXx7pi9nTfflfl0iXWhUsk3Y+zicUKStUFxCSMokajK+TeNvwoy+xaxsn8e8emxz FuNdVEv5+bOKXAhGYdI7FivRhrJzuQNSz5s8TvLVysVW4qfEa2AIp2ARDcXJFry3473r Oh5gYx316Li7BViqrFql5YtKM1zh7XImLwN/g04lXUs2G/Vdthiyak5l9ADbCWdb3NT7 HzgjO/pKSueJfibuH0MJe/71Ez49bb8CncYxMSUax4mAqRzzWxpnVUo7edvjWogfMi9D EnEw== X-Gm-Message-State: AOAM531tiIEyCFYMC5OHDPEPev53mf21dHPb/KGi/P1Eq51ivQiOsc4I FVlthG67gZwP4QLo7QiQIh5T2ZMxqVYIOPTZ3eASnOVDB562pGGqF8IWsL1W6hAZcup42N5RZSY iKjnGVx96svE= X-Received: by 2002:ac8:794f:: with SMTP id r15mr5292561qtt.383.1598283890944; Mon, 24 Aug 2020 08:44:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj33JTZ3mBohbfbvoSOhP7o0yBfz9MoVA2SvBqR0S20h54m5UaHWiw9nh8PxL9WOsgX6JFQw== X-Received: by 2002:ac8:794f:: with SMTP id r15mr5292543qtt.383.1598283890719; Mon, 24 Aug 2020 08:44:50 -0700 (PDT) Received: from xz-x1 (bras-vprn-toroon474qw-lp130-11-70-53-122-15.dsl.bell.ca. [70.53.122.15]) by smtp.gmail.com with ESMTPSA id 199sm7679284qkm.13.2020.08.24.08.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 08:44:50 -0700 (PDT) Date: Mon, 24 Aug 2020 11:44:52 -0400 From: Peter Xu To: Alistair Popple Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , =?utf-8?B?SsOpcsO0bWU=?= Glisse , John Hubbard , Ralph Campbell , stable@vger.kernel.org Subject: Re: [PATCH 1/2] mm/migrate: Fixup setting UFFD_WP flag Message-ID: <20200824154452.GB8605@xz-x1> References: <20200824083128.12684-1-alistair@popple.id.au> MIME-Version: 1.0 In-Reply-To: <20200824083128.12684-1-alistair@popple.id.au> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Queue-Id: 3E5CF18010A51 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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 Mon, Aug 24, 2020 at 06:31:27PM +1000, Alistair Popple wrote: > Commit f45ec5ff16a75 ("userfaultfd: wp: support swap and page > migration") introduced support for tracking the uffd wp bit during page > migration. However the non-swap PTE variant was used to set the flag for > zone device private pages which are a type of swap page. > > This leads to corruption of the swap offset if the original PTE has the > uffd_wp flag set. > > Fixes: f45ec5ff16a75 ("userfaultfd: wp: support swap and page migration") > Signed-off-by: Alistair Popple > Cc: stable@vger.kernel.org > --- > mm/migrate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 34a842a8eb6a..ddb64253fe3e 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -251,7 +251,7 @@ static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma, > entry = make_device_private_entry(new, pte_write(pte)); > pte = swp_entry_to_pte(entry); > if (pte_swp_uffd_wp(*pvmw.pte)) > - pte = pte_mkuffd_wp(pte); > + pte = pte_swp_mkuffd_wp(pte); > } > } Looks correct... thanks! Reviewed-by: Peter Xu -- Peter Xu