From patchwork Thu Jun 3 18:05:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12297795 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 F061DC47082 for ; Thu, 3 Jun 2021 18:06:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 84744613E3 for ; Thu, 3 Jun 2021 18:06:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84744613E3 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 A2AA86B0036; Thu, 3 Jun 2021 14:06:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DAC56B006C; Thu, 3 Jun 2021 14:06:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82D7D6B006E; Thu, 3 Jun 2021 14:06:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0210.hostedemail.com [216.40.44.210]) by kanga.kvack.org (Postfix) with ESMTP id 5003F6B0036 for ; Thu, 3 Jun 2021 14:06:01 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D8D4B181AC9CB for ; Thu, 3 Jun 2021 18:06:00 +0000 (UTC) X-FDA: 78213191280.32.059DADF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 0C3D92BE1 for ; Thu, 3 Jun 2021 18:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622743550; 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: content-transfer-encoding:content-transfer-encoding; bh=tXbIN/K5Sz2sSiy4b9DqsJhGb0vXqIJSZXhXMYqqraU=; b=ECaTYBO91k7E9ac9hC0MIzdmYEIm/bM09E/EVElLjm2SObz61IcM1/CvFL+zZmfTrrK1Vc r1OeYVxFJsvUqejNSixrrxHdCwk+jZa6kGl4E6G5gHz3pRKKLcyT7JetDkYjmwpcfwzUpQ 6TDQiDjznIUXTfcqihwSk0egRs7orw0= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-oNB9LWQvOdqhGgcXNE9A3g-1; Thu, 03 Jun 2021 14:05:49 -0400 X-MC-Unique: oNB9LWQvOdqhGgcXNE9A3g-1 Received: by mail-qt1-f199.google.com with SMTP id f17-20020ac87f110000b02901e117339ea7so3539587qtk.16 for ; Thu, 03 Jun 2021 11:05:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tXbIN/K5Sz2sSiy4b9DqsJhGb0vXqIJSZXhXMYqqraU=; b=TuBN72hB3fgtDwbQKpOLGIIzwBLSd+IRppuYP/jdCAZJ/SPzd3UXr9fgAFQDGUTgDn lePy4/U8qVC28rBJWva5BBK3qQKwDQdSJC5yqyO50J82sX9DouFWkiNAZDXuuvw6fBvG Chk95gOKaXvN+xrT0B96yUtGM5gLGF0a/RjuSblNm51XKLsbzNH7/p+cDvUBS0z5sLuO 6IqEyDr7ZpPaKcP/3Kz5gC49AUd4uW3cfbI7zzvLBqfMeZLgpCGluXECR93NSpTmAImQ sIo5ANT0Nbwv8kOhdP1GiI+UiCbBeQszosO93spbiIMlRPh/ZLBc9H6+YlnVZf5EuuPi 49bg== X-Gm-Message-State: AOAM533alm6yW0YtchfiDezk+uDxO2AgUbyjh5VG5OJeDm2ocLY23Ea5 n8yoIcptanVPd5AjDY2Aney5sXfincwEv80nz9GSZLIHB1t93ogzXj+VvFQHfQrXeXC9fukveox X7qn0SpLASR19QbfMijOCgSlFZg1vHHECqdvY/Q6A+B9jv8YzIUzix1YBIv92 X-Received: by 2002:a05:620a:20da:: with SMTP id f26mr450092qka.203.1622743548038; Thu, 03 Jun 2021 11:05:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTyMQdXaZyjeReLDaxeCEsxV+Vpnor7t0rrbG3rdi1GTkkBklWCSv83UBY+w3pX9a5VlaRYA== X-Received: by 2002:a05:620a:20da:: with SMTP id f26mr450069qka.203.1622743547758; Thu, 03 Jun 2021 11:05:47 -0700 (PDT) Received: from t490s.redhat.com (bras-base-toroon474qw-grc-61-184-147-118-108.dsl.bell.ca. [184.147.118.108]) by smtp.gmail.com with ESMTPSA id d2sm2344846qkn.95.2021.06.03.11.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 11:05:47 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Andrew Morton , Hugh Dickins , Andrea Arcangeli Subject: [PATCH] mm/swap: Fix pte_same_as_swp() not removing uffd-wp bit when compare Date: Thu, 3 Jun 2021 14:05:46 -0400 Message-Id: <20210603180546.9083-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ECaTYBO9; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf20.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com X-Stat-Signature: 3wcnrbyhmwqxfrikssicuh5rsx3q98bt X-Rspamd-Queue-Id: 0C3D92BE1 X-Rspamd-Server: rspam02 X-HE-Tag: 1622743538-237198 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: I found it by pure code review, that pte_same_as_swp() of unuse_vma() didn't 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 Acked-by: Hugh Dickins --- 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); } /*