From patchwork Wed Apr 5 14:25:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13201847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5BE1C761A6 for ; Wed, 5 Apr 2023 14:25:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2805B6B0074; Wed, 5 Apr 2023 10:25:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2309E6B0075; Wed, 5 Apr 2023 10:25:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F8866B0078; Wed, 5 Apr 2023 10:25:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 023D86B0074 for ; Wed, 5 Apr 2023 10:25:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C4AF2A04CF for ; Wed, 5 Apr 2023 14:25:45 +0000 (UTC) X-FDA: 80647561050.13.59DC145 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 177B08000F for ; Wed, 5 Apr 2023 14:25:43 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="i5DT0Dc/"; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680704744; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=TfnoP0pltBdlQ2w25u609J1/Ey8g4v+Lfk8iXG6YZhs=; b=x4GlNSd6iFCkssKMjFVD3A5qzHpk2piBGhiL2UKGTfIQNg5eNcO3kXfKLG827lgI3ZMXZo fsM3TUS17YL/FSi+G7XVgdmwLXg1XkUlqC9NPCx6cowTw3X9czVcFJ5Ui7/k+1Q0DkRbqS eoVzKhpVYKiNwdSiU57+jzKrXiL7Qm8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="i5DT0Dc/"; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680704744; a=rsa-sha256; cv=none; b=LORzESrlMRDWzRBgg3PxEAtawGIAbUwHDkNZCMsNhUfJ43k7lJVfxDKv8qN3ifsclryBbF P11rT0NB6+t8ds7kRZNmvFNxdjA0Z+HPJBIUaG2zaRLiTD1jv1uPuYO9ZrwRDOgLiw8po/ VKkREeSpcHgkw4EHyPDmI/9PAPeVCLc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680704743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TfnoP0pltBdlQ2w25u609J1/Ey8g4v+Lfk8iXG6YZhs=; b=i5DT0Dc/aj6dSP6M3cMcpZ9F6seUb8oEM2Gk3vFfvOvXAZ1PLR+hEtt+/mRyAXlYwjG4QT uuOBoDNgKt4Q3X1+l0pcq2zcwiPS0+zyZyHF6vU9V+xWV3odFLzpTpjbrzLgoWIA9AoP0d MaaJn/vRt/jn1u7ywrtQfu/3z5Hfb9g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-6Ct0lQxHOJy1mzCYccsCPQ-1; Wed, 05 Apr 2023 10:25:40 -0400 X-MC-Unique: 6Ct0lQxHOJy1mzCYccsCPQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C035B858289; Wed, 5 Apr 2023 14:25:39 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.195.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3DF7400F57; Wed, 5 Apr 2023 14:25:38 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Peter Xu , Muhammad Usama Anjum Subject: [PATCH v1 2/2] mm/userfaultfd: don't consider uffd-wp bit of writable migration entries Date: Wed, 5 Apr 2023 16:25:35 +0200 Message-Id: <20230405142535.493854-3-david@redhat.com> In-Reply-To: <20230405142535.493854-1-david@redhat.com> References: <20230405142535.493854-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Queue-Id: 177B08000F X-Stat-Signature: jwset8gf9su79bsxc16bhmtnussnhiat X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680704743-309635 X-HE-Meta: U2FsdGVkX1+taMiwL0jBxoQ5/NlkS7O4JWyAV4Xr1fkMrzmQUXCQwzDPA2NgUREIoSdxvagTqMX36HbrpPR4bcyBPFmYXmEF2hLq9NLkxzopxDZ/IyaDd33QlSzrRKSFWeQ+f1y/Y0mY12v2CTlc2xu9VNgTbZ4IoWyuIcAZDwQXsGxW1fhH52ipTMUebiFA/G0p509mXX8wPYRtVHnCj7dSoAXKpVZSzDqtDFc33E5w1HdZDe1R/lUneeTkvkz7B7Wji7BkjVgHSEEQs5mNLjDAgqnzhfVtv66ChSY762X1VEkOlufxRcowmq7pizA6gBMoYhPRp0BRSGZCmG7jTlm7BgJWDqeb2aTq9douo5RPgFwEEk/FTi8pgj2OIMLhSuE+pVyaW5dLeqq/dMr04KLQ4PtmE/xSQ47pm552Vu7N1eo5pW5kKYsmB5nH4rdu+mfpXQTJ4Z0KXlE2hKFsSGmLbwFxoXSFD/Pets7c/2/tJG0ql5qqSSTyj9EvO9rtMqr8QOz1UvGzbfIiF2qQtdgJnLihv6zlhpfTIgaKAtZwL9JnFJq27hi3tKhSUjSra5f+JcVuJvQqZAyu9/sN6Timwwrg6YNxOR7N1ogIJrTcPhyyDNRLN3S5l2QhM6mGnlAfqxaqb6iNDPL6D+Q+RIh8g2OAFqFFrB1zivJcRWijuE7bdm0Kq8lXZuIe31Ge6S8yIcPeKggwWpOK52mjCssDeF/yW3BYfcTdQp8tVdJ7MaLPohnl50GBh+/F1PZv8rOzM8h8fMRXwCcrAvUW/OX97Y6ibNQs/7kxXpwhcK/53KHTdltGmRKqvHpxiTSB1u/Qn3D1oE0sb5DqjijQBHN+HRPu9125V0QtCmjT6cIk2G0QR/eQnfSBvWEwmkZ15NdFR1iDCZLeUunrbfw9UQDI+APDgum7YQNjouwQu2JkAF/drQo3z1FQ0oXdQrZW/UPxkrwiGVIDb3rVkAd rfo2yAhO JMm212poA9JyHDY70/nJZNhvbRi1WnJLZFJMwcLIhh9FFfsc0+kAxgs8IMtX6pNkTwClhqWMe+b3vmeoJ4KaYvh9UG1i3QhcyulkUm0IrAovD3XrRCQ09cAyXY/Sd2SEIMy6vdXc6D9fSz7xb/cXLt9iKGruPE/Ao4n4pXQ3wf3qP5BjspBbpDyhPfA== 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: If we end up with a writable migration entry that has the uffd-wp bit set, we already messed up: the source PTE/PMD was writable, which means we could have modified the page without notifying uffd first. Setting the uffd-wp bit always implies converting migration entries to !writable migration entries. Commit 8f34f1eac382 ("mm/userfaultfd: fix uffd-wp special cases for fork()") documents that "3. Forget to carry over uffd-wp bit for a write migration huge pmd entry", but it doesn't really say why that should be relevant. So let's remove that code to avoid hiding an eventual underlying issue (in the future, we might want to warn when creating writable migration entries that have the uffd-wp bit set -- or even better when turning a PTE writable that still has the uffd-wp bit set). This now matches the handling for hugetlb migration entries in hugetlb_change_protection(). In copy_huge_pmd()/copy_nonpresent_pte()/copy_hugetlb_page_range(), we still transfer the uffd-bit also for writable migration entries, but simply because we have unified handling for "writable" and "readable-exclusive" migration entries, and we care about transferring the uffd-wp bit for the latter. Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu --- mm/huge_memory.c | 2 -- mm/mprotect.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index bdda4f426d58..f977c965fdad 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1853,8 +1853,6 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, newpmd = swp_entry_to_pmd(entry); if (pmd_swp_soft_dirty(*pmd)) newpmd = pmd_swp_mksoft_dirty(newpmd); - if (pmd_swp_uffd_wp(*pmd)) - newpmd = pmd_swp_mkuffd_wp(newpmd); } else { newpmd = *pmd; } diff --git a/mm/mprotect.c b/mm/mprotect.c index 13e84d8c0797..e04e9ea62ae7 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -223,8 +223,6 @@ static long change_pte_range(struct mmu_gather *tlb, newpte = swp_entry_to_pte(entry); if (pte_swp_soft_dirty(oldpte)) newpte = pte_swp_mksoft_dirty(newpte); - if (pte_swp_uffd_wp(oldpte)) - newpte = pte_swp_mkuffd_wp(newpte); } else if (is_writable_device_private_entry(entry)) { /* * We do not preserve soft-dirtiness. See