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 A6B27C677C4 for ; Wed, 11 Jun 2025 12:07:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DB436B009A; Wed, 11 Jun 2025 08:07:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 38BC76B009D; Wed, 11 Jun 2025 08:07:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 254226B009F; Wed, 11 Jun 2025 08:07:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id ED24A6B009A for ; Wed, 11 Jun 2025 08:07:20 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 90B4D804B3 for ; Wed, 11 Jun 2025 12:07:20 +0000 (UTC) X-FDA: 83542994640.18.C0C3D20 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 8966DA000E for ; Wed, 11 Jun 2025 12:07:18 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iWZHhZ1y; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749643638; 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=gYmY9lqRnj4cw3caoSyKqMYCbf0QdwGbw8D5FFvmOek=; b=kbuwAh+XovvJL4kQ9lljhuFw7VyYbIYGa7b9vfzOBCle7aRJ0aYILmm1DUngSKGZiKzuSO vMCAEtLyvH333ur3WgVvPVJXjhww+vTJjzW2EF/4aGDyHrLM+25IDG5FQG3f1ZMRJSukoi uAk+Du/iJtlKEEAOIT4LyP9UrlKZ/lw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iWZHhZ1y; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749643638; a=rsa-sha256; cv=none; b=pydlbzGKMewf7m28MLqcXjYEe26/LmuKJU5zam2faV/CCHObwxvqHlFeeVXOmyas3ZAwLh qqzHvjJIaGiB8vJgmP+nxoIfNYgTcy5CRDnXeAfRZqzSA8SwqL4PrHr6ZvcuEQlFYwAmMc V8PGYiEskhKh9GXYwxdY5xAf1x5K1Y8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749643637; 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=gYmY9lqRnj4cw3caoSyKqMYCbf0QdwGbw8D5FFvmOek=; b=iWZHhZ1ysz/P6EuKda4EGHMGLdBglUzihMe4W3ozm3w9YztCYz2gd5Z85YiIyGvAkoWuhx zyvxHyeUiL8f/QMnVMcUIeJ6WmQRe3+cqZ2etAM1OjvPsBS1JtrTdSGxpEfubH1J6e4/sM fLst1JVUN3zrxRnnOLHxceSvmiReBLA= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-X7sIgI_MNFGP-0ObjGCf2A-1; Wed, 11 Jun 2025 08:07:11 -0400 X-MC-Unique: X7sIgI_MNFGP-0ObjGCf2A-1 X-Mimecast-MFC-AGG-ID: X7sIgI_MNFGP-0ObjGCf2A_1749643629 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4a585ad6726so224525021cf.3 for ; Wed, 11 Jun 2025 05:07:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749643629; x=1750248429; 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=gYmY9lqRnj4cw3caoSyKqMYCbf0QdwGbw8D5FFvmOek=; b=QwTvAsZiSGydUMtzHo9Uwj+uQ2pGzSpEYZQOMENDtClj/Q6ZfBq2Zr3hqCRI7/L4by ND/XVVbZRqAXr3hhe6cT/8cgJqkk77DeWy29Yfpw7bbQn65dgK7n1FJjgUH9T/sG/86U +EjutXFJr+RZUS0xLYdsqe8BHPNdpI3Az+SIX1kVoKk3pgWapA/a8hrHw3URUTnrCSAY EKWUqvNjA/gGtCvFIBHGGGh+4MS9erlwh88KlO4xQhaBeskjXEuwqX+H8WzdixKpf2Kp sGPfJu4IPfk3Rfh3H2id/e/wXW+bPJXZ3/aYG24n7zb2vZNdfXQhvBJyiOFsnSwXS0TS 2m/A== X-Gm-Message-State: AOJu0YyPTkppLJ/tNxfDLMHMiyBazIoiWlAm4+L2POPyS1LBR2ZP47wh vS0nvpXRIh5szQPYyjNbC1Gu9Ci7WvIQTxtC35POx/PIgLS5NZh2DezrlR0eRwfxPuT6mLB1VLd shmd8jzii82pwI6b3xMDzJxne5TSKw2CFFeDrRrsjEXlhQ82TvH0t X-Gm-Gg: ASbGncsodXx8FLkGmIko2drxFEKHw8X2MRzvSlKT8WxfpMLBYxWOmPZPdRGC05mB4CH 7WjQW/2siCO//j9RpR1zufKkqSXBsDFPle+DVoJlyDF5fz9Di3qXajkatzdpsn3EGGSisvCKnrj CSKmYotdfff3N+aFf8O91Z36cSbsldz0fdcqpP8yDQV9kxMD7Xx4eh7VPKgSUVVbuglyZgMvlLM lWfGibcAhFDHnrgxFsKu7fl1Na7mMom5ccVbz+k0O7r3MxRAzVYUxcre1JexG+CliWbONzr6oS9 lJ8MEgPzWy1Imlh6RvkdtgYgFcg+8Q/HiEri8hOqDw== X-Received: by 2002:a05:622a:258c:b0:499:23e5:a39e with SMTP id d75a77b69052e-4a714b5f095mr41022901cf.18.1749643629298; Wed, 11 Jun 2025 05:07:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFkRu3pD31QY49jF7czwiN04VZspGiT3brE6ESvHTJ+EUAthmLASS1EV2SOMHG5iqhG7+Byg== X-Received: by 2002:a05:622a:258c:b0:499:23e5:a39e with SMTP id d75a77b69052e-4a714b5f095mr41022301cf.18.1749643628891; Wed, 11 Jun 2025 05:07:08 -0700 (PDT) Received: from localhost (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-4a619865e74sm87713091cf.61.2025.06.11.05.07.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Jun 2025 05:07:08 -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 Subject: [PATCH v2 2/3] mm/huge_memory: don't mark refcounted folios special in vmf_insert_folio_pmd() Date: Wed, 11 Jun 2025 14:06:53 +0200 Message-ID: <20250611120654.545963-3-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611120654.545963-1-david@redhat.com> References: <20250611120654.545963-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VC38NbLFdUu1XXc4r5pwAn5Oym2eoRLgabNb7yK9gUk_1749643629 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8966DA000E X-Stat-Signature: 4439h667scdcjzjsx1y8cty9feb3tsqz X-Rspam-User: X-HE-Tag: 1749643638-174314 X-HE-Meta: U2FsdGVkX1+JDokycTrw0zkqrP4f9pBboTvmhO1cofqDDN81pWHjXD5ahfY2sdfXVH/JrOVWiyWrhuF8tX++P3ZBg9yRx4I0chwqYujfGDAn/R3cpJnXs7pkD1rrdn/4rMh4a6ctZTpt44Knzk+MiCs+7THh/VsTKy/QAPIig/Iwo00GIfbpf+9ioe6CiutTW+N5gWHf21QdmW5qtzhSH+Gk39/6L55NoyuYDf6zGnAoUX0LdZjSgfEUf1I6TVencdOiR5GhXsHKOrpHzPk1DpzKFMbQluOgbI9CqpzCCg/pV6iWP1XvyGqfW1ewilGBd0arsVkRSAyCrarA1KyiuJ0xXA4WCgPbjFKJAWJMp1lUy/L8JPoA5UuiytzXaB2UZZf0BONhZ2+p5Atgi9tzyyXkehwMhcIx7muhMDoe2qQ3bw70glpaG19joe7jsOPBHgGc9TNhQG6u3vTWlt7gkp2xSg1WRuF5tl5vKIpZh8WInrcNg/U1BjUaybe04QKUSndohWsbu9KrCa7mt12RtCVXz/ODHThj6lfztiQGZn0QSo61lUVeBz179vDATrG0c0vwRCtHIn01lkURP2H5ZVU7ruTzVb+Ay4hk8Cg+yldwj6PNPavvqYlq1ff57JBDg4xpzxfhH4fTBry1/fKrb5EDu2uENDp8GJ/YB7EAZLhag4fUSOhfib6YYYdgIONhqHicChmmNKnnbPU7XkjCed0aBdF+xeXlX2DPAkeU6PLbfbfhNDZJ+fgG7qqmmOFrzPIX4hCtv4ml4gyAPtuXfFGi++GLBahZ2Bfe+sA2ysUjlZyvOEUU0Ctgyxt7A2STRuOubH0GPNW4RIcFzh2TYv/6TULhsRnPaEsHb/VPvh5hsKRmxFTy2fvo0b+lTCesIW3PuEf8HBVi58CYpEynDbT5DL9BmjeEjwnpuKlowpI+v9H4BsAsIhd6c7dkDqcud4CQj+FLqlj5U8vkX4O dUefvyEq CHm291bDAkbKBPOPgw7ulvSAz1IFWHA5WDVgjiyHlAPlmFkKn5JhVK1Xw4eBQ4jTy6RaKqWafI7EkpriwMXJd8IZMGuZ71Zl0qfQ+4mjyfWk5XimLonlx4KSNlvbwt8F/JmrR3ZKsd0DgCxFWnRVxR2wbn+V0qWSMZtjVsiOxTpADrVs6bO63YVWXAT2GDABRNiiw 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: Marking PMDs that map a "normal" refcounted folios as special is against our rules documented for vm_normal_page(). 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()") Signed-off-by: David Hildenbrand --- mm/huge_memory.c | 58 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 49b98082c5401..7e3e9028873e5 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_fault *vmf) return __do_huge_pmd_anonymous_page(vmf); } -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 = 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)); if (!pmd_none(*pmd)) { + const unsigned long pfn = fop.is_folio ? folio_pfn(fop.folio) : + pfn_t_to_pfn(fop.pfn); + if (write) { - if (pmd_pfn(*pmd) != pfn_t_to_pfn(pfn)) { + if (pmd_pfn(*pmd) != pfn) { WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); return -EEXIST; } @@ -1396,11 +1407,19 @@ static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, return -EEXIST; } - entry = pmd_mkhuge(pfn_t_pmd(pfn, prot)); - if (pfn_t_devmap(pfn)) - entry = pmd_mkdevmap(entry); - else - entry = pmd_mkspecial(entry); + if (fop.is_folio) { + entry = 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 = pmd_mkhuge(pfn_t_pmd(fop.pfn, prot)); + if (pfn_t_devmap(fop.pfn)) + entry = pmd_mkdevmap(entry); + else + entry = pmd_mkspecial(entry); + } if (write) { entry = pmd_mkyoung(pmd_mkdirty(entry)); entry = maybe_pmd_mkwrite(entry, vma); @@ -1431,6 +1450,9 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write) unsigned long addr = vmf->address & PMD_MASK; struct vm_area_struct *vma = vmf->vma; pgprot_t pgprot = vma->vm_page_prot; + struct folio_or_pfn fop = { + .pfn = pfn, + }; pgtable_t pgtable = NULL; spinlock_t *ptl; int error; @@ -1458,8 +1480,8 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write) pfnmap_setup_cachemode_pfn(pfn_t_to_pfn(pfn), &pgprot); ptl = pmd_lock(vma->vm_mm, vmf->pmd); - error = insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, - pgtable); + error = insert_pmd(vma, addr, vmf->pmd, fop, pgprot, write, + pgtable); spin_unlock(ptl); if (error && pgtable) pte_free(vma->vm_mm, pgtable); @@ -1474,6 +1496,10 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, struct vm_area_struct *vma = vmf->vma; unsigned long addr = vmf->address & PMD_MASK; struct mm_struct *mm = vma->vm_mm; + struct folio_or_pfn fop = { + .folio = folio, + .is_folio = true, + }; spinlock_t *ptl; pgtable_t pgtable = NULL; int error; @@ -1491,14 +1517,8 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, } ptl = 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 = insert_pfn_pmd(vma, addr, vmf->pmd, - pfn_to_pfn_t(folio_pfn(folio)), vma->vm_page_prot, - write, pgtable); + error = insert_pmd(vma, addr, vmf->pmd, fop, vma->vm_page_prot, + write, pgtable); spin_unlock(ptl); if (error && pgtable) pte_free(mm, pgtable); -- 2.49.0