From patchwork Mon Jan 22 17:54:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13525926 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 EC37BC47DD9 for ; Mon, 22 Jan 2024 17:54:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79CF86B0071; Mon, 22 Jan 2024 12:54:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 74C358D0008; Mon, 22 Jan 2024 12:54:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 614F78D0001; Mon, 22 Jan 2024 12:54:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 441926B0071 for ; Mon, 22 Jan 2024 12:54:18 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B208AA1EA1 for ; Mon, 22 Jan 2024 17:54:17 +0000 (UTC) X-FDA: 81707696154.18.55BC6B7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 04AB020006 for ; Mon, 22 Jan 2024 17:54:14 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VKNEVENO; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705946055; 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:references:dkim-signature; bh=biwSam+t0PPy6PPpzP9oz0wUwC7UyF14RlOoYLHaCEw=; b=ld7saEGku4dwne9Vqbhzg3r7ojRlqGBCCIB450sFWkDSg82jZo99iklbVwxPr9GfLvBKlr G5nn5LJNfEjpU6hpwp3oY3eT4uM2sd6CpGtSx15VKkSMJQ+KddxuYUTgqt2Ry1vekim0+K eT5+sb8QKoffdHOEbHuO+vp0vx5dQ3U= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VKNEVENO; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705946055; a=rsa-sha256; cv=none; b=zoSK1FPpUbujf7M0muXuvWa0jgxHmuPPj8YomSXxMxDZ3amn6cKzzbC9OpW56lw4PTplVl OciZzNpCtGfaQ+UxgJYn97sO/QOMv0hJkDRwqSDl+4r0zttWfXOMdfx8HTe6BiQAuqmoEr FgalPc4vtct5red+BEMyHubK4bENA1E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705946054; 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; bh=biwSam+t0PPy6PPpzP9oz0wUwC7UyF14RlOoYLHaCEw=; b=VKNEVENOlJFyEp8nRZQgkWqXAyFyajPs+ISBOhTQ6NqPjw3ZvgV62cQzmV7ARd8/UjTfKm hKr9iEagzLtI0rpf8Xs/sm+zGkYjA3l806lsb28o4XOoEVbOvbmXr9h7AzEXG6ZLl7TnzK oRqhluTO6/+RPbNqiz3g/JdP3Ekr2L4= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-94-pPwM8tCnOhSZpJ2qAO1VIg-1; Mon, 22 Jan 2024 12:54:10 -0500 X-MC-Unique: pPwM8tCnOhSZpJ2qAO1VIg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68D6D3C025CB; Mon, 22 Jan 2024 17:54:10 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 147482166B33; Mon, 22 Jan 2024 17:54:08 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Ryan Roberts , Matthew Wilcox , Andrew Morton Subject: [PATCH v1] mm/huge_memory: fix folio_set_dirty() vs. folio_mark_dirty() Date: Mon, 22 Jan 2024 18:54:07 +0100 Message-ID: <20240122175407.307992-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspamd-Queue-Id: 04AB020006 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ggmr4qsnqmz53adyk6rdqtr9txo8161o X-HE-Tag: 1705946054-239732 X-HE-Meta: U2FsdGVkX18MRxgZ/Vc3dgHycqd1XgJifdCMWSs+N4PZHcyJtg1firqMft3FuYgw3I51f8Rv1tguAApvt2Yr/7RZCJ/rjMsiOUX3zoqPnh1oWkJbLuVkRyGz2aexhWUY3zDEkxCTrnXP0QvCCpEN6HhSYCgtm5DS6IZ6DW9Tq3I3gmy4+S/uyEqwvqZNlZKLK+DqL/qHAnPw7SRvK2kMp1t9xpanYMi3HElFM+Wrl8NWGGLsmMtkDKfYDdF9gbAAh43v3fNKdgtdQx/xfCLB7rpQTTaczwzQslO1w8BJk7ioGzA5SR6MZoALJZe0Sbjd6uUyc5GrS+U5m5nMpnGyV9LUfsLJjyBY2prU3LvtJnOmhZbdBWQyGohNR480NI6DsyVEdCC1NUzEOAK43M0m2yGv8QqlYajefCgdP4uAPcsHK/hNyhnizfw8ePRixarFJGdPplCoZf6gg7DUpeZNj1eEuTsc9OtQBU6o2jOVf5rKTGtH883tY9sA9gepU/z7Rdag90rNQnmd06OT7LLSluDu/Nt8xVIRTBJ3mMW8pGu1eO5XteUz1kPMrLEntz0IBc1Y+VEYmDzhIxcjF9IY8RyUsRd99Aq2Ejw+6ueMFwIDm6v/2WEh9e8/UJ17kl8KPZsbefXKnZc+9ZTnSyV0mogOrc+lnjCI9RmuSyl1u9wHmhrS5xHpPG/x486UalHu9kreePmhYVuI/y6LUuyXCz/NRLMnEuPhGuwEfXY9Mn9KcOmQwLWE8LmdE4PpBa9KvUVkKMaOPbl8MM/+DR7FenmN/0gkJ4v4qTUMS89n4vQ5XCfdDo/AoSusZxsQC/VtiOpEtDhuJ3xmQn9i1/RE/FqDyfEWoJ1R3HDUqLx7Wq9qgA1EHn+YbdC4NGuBR8dFkX82il+quBhnS24umYESfUfzmU5XYZJMiCXazwLw5Qx2oIBvmd6sonFb37BU0IYd1uWLJBBTDTAOdiPo2wq nxNku8vV 6czCHN9mp/PfHP+TIPiOWZ4PaC0pPrGG8PiQdpq5S0ZHPCWz3pADGWhfngK3ZQQhr7Ag8fkt2xnze5QthhSQJ2qu6NXch6ja63GRkl1XNHPKBXrWLxa1vL79EpT558QQszPd7KpOnGZae1lHx05QVohRj16HfRLqmOYR2Zr6SLUg4x9yDRR2HhGRcbQGtEavM0MRcoSqJKldbKa0wrxQL0/1p2Kr9hbpOA2GEKZYKCw3rVZKbcdmLKXyi/DSYnVLGr4AhGj/Hmb0/8FP88Mdn4DawGhyzN4VeZf66kJM3yOBvaB1HxCeOFXojxxEGN5wvjNlEcgbWDuTyYi5J8JMFrlhCQOAXgsebZpNGogzAmwRD9iG91jLVbKSPzI6MGqqRNluTWRQL7pA+sh8= 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: List-Subscribe: List-Unsubscribe: The correct folio replacement for "set_page_dirty()" is "folio_mark_dirty()", not "folio_set_dirty()". Using the latter won't properly inform the FS using the dirty_folio() callback. This has been found by code inspection, but likely this can result in some real trouble. Fixes: a8e61d584eda0 ("mm/huge_memory: page_remove_rmap() -> folio_remove_rmap_pmd()") Cc: Ryan Roberts Cc: Matthew Wilcox (Oracle) Cc: Andrew Morton Signed-off-by: David Hildenbrand --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 94ef5c02b4596..5f31e51f22356 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2437,7 +2437,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, page = pmd_page(old_pmd); folio = page_folio(page); if (!folio_test_dirty(folio) && pmd_dirty(old_pmd)) - folio_set_dirty(folio); + folio_mark_dirty(folio); if (!folio_test_referenced(folio) && pmd_young(old_pmd)) folio_set_referenced(folio); folio_remove_rmap_pmd(folio, page, vma); @@ -3563,7 +3563,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, } if (pmd_dirty(pmdval)) - folio_set_dirty(folio); + folio_mark_dirty(folio); if (pmd_write(pmdval)) entry = make_writable_migration_entry(page_to_pfn(page)); else if (anon_exclusive)