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 5A6F1C433E0 for ; Fri, 15 Jan 2021 17:09:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0161A238EF for ; Fri, 15 Jan 2021 17:09:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0161A238EF 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 8500B8D016A; Fri, 15 Jan 2021 12:09:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 73AD98D019E; Fri, 15 Jan 2021 12:09:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D5A18D019D; Fri, 15 Jan 2021 12:09:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0062.hostedemail.com [216.40.44.62]) by kanga.kvack.org (Postfix) with ESMTP id 463EB8D019D for ; Fri, 15 Jan 2021 12:09:19 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 04E7C181D68B9 for ; Fri, 15 Jan 2021 17:09:19 +0000 (UTC) X-FDA: 77708645238.02.trip09_4702a0c27531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id D3DA0100BFDFF for ; Fri, 15 Jan 2021 17:09:18 +0000 (UTC) X-HE-Tag: trip09_4702a0c27531 X-Filterd-Recvd-Size: 5777 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610730557; 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=55sEsJtJtT3yQ/SJrjmLB0CUvQ5qtdXoD13C+gjkjA8=; b=B4QOahvSU6/KM6055XdEsVCVsx824+F6OwLAAZocKgOhxwighaD/VY3NT3Tjpum5lIbBcd wqvtP/TS1B5P7fX4ltseReWvS3K2g1IwgrK6UpDJABraCnjky659Evy3ypDyHWkX+tqZsJ MsQK1+Ni0P7ZiClx8uUxLygH2uXd0t0= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-_EcOnNpeN4GCValkYFEjjQ-1; Fri, 15 Jan 2021 12:09:16 -0500 X-MC-Unique: _EcOnNpeN4GCValkYFEjjQ-1 Received: by mail-qt1-f198.google.com with SMTP id l6so7891381qtr.9 for ; Fri, 15 Jan 2021 09:09:15 -0800 (PST) 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=55sEsJtJtT3yQ/SJrjmLB0CUvQ5qtdXoD13C+gjkjA8=; b=DhClPNXPRHVd7iali/HquzEXE5DUVVz2UBQBbN9A5/4MFwcWxFeN9aqRc4q+Fpf6Gd b4Jaa/2YVGzFBwTCQx+K5rSA92Ab6KJMpPDhc0Pu9ZSxmKRJX7/Q5ra8fb6E7G9a4LlK gi6AYOxeuZn+YTGr1XSZ0fIZnAV7RMjeBaoJWDvloT4In5Si4AZtDmqgIfYsflym2zTY WgcY6FlMnnVuoWKbjAdYw5utkABOULwrtGqQfj2ga+54cemdnbEX4U+HFxWTo0PkZogD C6374ef85cIEC6Ig+PR/VfPkG7PYcThb8h7VRwgomwH/17GvbikTvmyB2paHlUu4LKaL hVzw== X-Gm-Message-State: AOAM5321zL5tHR0eY9OIiIADyqsyXs2J9i595KESbsK/4OEydrBNmIkR G9yJ3s6GpelUBqFOWBMv/1wFBqC92sgTvgRm/QSXgQkVXYa6L/+UJElz/WzuNDdHLO6AWU5XPGB 018yWrTiU4EM= X-Received: by 2002:a05:6214:4e2:: with SMTP id cl2mr12895236qvb.27.1610730554855; Fri, 15 Jan 2021 09:09:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzN6JI/2g7RCjZr0SNpUqJFGmSSLlynIlwy16/M1XzDDRvPyo6B1EX1O0uPYvY1K6cPK0Z7tA== X-Received: by 2002:a05:6214:4e2:: with SMTP id cl2mr12895212qvb.27.1610730554659; Fri, 15 Jan 2021 09:09:14 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id d123sm5187840qke.95.2021.01.15.09.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 09:09:14 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , Mike Kravetz , peterx@redhat.com, Jerome Glisse , "Kirill A . Shutemov" , Hugh Dickins , Axel Rasmussen , Matthew Wilcox , Andrew Morton , Andrea Arcangeli , Nadav Amit Subject: [PATCH RFC 03/30] mm/userfaultfd: Fix a few thp pmd missing uffd-wp bit Date: Fri, 15 Jan 2021 12:08:40 -0500 Message-Id: <20210115170907.24498-4-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115170907.24498-1-peterx@redhat.com> References: <20210115170907.24498-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" 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: These include: 1. When remove migration pmd entry, should keep the uffd-wp bit from sw= ap pte. Note that we need to do this after setting write bit just in c= ase we need to remove it. 2. When change huge pmd and convert write -> read migration entry, pers= ist the same uffd-wp bit. 3. When convert pmd to swap entry, should drop the uffd-wp bit always. Signed-off-by: Peter Xu --- include/linux/swapops.h | 2 ++ mm/huge_memory.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/linux/swapops.h b/include/linux/swapops.h index d9b7c9132c2f..7dd57303bb0c 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -258,6 +258,8 @@ static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd) =20 if (pmd_swp_soft_dirty(pmd)) pmd =3D pmd_swp_clear_soft_dirty(pmd); + if (pmd_swp_uffd_wp(pmd)) + pmd =3D pmd_swp_clear_uffd_wp(pmd); arch_entry =3D __pmd_to_swp_entry(pmd); return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry)); } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 35d4acac6874..4abc46e780a0 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1810,6 +1810,8 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd= _t *pmd, newpmd =3D swp_entry_to_pmd(entry); if (pmd_swp_soft_dirty(*pmd)) newpmd =3D pmd_swp_mksoft_dirty(newpmd); + if (pmd_swp_uffd_wp(*pmd)) + newpmd =3D pmd_swp_mkuffd_wp(newpmd); set_pmd_at(mm, addr, pmd, newpmd); } goto unlock; @@ -2968,6 +2970,8 @@ void remove_migration_pmd(struct page_vma_mapped_wa= lk *pvmw, struct page *new) pmde =3D pmd_mksoft_dirty(pmde); if (is_write_migration_entry(entry)) pmde =3D maybe_pmd_mkwrite(pmde, vma); + if (pmd_swp_uffd_wp(*pvmw->pmd)) + pmde =3D pmd_wrprotect(pmd_mkuffd_wp(pmde)); =20 flush_cache_range(vma, mmun_start, mmun_start + HPAGE_PMD_SIZE); if (PageAnon(new)) --=20 2.26.2