From nobody Fri Oct 10 13:31:34 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53645291C18 for ; Fri, 13 Jun 2025 09:27:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806832; cv=none; b=ehWWKoudrceVY0X7lSZu4TbSJ/l/4RUQfbzQxkfYc9942ZZJHX7s63NCyfqHgGthK+M8AknGeB20otxh0VERQnLRcN8XS3yt6PYLWHHgqBno14D8PSi1UeAPusc5KI3sYIu/3wEijuK1ALGcJy+cEr0JsSF5fY7ngn8rdVTyQHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806832; c=relaxed/simple; bh=j64RqC0yW0IWSRsztwobsHrNoaRlkxqGA0a2OxsS0xI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lCuLkh0FAVJ0QihBVIdSBpPGKST8LVb7FbBNJFeGbdTMxnAUwGuP29ticZaS2WZgdXuuP8Dx7M4VhIQrjsW2BXB7Y8lrD3JJo9o3k+aMr/HaJZaPKt86YLSyaDiShP09Thzc7rg94jwmIxPMsJlT6jHzPcEOg7WEHryZn3KMUBg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VoMvOIG5; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VoMvOIG5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749806829; 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=BuuwdyX0QESH0B5VKvKy/eQpha6SfRiQdyfEZdmDLAI=; b=VoMvOIG5qFto6K6KtW/tzWAd20autHPZUCAPlLloAMSWvnFeC4CsN7RqiVAjSlYZcssepe r2cXd32RAGLnoiOmt8Fx+hCTqH2kax45HG8YSllCvezdXcU9+5CQlZwl1bXTvYe5O2yJqr SPbsfK6xC8yOkkpTXYLTeWxy2LF9xm8= 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-509-ZijaZ-BSMqafVwVlys2MSg-1; Fri, 13 Jun 2025 05:27:07 -0400 X-MC-Unique: ZijaZ-BSMqafVwVlys2MSg-1 X-Mimecast-MFC-AGG-ID: ZijaZ-BSMqafVwVlys2MSg_1749806826 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450787c8626so14874435e9.1 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=lU+EThH4jKdOaqzTEsbuAs4lJIspF251qfcZnC4qqoAB9Wc7k4LlNoxizWOKfzyfL+ rILfV3MioZ/lTIz7+NF3jFJZe4KUCcJ9SMNQa2bzwAHkWkyZGtHbJ5712pHJzAIzYNyT vVkQHZ8C5GOc44CBn6RhyE6nxu64FrdhcFtIz2x9pomTMZQBQJDXAsuS9MU22oR/p1gb pWlCSSguKKAl/pPKH4Cack4tND9psqxGnWLAulujIXZOMYDeNK9fFEMSLuxnLYDzF5zk qSt2HfZ1+rrr+7l9nCiC1Msb71qgak9bSSJTlgheB2RxFcMvRxM01GudAXc7MKL18yFg r2jg== X-Gm-Message-State: AOJu0YyYOPy9e//qZAhYhSvVSA+LrA0kWXv5flY3Y8KxJELb0CtPDWKe mf9QWPS/wQB5qlTQqooKVd7cDsMeGPD5KMhxySGTXWCC7rj/Ey+b/gMoRE/OzIQpADaWoOShR6j yMzIj8uDb8wTfjZtJ+rTtawJZ0aROhCPlO0zRMFnDZlGl8H++WaQApLR/mN4ZF93vL7iWH8A2fF JhMcDHmbOfdUJ6tqfMTfkLL+qyWMUyRWSf2fLdcO0Vi0oWfgbc X-Gm-Gg: ASbGncvm1+QH6BSpT+1XNM+7uGNqwzbUQMxYUdb/rJ7q/Fcv+JfUg/Qf5qq6pPn7XIt pIgAtpl37HKaiKLwg71KDhocQem3huh7/zVDk2xQCA0iNMyvxnCZMB6kLdGVga2ow0Md8NUfa0Q 9o7iEpEfvEeNY6ICZuM878tRYR8NTzp9gavb7dDfNZXsSwWe8agtOsiW2gZYlIfCc2Ik8mv7mo6 2zgTw4IjLr0+vFiSyMadZEAXyuckaajvlWLmFpMiMTc1Snzwfb9wuFoaKeWFLs+Dc1NwErLfZev O/r+JFgeqBkQniYKpWW254O3bohtbLlCykLk3NDhFyianIXc5+AF29TMrJtGCXdnPoum0CWWxVD GM0bMolY= X-Received: by 2002:a05:600c:8b44:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-45334ad836amr23540885e9.17.1749806826485; 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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-ta= ble entries") Reviewed-by: Dan Williams Reviewed-by: Lorenzo Stoakes Reviewed-by: Jason Gunthorpe Tested-by: Dan Williams Cc: Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador --- 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) } =20 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 =3D vma->vm_mm; - pgprot_t prot =3D vma->vm_page_prot; pud_t entry; =20 if (!pud_none(*pud)) { @@ -1581,7 +1580,7 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, p= fn_t pfn, bool write) pfnmap_setup_cachemode_pfn(pfn_t_to_pfn(pfn), &pgprot); =20 ptl =3D 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); =20 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); =20 return VM_FAULT_NOPAGE; --=20 2.49.0 From nobody Fri Oct 10 13:31:34 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74042C158A for ; Fri, 13 Jun 2025 09:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806834; cv=none; b=WfIql3/50oPuJQMyPc+A5rvvz7j46rufH1nnOUZDVpnyRmSudwC6r2+hi9C9zI5XPq6reQw+H0JcPg5xLsA1d0lFIuyqy5Gv3PAdSNqLOwB1dT3xC5JyYl5nm0lV2sJ9QjvgqKILUN8iUDYnSMB2N4HF8VkrFIYnI6AYtkLZ+8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806834; c=relaxed/simple; bh=I6rFqh4q3G6JolUrUnqDfQkAwN4FRP8LLGB+fl8jl+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sm0XR15klPgCPXn7Zbbo/UjN+uB+dS7LByMd5wq5YqImqnb1vEx6z+nU2lCBEEVs1bO1IPh8dPSzW1NE8tPSQC3AUVXyZpfZISn5ODeJU/5ebfBDLzmZm00c62XY5QGyuY3jz+UHlO1iifQtpjvFFC16lhWvRN1iKtdg7Sv5WsI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Oroj7Ci6; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Oroj7Ci6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749806831; 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=uggfBUR9d238l1g+jci/3gzcAR2fLsDD8UO38owVDeE=; b=Oroj7Ci6csAvB/+VK4l14P27cU6ZDmTjfaF9OOieYqGQPTgR/wAI7DAXX2n9Be+thuDxni A8fuRx1lK84tbxv347zl8BipAhoP+OmX7xQlXi2Zu8yyXXANpHk3OuWgxtnkPY6ZesFhJR OEp2DeuKlBEywIyFKRUWlrzL7WGGvBk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-qTes6yXfM8SODeJvgmdv2Q-1; Fri, 13 Jun 2025 05:27:09 -0400 X-MC-Unique: qTes6yXfM8SODeJvgmdv2Q-1 X-Mimecast-MFC-AGG-ID: qTes6yXfM8SODeJvgmdv2Q_1749806829 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4530623eb8fso14872185e9.0 for ; Fri, 13 Jun 2025 02:27:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749806828; x=1750411628; 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=uggfBUR9d238l1g+jci/3gzcAR2fLsDD8UO38owVDeE=; b=ofebfwn2mmF5YBq63AP1Vgivah7RTGgAA91B5wpTMXOyLjOK1UVpJet5JyzjYX0wcg JViJdidOGWJmvYvBhXXrow+Evb7OVL9VzzV2k2IiOFAxIeIYV9MaB3gUzOefFdwbgYoF aSOGj3ZJcNEuExpIlBuTgKe4/+SdHNYcvtxWkm3yIXzaO8dVy62EPWc5bo1fE90xHJ0N +ZQvnJkxV9f0k85xVBEnQjQ3L7X6oZ5SGg1IeCk5qlkK/QEvRN3u01lpi3tXgXELUyCJ Fuo/CVksdEWVLc0hCjnggwwJPmYBnwRw+5BqMkD0kE029FsN7JT+jPb7RMTAHbXR32Q7 mCrQ== X-Gm-Message-State: AOJu0Yy+u07j/EecHTocKbYW3pA5F4EQ1akkkfWU8H4IHtvTQ8Tssc5k NFl3tAMu2emoNp0db+Uu+NEHYLCH76WrQc0UF5svsNGjQGkGTQwyG12jytewe2w7exhzv21gj/L JGB1+6AnAhT4onWxVf7d/T1y57+i8d7M8YMOsAX8j5vu8rFpKSBZGHkaSE+8UYBTYCAM0ctk9r8 3oOCvwm8FpyJEInsSt9mE2r1GQMrEnk/FsdhzXZSioAPSSNnxn X-Gm-Gg: ASbGncsKACijYZ0sB7zq2CzNoHUbqgKoG+ZjYE60ukQo+ou1ou5HXeRQmYT3G7ond3S geLbi5MuZxJEwva2TAsZJ+KVKm/awHgSD7QlfIFKR3gcNKlUnK1M3WbGILldUuhKytS0wUcEJJU TjuJ2MeMqk+hqhzCF64J732rE3gaEMlkjRIDu8OLI9A1rzyucYHGPVcLjtIs4cxM4EVCvptpjpn utPdlpMcXV39fF9RmbzmzVyVzvC1hCqCQVX40Ec5MGrgHyot35zQsdrMBN/n247XaYrfCzScatP S2f289yrPoag7eiWud8o5h9pJuA+T5KQ2oe9B88ISUwWkdm6tgVrfUiqi+kHBJyfFI1Kyr54b+8 caeRKVHQ= X-Received: by 2002:a05:600c:3555:b0:442:ffa6:d07e with SMTP id 5b1f17b1804b1-45334ae3072mr20022175e9.1.1749806828596; Fri, 13 Jun 2025 02:27:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+Xfy0kGImh9fcGzc/29deoEfQtCD94y9Y0vrqw5H+9WvgHxYhYPUGGxGlHloUQMOpNTtnSw== X-Received: by 2002:a05:600c:3555:b0:442:ffa6:d07e with SMTP id 5b1f17b1804b1-45334ae3072mr20021745e9.1.1749806828156; Fri, 13 Jun 2025 02:27:08 -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 ffacd0b85a97d-3a568b28240sm1774029f8f.72.2025.06.13.02.27.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Jun 2025 02:27:07 -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 Subject: [PATCH v3 2/3] mm/huge_memory: don't mark refcounted folios special in vmf_insert_folio_pmd() Date: Fri, 13 Jun 2025 11:27:01 +0200 Message-ID: <20250613092702.1943533-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Marking PMDs that map a "normal" refcounted folios as special is against our rules documented for vm_normal_page(): normal (refcounted) folios shall never have the page table mapping marked as special. Fortunately, there are not that many pmd_special() check that can be mislead, and most vm_normal_page_pmd()/vm_normal_folio_pmd() users that would get this wrong right now are rather harmless: e.g., none so far bases decisions whether to grab a folio reference on that decision. Well, and GUP-fast will fallback to GUP-slow. All in all, so far no big implications as it seems. Getting this right will get more important as we use folio_normal_page_pmd() in more places. Fix it by teaching insert_pfn_pmd() to properly handle folios and pfns -- moving refcount/mapcount/etc handling in there, renaming it to insert_pmd(), and distinguishing between both cases using a new simple "struct folio_or_pfn" structure. Use folio_mk_pmd() to create a pmd for a folio cleanly. Fixes: 6c88f72691f8 ("mm/huge_memory: add vmf_insert_folio_pmd()") Reviewed-by: Jason Gunthorpe Reviewed-by: Lorenzo Stoakes Reviewed-by: Dan Williams Tested-by: Dan Williams Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador Reviewed-by: Oscar salvador --- mm/huge_memory.c | 59 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 49b98082c5401..d1e3e253c714a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1372,9 +1372,17 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_faul= t *vmf) return __do_huge_pmd_anonymous_page(vmf); } =20 -static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t *pmd, pfn_t pfn, pgprot_t prot, bool write, - pgtable_t pgtable) +struct folio_or_pfn { + union { + struct folio *folio; + pfn_t pfn; + }; + bool is_folio; +}; + +static int insert_pmd(struct vm_area_struct *vma, unsigned long addr, + pmd_t *pmd, struct folio_or_pfn fop, pgprot_t prot, + bool write, pgtable_t pgtable) { struct mm_struct *mm =3D vma->vm_mm; pmd_t entry; @@ -1382,8 +1390,11 @@ static int insert_pfn_pmd(struct vm_area_struct *vma= , unsigned long addr, lockdep_assert_held(pmd_lockptr(mm, pmd)); =20 if (!pmd_none(*pmd)) { + const unsigned long pfn =3D fop.is_folio ? folio_pfn(fop.folio) : + pfn_t_to_pfn(fop.pfn); + if (write) { - if (pmd_pfn(*pmd) !=3D pfn_t_to_pfn(pfn)) { + if (pmd_pfn(*pmd) !=3D pfn) { WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); return -EEXIST; } @@ -1396,11 +1407,20 @@ static int insert_pfn_pmd(struct vm_area_struct *vm= a, unsigned long addr, return -EEXIST; } =20 - entry =3D pmd_mkhuge(pfn_t_pmd(pfn, prot)); - if (pfn_t_devmap(pfn)) - entry =3D pmd_mkdevmap(entry); - else - entry =3D pmd_mkspecial(entry); + if (fop.is_folio) { + entry =3D folio_mk_pmd(fop.folio, vma->vm_page_prot); + + folio_get(fop.folio); + folio_add_file_rmap_pmd(fop.folio, &fop.folio->page, vma); + add_mm_counter(mm, mm_counter_file(fop.folio), HPAGE_PMD_NR); + } else { + entry =3D pmd_mkhuge(pfn_t_pmd(fop.pfn, prot)); + + if (pfn_t_devmap(fop.pfn)) + entry =3D pmd_mkdevmap(entry); + else + entry =3D pmd_mkspecial(entry); + } if (write) { entry =3D pmd_mkyoung(pmd_mkdirty(entry)); entry =3D maybe_pmd_mkwrite(entry, vma); @@ -1431,6 +1451,9 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, p= fn_t pfn, bool write) unsigned long addr =3D vmf->address & PMD_MASK; struct vm_area_struct *vma =3D vmf->vma; pgprot_t pgprot =3D vma->vm_page_prot; + struct folio_or_pfn fop =3D { + .pfn =3D pfn, + }; pgtable_t pgtable =3D NULL; spinlock_t *ptl; int error; @@ -1458,8 +1481,8 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, p= fn_t pfn, bool write) pfnmap_setup_cachemode_pfn(pfn_t_to_pfn(pfn), &pgprot); =20 ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); - error =3D insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, - pgtable); + error =3D insert_pmd(vma, addr, vmf->pmd, fop, pgprot, write, + pgtable); spin_unlock(ptl); if (error && pgtable) pte_free(vma->vm_mm, pgtable); @@ -1474,6 +1497,10 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf= , struct folio *folio, struct vm_area_struct *vma =3D vmf->vma; unsigned long addr =3D vmf->address & PMD_MASK; struct mm_struct *mm =3D vma->vm_mm; + struct folio_or_pfn fop =3D { + .folio =3D folio, + .is_folio =3D true, + }; spinlock_t *ptl; pgtable_t pgtable =3D NULL; int error; @@ -1491,14 +1518,8 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf= , struct folio *folio, } =20 ptl =3D pmd_lock(mm, vmf->pmd); - if (pmd_none(*vmf->pmd)) { - folio_get(folio); - folio_add_file_rmap_pmd(folio, &folio->page, vma); - add_mm_counter(mm, mm_counter_file(folio), HPAGE_PMD_NR); - } - error =3D insert_pfn_pmd(vma, addr, vmf->pmd, - pfn_to_pfn_t(folio_pfn(folio)), vma->vm_page_prot, - write, pgtable); + error =3D insert_pmd(vma, addr, vmf->pmd, fop, vma->vm_page_prot, + write, pgtable); spin_unlock(ptl); if (error && pgtable) pte_free(mm, pgtable); --=20 2.49.0 From nobody Fri Oct 10 13:31:34 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 374E3291C3D for ; Fri, 13 Jun 2025 09:27:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806836; cv=none; b=tpIZj40vvsTWbtGMVl1J98VL3T+bLdJp5iqGrJK0zXIANkzcLGxTwgWBAb937Cwz2YQqlqSBJRNkUBtgwL/QZMcoTVxaiwfU8CHw5vqhrkW6Bci6+3TLeroaAaYLKvG7Qh63LKb1aV6oAio6hekbi7qNijtNi5aIeCoK5Eq9wj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749806836; c=relaxed/simple; bh=6tO5VYLM2T1L+Bh5vole73WL1rOpW9UksZR14TfFrDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ay4H99jaNYrOgOmgbk0Fg5fDCOk/3QL7YQIMOu5RujqEZoDbtTu+piwZXnOzVEdGbLxfna/xlFWcgSyL/H1y9iuQw7woKQUphnSXdLjJrbTlwTEM4kkBMKa+O2kBWqiG8wH7nm824/ZIff+GQOuHuFk53dvrpAW/aRLHj8/RSGw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZY7J3FhU; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZY7J3FhU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749806833; 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=dB/Gx1sOYTj3RBFxV3FcA/SYk77nCJNbmnFBuqoX6J8=; b=ZY7J3FhUj0bkocl6UYlyWONxZdwrG/E9vEp4BMHBJ6jV36aTnquCJ/annteQyh6kDYPmLf eO916XeaDThvtd39UgpFct8f2sUVYvkW91lw1FJ4ZMw+hi9ViSAILxMAd1vHWOZObLdwd3 fn3BaBis5nsjHPZ2dEq+H4FLo/J6w9E= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-286-cuEw5A5VNoCrShWqcd4QpA-1; Fri, 13 Jun 2025 05:27:11 -0400 X-MC-Unique: cuEw5A5VNoCrShWqcd4QpA-1 X-Mimecast-MFC-AGG-ID: cuEw5A5VNoCrShWqcd4QpA_1749806831 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4edf5bb4dso1491902f8f.0 for ; Fri, 13 Jun 2025 02:27:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749806830; x=1750411630; 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=dB/Gx1sOYTj3RBFxV3FcA/SYk77nCJNbmnFBuqoX6J8=; b=qSSqJzvMV/RkGvkW4ts9TbvBOpibTXtxMelgXM13OLYxE1XcfL3sQgX8el0VpL059u 9KoqxDYtlaWVbkXvPWj4rh5W/zMcJUQz110Wl7Oz14Iw8+DkQNKj2Me+diRNTj9KDE17 0eq9Q8zkeQYxDrxTXvVBkzh5as5HQvZIM6KP1/RC6EfeCi7jiShG+ZLvOba8/AL/s6cm 6ACYI5fhQiTIYoi3C5vDd6nfPy1cStmgaspAXTEVyhDDGXiV4C8SUNu8vxSKgEZmSq7r beI/y8RlFv8apLj1TpAtYuXULxRCtz4wKaFn1bv7zTz5BIM4JbePUAmMtxn1Xq50f/MB GjcQ== X-Gm-Message-State: AOJu0Yw5yflE/thx9e/jzWlJ0xzyDTtn2Bg9AN47RqOmRr7TVbQZbdob mJrAulOh+cW5LLFJMe/3E+z1U7rOIniaom75bax+XdiMI8R0hT7XZlhzFQ6yz62LxgZWhgQGAXX S24KONoKOhaT3PgYhFfxdXPFTJhSeP/NRtlOZfMt0taPiZTjA1GsJUVFSLUjY+zIzLLyXJo4hpd jpO1M9MFGBuK1+bgHwjKJQPBnGinRDRKzYvYmf0vhE96QgTFBB X-Gm-Gg: ASbGnct6Z5v6lXr91ooF5ytdd37PjC7FdLXINM8nggoQYLkYh1/EdOIARq+hzZDczA5 Rggz+E/6Sd5WUNYRVIwu6KqSJ5sEBQFC1FewqBFkkdLvVWqPiZRl9rcqhDlpgFC5o+E8SMhDsuU yEc642Vfs2eFDu1Hc/kG8KvrnUQYwJrqqFs/UY2sFr3zRTbxmdxAGMkFBUq8JwGvNS+J5re/tVQ GrFvcqNTkcbKoTrsIUIstz4L6Mte9hfPeUOdKZBtErXwFeKtdek4P1lgAx3Cr33BUOxlcNr+2NT RIj6JYU+BssLVY+ioC1Nj8M4AW1E1C0MByXrBm1zUenWQDi5bL/ro8WazlyasvlPyfjyGzOhufY grcZOrHo= X-Received: by 2002:a05:6000:24c8:b0:3a4:f787:9b58 with SMTP id ffacd0b85a97d-3a56874a137mr2481392f8f.58.1749806830569; Fri, 13 Jun 2025 02:27:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqj6NdODj43XbLFVDeV1qD7UYHV1rn0TfwsC4tf99O0oNc/40w2gplW02JFKnmYY0c01aDOg== X-Received: by 2002:a05:6000:24c8:b0:3a4:f787:9b58 with SMTP id ffacd0b85a97d-3a56874a137mr2481334f8f.58.1749806829879; Fri, 13 Jun 2025 02:27:09 -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 ffacd0b85a97d-3a5689e5f3dsm1827987f8f.0.2025.06.13.02.27.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Jun 2025 02:27:09 -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 Subject: [PATCH v3 3/3] mm/huge_memory: don't mark refcounted folios special in vmf_insert_folio_pud() Date: Fri, 13 Jun 2025 11:27:02 +0200 Message-ID: <20250613092702.1943533-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Marking PUDs that map a "normal" refcounted folios as special is against our rules documented for vm_normal_page(). normal (refcounted) folios shall never have the page table mapping marked as special. Fortunately, there are not that many pud_special() check that can be mislead and are right now rather harmless: e.g., none so far bases decisions whether to grab a folio reference on that decision. Well, and GUP-fast will fallback to GUP-slow. All in all, so far no big implications as it seems. Getting this right will get more important as we introduce folio_normal_page_pud() and start using it in more place where we currently special-case based on other VMA flags. Fix it just like we fixed vmf_insert_folio_pmd(). Add folio_mk_pud() to mimic what we do with folio_mk_pmd(). Fixes: dbe54153296d ("mm/huge_memory: add vmf_insert_folio_pud()") Reviewed-by: Dan Williams Reviewed-by: Lorenzo Stoakes Reviewed-by: Jason Gunthorpe Tested-by: Dan Williams Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador --- include/linux/mm.h | 19 ++++++++++++++++- mm/huge_memory.c | 52 ++++++++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index fa538feaa8d95..912b6d40a12d6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1816,7 +1816,24 @@ static inline pmd_t folio_mk_pmd(struct folio *folio= , pgprot_t pgprot) { return pmd_mkhuge(pfn_pmd(folio_pfn(folio), pgprot)); } -#endif + +#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD +/** + * folio_mk_pud - Create a PUD for this folio + * @folio: The folio to create a PUD for + * @pgprot: The page protection bits to use + * + * Create a page table entry for the first page of this folio. + * This is suitable for passing to set_pud_at(). + * + * Return: A page table entry suitable for mapping this folio. + */ +static inline pud_t folio_mk_pud(struct folio *folio, pgprot_t pgprot) +{ + return pud_mkhuge(pfn_pud(folio_pfn(folio), pgprot)); +} +#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */ +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif /* CONFIG_MMU */ =20 static inline bool folio_has_pincount(const struct folio *folio) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d1e3e253c714a..bbc1dab98f2f7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1536,15 +1536,18 @@ static pud_t maybe_pud_mkwrite(pud_t pud, struct vm= _area_struct *vma) return pud; } =20 -static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, - pud_t *pud, pfn_t pfn, pgprot_t prot, bool write) +static void insert_pud(struct vm_area_struct *vma, unsigned long addr, + pud_t *pud, struct folio_or_pfn fop, pgprot_t prot, bool write) { struct mm_struct *mm =3D vma->vm_mm; pud_t entry; =20 if (!pud_none(*pud)) { + const unsigned long pfn =3D fop.is_folio ? folio_pfn(fop.folio) : + pfn_t_to_pfn(fop.pfn); + if (write) { - if (WARN_ON_ONCE(pud_pfn(*pud) !=3D pfn_t_to_pfn(pfn))) + if (WARN_ON_ONCE(pud_pfn(*pud) !=3D pfn)) return; entry =3D pud_mkyoung(*pud); entry =3D maybe_pud_mkwrite(pud_mkdirty(entry), vma); @@ -1554,11 +1557,20 @@ static void insert_pfn_pud(struct vm_area_struct *v= ma, unsigned long addr, return; } =20 - entry =3D pud_mkhuge(pfn_t_pud(pfn, prot)); - if (pfn_t_devmap(pfn)) - entry =3D pud_mkdevmap(entry); - else - entry =3D pud_mkspecial(entry); + if (fop.is_folio) { + entry =3D folio_mk_pud(fop.folio, vma->vm_page_prot); + + folio_get(fop.folio); + folio_add_file_rmap_pud(fop.folio, &fop.folio->page, vma); + add_mm_counter(mm, mm_counter_file(fop.folio), HPAGE_PUD_NR); + } else { + entry =3D pud_mkhuge(pfn_t_pud(fop.pfn, prot)); + + if (pfn_t_devmap(fop.pfn)) + entry =3D pud_mkdevmap(entry); + else + entry =3D pud_mkspecial(entry); + } if (write) { entry =3D pud_mkyoung(pud_mkdirty(entry)); entry =3D maybe_pud_mkwrite(entry, vma); @@ -1582,6 +1594,9 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, p= fn_t pfn, bool write) unsigned long addr =3D vmf->address & PUD_MASK; struct vm_area_struct *vma =3D vmf->vma; pgprot_t pgprot =3D vma->vm_page_prot; + struct folio_or_pfn fop =3D { + .pfn =3D pfn, + }; spinlock_t *ptl; =20 /* @@ -1601,7 +1616,7 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, p= fn_t pfn, bool write) pfnmap_setup_cachemode_pfn(pfn_t_to_pfn(pfn), &pgprot); =20 ptl =3D pud_lock(vma->vm_mm, vmf->pud); - insert_pfn_pud(vma, addr, vmf->pud, pfn, pgprot, write); + insert_pud(vma, addr, vmf->pud, fop, pgprot, write); spin_unlock(ptl); =20 return VM_FAULT_NOPAGE; @@ -1623,6 +1638,10 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf= , struct folio *folio, unsigned long addr =3D vmf->address & PUD_MASK; pud_t *pud =3D vmf->pud; struct mm_struct *mm =3D vma->vm_mm; + struct folio_or_pfn fop =3D { + .folio =3D folio, + .is_folio =3D true, + }; spinlock_t *ptl; =20 if (addr < vma->vm_start || addr >=3D vma->vm_end) @@ -1632,20 +1651,7 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf= , struct folio *folio, return VM_FAULT_SIGBUS; =20 ptl =3D pud_lock(mm, pud); - - /* - * If there is already an entry present we assume the folio is - * already mapped, hence no need to take another reference. We - * still call insert_pfn_pud() though in case the mapping needs - * upgrading to writeable. - */ - if (pud_none(*vmf->pud)) { - folio_get(folio); - folio_add_file_rmap_pud(folio, &folio->page, vma); - 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)), - vma->vm_page_prot, write); + insert_pud(vma, addr, vmf->pud, fop, vma->vm_page_prot, write); spin_unlock(ptl); =20 return VM_FAULT_NOPAGE; --=20 2.49.0