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=-24.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL 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 6A6C1C47096 for ; Fri, 4 Jun 2021 03:26:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D9AC36140A for ; Fri, 4 Jun 2021 03:26:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9AC36140A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 234D46B0036; Thu, 3 Jun 2021 23:26:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BFEB6B006C; Thu, 3 Jun 2021 23:26:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00FC06B006E; Thu, 3 Jun 2021 23:26:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id BF64E6B0036 for ; Thu, 3 Jun 2021 23:26:18 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 52E02181AC9CB for ; Fri, 4 Jun 2021 03:26:18 +0000 (UTC) X-FDA: 78214603236.10.CC78977 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by imf19.hostedemail.com (Postfix) with ESMTP id 1C2669001E71 for ; Fri, 4 Jun 2021 03:25:57 +0000 (UTC) Received: by mail-qk1-f169.google.com with SMTP id i67so8093795qkc.4 for ; Thu, 03 Jun 2021 20:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=dnq8bi4WgTB+aCPH1lNk5tI4fbv6Xg2se78kMTkHbnk=; b=lSeSyo3iR3W+v7+Yz/7O/rtrgHddcmai7nJlBU3XmXwCvD5dZ5c0Xcy5YjoINAsUQX A2gpNl6V6SvvkXsXT1QOF6yt8BTFGd9x6Dd06jt47pRrndNy7VCu0NwtFTIUM9AEsVSp z4NYxvuFU8xHg8WvEr/U6vjxx+mclUNK47sEbYgS09ZEozrhzqMG7dP89vEDIEDwW2CI h1z5L4dpPNrRgUNlKbxzyjiraJPkRhK9WJ+75mKz99agwViHC4Xsr38eVhD649GAkuun voLxcQB/1gNUtNUOjf2iPZBcA6VHrowoLaY3A4VjuzXAWGb5oYUxP20GJX3jGNx9N68Q nshQ== 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:in-reply-to:message-id :references:user-agent:mime-version; bh=dnq8bi4WgTB+aCPH1lNk5tI4fbv6Xg2se78kMTkHbnk=; b=V2ITUUPtJQV0Xa/4VBuUCnUo7qqaZPdh5NHekF1ybhgNVZdXV9yIbQbqFcAsJrEYc1 MNSs70GsUGyv1gN/uo72qaniyqB5DN4y4g+JGngzlE0BjDYNWlqlBwul/e/P9+ukGG45 I+KVfwSKki+gPGS5ye7D3mjpsLbAMc+vxWcIlVc2XpjUgasl/Lx+DtOolb9TP+bP0nSc 2egt4fIkiEfmAyjn1TgPE37mtAIjOYK4ql5tTRmzey1xN8NTNK01tqseMTyTU4d2SYF9 rkia/ytWTaz3bugqaoF4BgkHIOXF4YfG01mImelMCcIE4zcQuxd6HyUWb7c6akGD0OK+ 825A== X-Gm-Message-State: AOAM533JX9Mga6nmBpF4KurqqvlFjhHmKtf0DgbCjSp7ScrCfTfXdCNm H8Gffdgv54PwrkYpuX7y8054iQ== X-Google-Smtp-Source: ABdhPJwtC0zZZRQ+4Ojx/S//wpEjvhfB81RWQnckCOpv7r+YDSI8/bCcD23AnKjYlEIPZrENQe+1Gw== X-Received: by 2002:a05:620a:cd6:: with SMTP id b22mr840611qkj.471.1622777164282; Thu, 03 Jun 2021 20:26:04 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id e24sm171621qtp.97.2021.06.03.20.26.03 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 03 Jun 2021 20:26:03 -0700 (PDT) Date: Thu, 3 Jun 2021 20:26:02 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Peter Xu cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Hugh Dickins , Andrea Arcangeli Subject: Re: [PATCH] mm/swap: Fix pte_same_as_swp() not removing uffd-wp bit when compare In-Reply-To: <20210603180546.9083-1-peterx@redhat.com> Message-ID: References: <20210603180546.9083-1-peterx@redhat.com> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Stat-Signature: misu13xt63mtscbibczmz4zbdg9joq71 X-Rspamd-Queue-Id: 1C2669001E71 X-Rspamd-Server: rspam02 Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=lSeSyo3i; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of hughd@google.com designates 209.85.222.169 as permitted sender) smtp.mailfrom=hughd@google.com X-HE-Tag: 1622777157-709598 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 Thu, 3 Jun 2021, Peter Xu wrote: > I found it by pure code review, that pte_same_as_swp() of unuse_vma() didn't Yes, that is an odd corner, easily missed. > take uffd-wp bit into account when comparing ptes. pte_same_as_swp() returning > false negative could cause failure to swapoff swap ptes that was wr-protected > by userfaultfd. > > Cc: Hugh Dickins > Cc: Andrea Arcangeli > Cc: Andrew Morton > Signed-off-by: Peter Xu I expect you're right: swapoff used to hang forever (but interruptibly) when this went wrong on powerpc originally. I don't know the uffd_wp (nor the soft_dirty) end of it, but treating uffd_wp and soft_dirty together looks a very good approach, so I'll venture an Acked-by: Hugh Dickins But I think it should have a uffd_wp Fixes tag and be Cc stable. > --- > include/linux/swapops.h | 15 +++++++++++---- > mm/swapfile.c | 2 +- > 2 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/include/linux/swapops.h b/include/linux/swapops.h > index af3d2661e41e..d356ab4047f7 100644 > --- a/include/linux/swapops.h > +++ b/include/linux/swapops.h > @@ -23,6 +23,16 @@ > #define SWP_TYPE_SHIFT (BITS_PER_XA_VALUE - MAX_SWAPFILES_SHIFT) > #define SWP_OFFSET_MASK ((1UL << SWP_TYPE_SHIFT) - 1) > > +/* Clear all flags but only keep swp_entry_t related information */ > +static inline pte_t pte_swp_clear_flags(pte_t pte) > +{ > + if (pte_swp_soft_dirty(pte)) > + pte = pte_swp_clear_soft_dirty(pte); > + if (pte_swp_uffd_wp(pte)) > + pte = pte_swp_clear_uffd_wp(pte); > + return pte; > +} > + > /* > * Store a type+offset into a swp_entry_t in an arch-independent format > */ > @@ -66,10 +76,7 @@ static inline swp_entry_t pte_to_swp_entry(pte_t pte) > { > swp_entry_t arch_entry; > > - if (pte_swp_soft_dirty(pte)) > - pte = pte_swp_clear_soft_dirty(pte); > - if (pte_swp_uffd_wp(pte)) > - pte = pte_swp_clear_uffd_wp(pte); > + pte = pte_swp_clear_flags(pte); > arch_entry = __pte_to_swp_entry(pte); > return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry)); > } > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 6212bc033602..1e07d1c776f2 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1887,7 +1887,7 @@ unsigned int count_swap_pages(int type, int free) > > static inline int pte_same_as_swp(pte_t pte, pte_t swp_pte) > { > - return pte_same(pte_swp_clear_soft_dirty(pte), swp_pte); > + return pte_same(pte_swp_clear_flags(pte), swp_pte); > } > > /* > -- > 2.31.1