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=-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 AB1FBC47089 for ; Thu, 27 May 2021 20:23:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5635D61360 for ; Thu, 27 May 2021 20:23:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5635D61360 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 85A176B0071; Thu, 27 May 2021 16:23:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82F516B0074; Thu, 27 May 2021 16:23:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60E8E6B007B; Thu, 27 May 2021 16:23:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0146.hostedemail.com [216.40.44.146]) by kanga.kvack.org (Postfix) with ESMTP id 198C16B0071 for ; Thu, 27 May 2021 16:23:05 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 9A17FBEF5 for ; Thu, 27 May 2021 20:23:04 +0000 (UTC) X-FDA: 78188135088.37.2038DAA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 42C90801934B for ; Thu, 27 May 2021 20:22:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622146983; 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: in-reply-to:in-reply-to:references:references; bh=CPzjkZSYUZ+9ChSaHHQDBWB6stQ1ZKRzO1smrJVYP5w=; b=YfL+yozfiU2duUgY78T78eqkI87KOavNT4sE1s8eaztCpl5YiD/C+d0gafKbbolpofxpVQ tzU5ZODfOXRkCmI16aJqjxGldeSR//aQKuos00frtc0EzqmQV+x7sKJnjyDL+HDg84fua/ hYi33rRK32D8xYGnneM3Izx+Syp1ORA= 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-69-UCf0oPJ-NP6tI8KJlV5Jmg-1; Thu, 27 May 2021 16:23:00 -0400 X-MC-Unique: UCf0oPJ-NP6tI8KJlV5Jmg-1 Received: by mail-qt1-f197.google.com with SMTP id d7-20020ac811870000b02901e65f85117bso848533qtj.18 for ; Thu, 27 May 2021 13:23:00 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=CPzjkZSYUZ+9ChSaHHQDBWB6stQ1ZKRzO1smrJVYP5w=; b=fjp/k5XwZc8kauJrd403pBlIHpXl6tCmEaNJL9mGuicRx5RmxqoheIveCqUi67LKT7 MijsqHtFQ3tAjcxnKq8DRQt3s+ncRLTl5uLl1oqukMIUDsPFuHN+BcPTvHEEz5g7UUx9 v3nQGMjyxiCylxXdEb9LGQdW+XbV174Ovul3VrLN97mb69ccSe9bCFhmwKs4Xefgrati 9mtyPZSG7GeElSyxp/TnslCH20iPMezJ84elkgRhJft5e/iAEesuY+SNWoO2iYVh7hKT Ib8ZhnOpcCrA5MbGii6D/HnO24D6tBfkMRZb94MpHGRIzuXzfW0/pVrOjGx4L1unsH7p C+Uw== X-Gm-Message-State: AOAM530BHvliFqmEpc/NSANGyG9WnAXELE2Ce6DnPHegLDaartjN+6NM c5imOG3oU/he8CrG8Dw5wVvMS2OcAAmVRYkUqSzZYz1u+IHoM19/h5TId763Bek8HdD+IC3Gg+k 90uWlAeWH0HA= X-Received: by 2002:ac8:758a:: with SMTP id s10mr335554qtq.31.1622146978657; Thu, 27 May 2021 13:22:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8kaYOKObAD+x3/GT0ewDBGBt60RVnJQo86yzj8GxZwEzdHtJ0I2hFBzBcRwaJqMd8+fukTg== X-Received: by 2002:ac8:758a:: with SMTP id s10mr335533qtq.31.1622146978391; Thu, 27 May 2021 13:22:58 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id e12sm1355961qtj.48.2021.05.27.13.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:22:57 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , peterx@redhat.com, Andrew Morton , Mike Kravetz , Jerome Glisse , Miaohe Lin , Nadav Amit , Hugh Dickins , Matthew Wilcox , Jason Gunthorpe , "Kirill A . Shutemov" , Andrea Arcangeli , Axel Rasmussen Subject: [PATCH v3 14/27] shmem/userfaultfd: Handle the left-overed special swap ptes Date: Thu, 27 May 2021 16:22:55 -0400 Message-Id: <20210527202255.31716-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" X-Rspamd-Queue-Id: 42C90801934B Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YfL+yozf; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf08.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam03 X-Stat-Signature: t7b9jsfbc8ye3wg6mcfzyotmf9wbkwtg X-HE-Tag: 1622146976-833534 Content-Transfer-Encoding: quoted-printable 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: Note that the special uffd-wp swap pte can be left over even if the page = under the pte got evicted. Normally when evict a page, we will unmap the ptes = by walking through the reverse mapping. However we never tracked such infor= mation for the special swap ptes because they're not real mappings but just mark= ers. So we need to take care of that when we see a marker but when it's actual= ly meaningless (the page behind it got evicted). We have already taken care of that in e.g. alloc_set_pte() where we'll tr= eat the special swap pte as pte_none() when necessary. However we need to al= so teach userfaultfd itself on either UFFDIO_COPY or handling page faults, s= o that everything will still work as expected. Signed-off-by: Peter Xu --- fs/userfaultfd.c | 15 +++++++++++++++ mm/userfaultfd.c | 13 ++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 19ebae443ade..15031d6f1f17 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -329,6 +329,21 @@ static inline bool userfaultfd_must_wait(struct user= faultfd_ctx *ctx, */ if (pte_none(*pte)) ret =3D true; + /* + * We also treat the swap special uffd-wp pte as the pte_none() here. + * This should in most cases be a missing event, as we never handle + * wr-protect upon a special uffd-wp swap pte - it should first be + * converted into a normal read request before handling wp. It just + * means the page/swap cache that backing this pte is gone, so this + * special pte is leftover. + * + * We can't simply replace it with a none pte because we're not with + * the pgtable lock here. Instead of taking it and clearing the pte, + * the easy way is to let UFFDIO_COPY understand this pte too when + * trying to install a new page onto it. + */ + if (pte_swp_uffd_wp_special(*pte)) + ret =3D true; if (!pte_write(*pte) && (reason & VM_UFFD_WP)) ret =3D true; pte_unmap(pte); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 3636f5be6390..147e86095070 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -100,7 +100,18 @@ int mfill_atomic_install_pte(struct mm_struct *dst_m= m, pmd_t *dst_pmd, } =20 ret =3D -EEXIST; - if (!pte_none(*dst_pte)) + /* + * Besides the none pte, we also allow UFFDIO_COPY to install a pte + * onto the uffd-wp swap special pte, because that pte should be the + * same as a pte_none() just in that it contains wr-protect information + * (which could only be dropped when unmap the memory). + * + * It's safe to drop that marker because we know this is part of a + * MISSING fault, and the caller is very clear about this page missing + * rather than wr-protected. Then we're sure the wr-protect bit is + * just a leftover so it's useless already and is the same as none pte. + */ + if (!pte_none(*dst_pte) && !pte_swp_uffd_wp_special(*dst_pte)) goto out_unlock; =20 if (page_in_cache) --=20 2.31.1