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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5D3BC61DB2 for ; Fri, 13 Jun 2025 09:27:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37BB56B007B; Fri, 13 Jun 2025 05:27:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32C506B0089; Fri, 13 Jun 2025 05:27:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F48E6B008C; Fri, 13 Jun 2025 05:27:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EFCF06B0089 for ; Fri, 13 Jun 2025 05:27:11 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9FD4216162E for ; Fri, 13 Jun 2025 09:27:11 +0000 (UTC) X-FDA: 83549848662.18.E53362F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 7A3E2C000A for ; Fri, 13 Jun 2025 09:27:09 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="YPClmD/5"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749806829; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BuuwdyX0QESH0B5VKvKy/eQpha6SfRiQdyfEZdmDLAI=; b=PrhxALBKGVp6mtmPx3lhKgI1IorCXcJzlRF3OIu4lYvGcABujVN2Cb4rbifIokjOxxmPLb XGjuPuhgE+lwDYZoEQznUwQ8Dt2mogvNDnTnc5kJMxQA0Lt1bKG2HmE4+QSWebbEXkYgKO ZN54fu+5k/8hvMfvfFyjkO8Mz7oGbBA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749806829; a=rsa-sha256; cv=none; b=7CDto/rnkVUrUqTWWpWTZ/oQcIDKe8s6QkpT4OkghhI6iNv/XEftXRSzm1vAkFZMqaf8kb 7Z40XRaVfhNIxzWNbnLZggokqUyVlC1Ysin80bi3C7/OLkePAVbXRX8lb0ZPK5SPfUdXpW EOIpez0NUR95HUMmCFtud+elCN+I4Dk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="YPClmD/5"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749806828; 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=BuuwdyX0QESH0B5VKvKy/eQpha6SfRiQdyfEZdmDLAI=; b=YPClmD/5Y6TW07aF2SSMRfSQzcc+qAC/MewXRb3C89eU1WH1i9WY38ic4xK8F7PNHkV7f+ 1vXtnUU+8lM/Yj+2zo+7iR0F972lViQLGwgEoPCLcSf8cOqUShaGEhVWEDlGbC3Cnm8ZUd tUgniHYwqhIbU558aPleCDN5LM3JpwA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-125-B-3Pv85RMSaWSMPAusSbQw-1; Fri, 13 Jun 2025 05:27:07 -0400 X-MC-Unique: B-3Pv85RMSaWSMPAusSbQw-1 X-Mimecast-MFC-AGG-ID: B-3Pv85RMSaWSMPAusSbQw_1749806826 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-451d2037f1eso13337915e9.0 for ; Fri, 13 Jun 2025 02:27:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749806826; x=1750411626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BuuwdyX0QESH0B5VKvKy/eQpha6SfRiQdyfEZdmDLAI=; b=ebvCDuy2FvQmtLosPKKXH/qZ4zi7GfrZpkRv9PvFUB/hI3O8hXyKvAJbNsJPtK1Icb DKLMKHsP64CoeSBnPpmay4NEga32vgdk4/4Y0Muyq0d/Fs0INZCaoro4K5Gk2HVJARfd w+lhONPzGQw1/sdLqJFCanzzF5PPLPJlOueblSPAgO4VY6oDJoA4e/jGttaFfbyhh1UL QI7ILKr2x1BOZxiypROjvhPBrZ+D3AjXt+ylync2afLQlW82duvd1SzjDI1VX0bntmsE DAH5bnbZyAlB19+PW8UbFLulZR2BuKJqorNBFQfmBu79C/5DpXsgD7ZVeS5Qu3e0CKpV NY+w== X-Gm-Message-State: AOJu0YzS2jhJP1LhMjTqr/Wl2wJvubg2aJmqZyiycJkEMH4sQE17JMhB hE0E4Te0Erv197dwGE2ZJsUxHqGXg8sBwKDFHCufUPUnGKq47jsxMfYUvOqlYopNSrHxpDWy6+Q RkFlHk39FL69F4pOYJlX+2EqSirNQbuUylzuXGchgsIEU/kezWIda X-Gm-Gg: ASbGnctBLr9RG7aK0Ig8eWSUC2veIq03656iF7To22LLUWS5zJ64By4oQ85gXByaVFb ZeyBVdkeQf+ogZeRDbfN7RXNAuMCNwTii5fwgi3tWwxAqLI01xpIkoU0VvAEGYbKG3jwsFraSuj LVSMpagFAu2chTCFF/FsTEPFe43kNACHsKxvPFAMMhgLEkIEq8eeC2B6JG5C8wg2MB4ebTn4sZ0 1RdQaL7SdOg7eHdxtEOH+RWb1UqBqgkT3tdBcE/cSACLNqawz0EkMczvwf/JbTHQyaWR5CCfEX1 khtRfN2KSswc9mbE3HMyw4dcWBCJWfCLMWfzk4FITdqi3OML23wEjVhShUchTiI2zOakSC4EWiT vBEapA1w= X-Received: by 2002:a05:600c:8b44:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-45334ad836amr23540735e9.17.1749806826448; Fri, 13 Jun 2025 02:27:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFP4hRMlxC0kkYbbJprcfwWEfFpKdqbkbnkLg58Cogqr6OsnbV5xlaTNzlLDv0FGfkKMNYSyQ== X-Received: by 2002:a05:600c:8b44:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-45334ad836amr23540385e9.17.1749806826108; Fri, 13 Jun 2025 02:27:06 -0700 (PDT) Received: from localhost (p200300d82f1a37002982b5f7a04e4cb4.dip0.t-ipconnect.de. [2003:d8:2f1a:3700:2982:b5f7:a04e:4cb4]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e24420csm45559825e9.20.2025.06.13.02.27.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Jun 2025 02:27:05 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, David Hildenbrand , Andrew Morton , Alistair Popple , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Dan Williams , Oscar Salvador , Jason Gunthorpe , stable@vger.kernel.org Subject: [PATCH v3 1/3] mm/huge_memory: don't ignore queried cachemode in vmf_insert_pfn_pud() Date: Fri, 13 Jun 2025 11:27:00 +0200 Message-ID: <20250613092702.1943533-2-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613092702.1943533-1-david@redhat.com> References: <20250613092702.1943533-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TKLdgKW3VJURQ-sYtRWQ3KnW0j-TvEdQ4f6JC0dVH3U_1749806826 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: 45qpp7j376k6foe4og46qrowzs73swg1 X-Rspamd-Queue-Id: 7A3E2C000A X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1749806829-886362 X-HE-Meta: U2FsdGVkX1+K+3B73pIP97mTyfWqGuj5TNvZYPScPqhS2r1F0mZwGzUEkDcUqIs26ieNyEa6zGD73HxqzhCH9O4eG4LikX0F50Kfg4kvlACQFlxOBETe1mpCw6aOQch3+jNQpUhnFcHGo3nC7ZYwjwLaiJGK75Lp2EWayDT1Nm1psz/OjYKZPwd91YjmtZKXqJnxlu+PF60zdGSxdLONOAUSY0bzQq2hvTMIXXLflpYc4QvdLcYy7EReR5HsSW6l4KPEZM64Cdl6tw4gmZo+Ct6TJ0JyCLgnRDHzHy/YByI/Sr3SBIe7HOGfOPZ+txKhmW2MNQh1HvA6kPnpQSj/cnpiORA3hWGMIpMcv3J8DqyJYXTkhdvUDxUVQexVtnH/uNzoKWRcwvi1d1KF0o4ZPwgxei6mbX4mFaQaLyp75yPV+BMR8rv+9BvTJIeL5oWZ4bseMAEwKy73tMT3hS3UjNfoj7r8alDpiSu7SZpUzZ+cDyQY3bmDc5+7BjABaZ0be74gbrfCMR4bEgHAqtdu/sVxAKY9TmhNmRnM0IFctAgZMv6gN3jQp4Fbqp1BmlebXoFEn805q2Cet4vws9ZLU4AfV3Mmuh4R0LuKQWj0RcagC7ZurNRDlSye1hMJc66HRH7fB8uVmCnCYQEuSO73bkRfHylk7HbT74ylphxeaZKKL/OMSB6H3l5z/6SeCKMwX14dWSmXc/7H5DBwBRNCYY8Cno7d4MoNjtr7js0Z2XOHS+J/s7OeuHYDPzPoBVYVlg4f4HI/7Hf6Jgl36yFm40aV2hfvBvRBCPNzNwgXsl0Ig6R74niwCeRBg0/swECssHtOZivseAX7hpGKFyOc5LuSbh+Xf99vp99wvo9AmQ3lD8qbIMPsPVgVpjsuz5qo2lnCmxD25p+WsoM3OMzciDSUVyZvWzjKFapIUYLQr+PjO6g3KYnVfOgmvqMTXyhASou3Uz5HlbwGnP5o0PL d2zNrj7H gt+WivWew02y1u9uicUUqILkBDTVSe285+vD0xF8/BHl8xiv/3xx66J/qiYRhID89eEUEMa2EsA91JEsMaJIKbwsKqPKUXkksbzphVTsmi4Dg3bpdN7+tfHnSw1eEHF/HE6Ml71GEgcZRw/h7nFJUDyQtyu+r4Gp35oqEGCUHHe+Xtf69OVMXDAzH2/t9XdxeAMEUrw11/1tfETKuc40LjCQtrnK1JPgtFPsTTHZf67oaDPcLLLcevjcs16y6AscZ7DlNFwPcqghfxl9/X4QCtw6UHBczec3mohyc15CzfVyZDWFloaLHn8/2sOJu68jMfbo+z8TePVRLXi+d3+PrsxM1h9DDD4LtcALUf00MmoGSthzCP7JCvUIVNaimoSrVpatjVvXvEbEChlynZWa4CifaOvTOBhn7oFQiY76Q2bHkTGxWjzoyxPfhz8JJzVheL+qlhUv9NJa/I5A3KfHAu/+Z8LngZy4Xkza06OaSz7gWOUQcnFa/R2zvSKANCMHqzoa5mCZ2rWGjuxd3WXZETO+VzvhqsvTVyAnWttToqxtzoXEyH4X8g7+gf1BGxX311UQzmfzmGGfMowHWl0FLAQdaHnnKnblC2LQ49/SrA3nhyYLmkmuWFo/lNM6VIaDVdmh3 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: We setup the cache mode but ... don't forward the updated pgprot to insert_pfn_pud(). Only a problem on x86-64 PAT when mapping PFNs using PUDs that require a special cachemode. Fix it by using the proper pgprot where the cachemode was setup. It is unclear in which configurations we would get the cachemode wrong: through vfio seems possible. Getting cachemodes wrong is usually ... bad. As the fix is easy, let's backport it to stable. Identified by code inspection. Fixes: 7b806d229ef1 ("mm: remove vmf_insert_pfn_xxx_prot() for huge page-table entries") Reviewed-by: Dan Williams Reviewed-by: Lorenzo Stoakes Reviewed-by: Jason Gunthorpe Tested-by: Dan Williams Cc: Signed-off-by: David Hildenbrand --- mm/huge_memory.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d3e66136e41a3..49b98082c5401 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1516,10 +1516,9 @@ static pud_t maybe_pud_mkwrite(pud_t pud, struct vm_area_struct *vma) } static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, - pud_t *pud, pfn_t pfn, bool write) + pud_t *pud, pfn_t pfn, pgprot_t prot, bool write) { struct mm_struct *mm = vma->vm_mm; - pgprot_t prot = vma->vm_page_prot; pud_t entry; if (!pud_none(*pud)) { @@ -1581,7 +1580,7 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write) pfnmap_setup_cachemode_pfn(pfn_t_to_pfn(pfn), &pgprot); ptl = pud_lock(vma->vm_mm, vmf->pud); - insert_pfn_pud(vma, addr, vmf->pud, pfn, write); + insert_pfn_pud(vma, addr, vmf->pud, pfn, pgprot, write); spin_unlock(ptl); return VM_FAULT_NOPAGE; @@ -1625,7 +1624,7 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, add_mm_counter(mm, mm_counter_file(folio), HPAGE_PUD_NR); } insert_pfn_pud(vma, addr, vmf->pud, pfn_to_pfn_t(folio_pfn(folio)), - write); + vma->vm_page_prot, write); spin_unlock(ptl); return VM_FAULT_NOPAGE; -- 2.49.0