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 A9CC7C71135 for ; Fri, 13 Jun 2025 09:27:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48D9B6B008C; Fri, 13 Jun 2025 05:27:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43EF56B0093; Fri, 13 Jun 2025 05:27:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32D216B0095; Fri, 13 Jun 2025 05:27:16 -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 09D426B008C for ; Fri, 13 Jun 2025 05:27:16 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id ADD8EC16A6 for ; Fri, 13 Jun 2025 09:27:15 +0000 (UTC) X-FDA: 83549848830.04.990F845 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 7E901100003 for ; Fri, 13 Jun 2025 09:27:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JcjyL2jA; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.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=1749806833; 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=dB/Gx1sOYTj3RBFxV3FcA/SYk77nCJNbmnFBuqoX6J8=; b=xaGQx6PB/tQCMTHSps/vGLBv+4Ty3p6bOMp+moTzDMWYoaBwA8zmPwk/t6q8Y9TM8QpADw cV4tq3vxOr5YMknFRc+gUJ/KYqq1NPVbxGonrt3dalEnBW8r64u3Vf3ligVLqHNuZw3Rne BT+Q0zVY2ukpMRWYEzo4ydvT0rRgFUg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749806833; a=rsa-sha256; cv=none; b=avhQyh7HCQY07G747W++hqRe7qDouwMNMU9rR9ih8cFhUd6fmoMEzeWZJwPeXnmm55MZx/ mtH9Huc2edYaAt65wltUQJGmAUNCi2SvsB0h+7Q3JB+lOjNkKgLrFbDXtXqOTVV2aKN7GE tNbhYrAyEveIQ5DS7qF1EvCLuA53YWU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JcjyL2jA; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.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=1749806832; 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=dB/Gx1sOYTj3RBFxV3FcA/SYk77nCJNbmnFBuqoX6J8=; b=JcjyL2jAaYcpr0MNZIgaIo8UaRX/Y0tWmaP4dWcBGQCyVnumDbC2g9wZ5xDouXLFFYAnOO ggruDEg4gtaGPljBAdtW7oU6KZYJ/p1e4Oekp03UkW3nj8fxIICN2HM5ReD4UNZfGNZTKm wmQJvnFBuuLm7/wg4vk1+5kHVI46a+A= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-D-X8wzhhMd-81yq__4DeXw-1; Fri, 13 Jun 2025 05:27:11 -0400 X-MC-Unique: D-X8wzhhMd-81yq__4DeXw-1 X-Mimecast-MFC-AGG-ID: D-X8wzhhMd-81yq__4DeXw_1749806831 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4f3796779so1537066f8f.1 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=EpYS1i+ZyqKWG558sh3xRrdk2AQgos6TQ150XKWQ4Mkbpqe+i9CzaswUfdQKZXZBJd RUz+TDtMEeHp/VxEOn0NVpIRjrOPknOGovkFh3ln8RXpYpKSynL0TBw2vZTtc2Dqd57h Z/+C7RODgJDVsWUDevD6/cY6sShQab24be/OIcQ1q+Y1EMAjjrIwmhC52UR04TS5+Nj5 kEUgY4sR1b/XSU8mxZ6mNp6fGwEAfLhni3To+MdOvWq9E/smMfUhqhMGqUnytf10Maik b2www7wV2iezmVgqUUhr9TJ5LfcHR6RSHRdSdv2UxIWIzjeKXRXBqC/+BfRtncfsLJN1 GFcA== X-Gm-Message-State: AOJu0Yxy9qAYygOUFZ9RXi61LMkn5oyeLl4XoOlnnUGwi09qct2FCTMb 7eeH9f5yOJX4BjyVuzCT0v5WZyTXHrrKFm5yTfOhPR5fDAyKYCBNk0dMgmELp26KeNfoWzg3OEt plM+codJcIqFvhP8nsfIRc1G8RleWD5cQFS1yxJ434rrgtgIXi1Rl X-Gm-Gg: ASbGncuAc/AFuez0wJOspQYkTtP+JdAk4nTGNFdRKMPuXccORix90giWd9Os1y6E1Sd disAPfoc6XhU5394hd4k+bM3JlGQVG5GNqVceiBNukglHPy+98mnCpcm+p+RG1yomPhlvVMeRiH H8woOfLCavBHoeg0dAISgQusR4uY/bYCAHy9qFDVmrrOB8YbRNBCAHw86dQXNK/369Edjph97DZ ND98qJqJ2IKKgDYsY80f30tYyPbJ3S5vMDw5nq/8b/e8ZQiiRfTHZF3HN3+JDXsH1Nz4yCsdeuJ lRiLoeJjCYWi6VNl6flWB3QByJPzl8dYmdp8FO/W/1gEU5Z0slaKqHMjppH9/ur/GSSnWIRDXsB NzFHTxzs= X-Received: by 2002:a05:6000:24c8:b0:3a4:f787:9b58 with SMTP id ffacd0b85a97d-3a56874a137mr2481371f8f.58.1749806830403; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SsxCetj4bg4UBoDjq9LFT7PdHNUS4loduB5sc76Tecs_1749806831 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: p5bc7mj7eecte5fd48s3an587a9cxsju X-Rspamd-Queue-Id: 7E901100003 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1749806833-943108 X-HE-Meta: U2FsdGVkX19NfIHyxV10MI9qSvLJKia0iIhIvBxcO2BdUvZ3T8oymqpdW5Dfg036WlsThZ5SoN9anJJk3nk1xNIvfPqmuem0ITcOqtUNhdSiSXYdsgVOilKJxT1QOM6r3EJxOOiFE9OD4TKpv8s5eoFAwIU44pctOsuGz90KdE4E8xlOcCSmIlm7YJ5s0LGQoye0RJnuBpq67KfTcRSEr7lcdpH1fWCo83XpwryHMACdlQblSIVrtR/CzEUa0cVKe7ZL8ZsfjAyA6+AiEBH8pnXH5tJNi5TFuHs8X5oJXj9pUarsJgiVRReaagbgv+SHeTfLbqYiAUejohl8Kl8xIz9GIqAu5EFOL57bKHLwnSZeorTLRAIcRICMKpWCKDtnAyv8WmwG4N/KdNrXQp4ygowQtbsCKEkasTC0ipkNrFBLGMviuhufWgtkZN7JO18e+NC0CvtmWc6cPikTgR4uKd5p+2Hf5OeNDbndWqbqseoo7wJcPVt/HJE2Ew8482gwp0oDS6Cb0px7ZiUM8/oqiNdk+Bo620G5oxMO0QaiESYYZ5ultAqZZvtA8t4kca3NTy7M3/bsxUthi1H0oqf9hsZHh0YA7QvGsiAGykJZCdMmb0sUOAUE+giFpugnhnDBkdtUXErP3PkgIyTS7dX0ziKcB1uEQk21LYFhj5A9h/Itzx6uI3WnNApnXtL3Mc9j2ab2uGxhc1i/QNvwCuL0XVh+mrEuoOofSwex37pnLAboc2TeMejiTjat+O8A2rLHROtOEv66COoaOBw0AZjidD+yixscex69Nl0n2o/VCjiA7iy+SdRHN8m703Hp9PNtjKR7bAWpDDXdjq5iH8LxOp+rq5kNePadGtaHDS3UR1Y3iPnYU9lKdufJwQEeTyuGAldHBj99H3cQz0uxgV57oKKaMKkeJOGMf6bX0V9r1AKGJ6gByBKgRVNyIl0utFQkQUUzKsV8HMwg/ygM5p5 wxaAH2YR vz/8AKwNBKI5Sv4bcL5tpeYWUF6GAupRN1bCa3HQWi5Z2xHxI6NVUZAdbx2ky8iJtMp1vqdUiVrGTrjFo2uXtSQHbk1chy6X5oOgWEbn3d305WQ+JO7fg/cdzzYEzc17LhWeyLtEId/dvF1werQYM9avPO31MqmcWIfCS35v8xeM70c4aviCnoM58kbKFLyZO6vX6pJiBw0/MJbStwKnfbgj4Ws4WK4r6lR+1CpZ/bJB3HP6xAnVN0O4Q18ZFX5YdL5h6Apwsrkpqynq6fmLvPQnd/EaRnlznMFduTTCFwDRnNROlSZ7z7iG9SPzle3uOOtyDCNVcTp6Ez1po08XA1WkmhoA88s31Ishmta/US8+5B7BEn5WkjRTcIthuqjz/OadMstG9yajW073ZKQ7A9tsJ8Wj4HpxzN7x9ZW+hVreh2bM0SP+WOiOVC2gA7GHoOMIsDRI+MSPMeqt7z0lyK24TNVUXVAwH2vMI7Umm8sdSiWHyPo3ro9t2s20vFR2TCShE1L5lRM4dfDpEnMH5vF3pVEBseA4hUI5e/9YFYPjSU7lzj59PXdNHpMi00EmiZUpNZ5OD8EiqRvJSgNkcLLTZ7o9SNMCbEpN3 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 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 --- 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 */ 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; } -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 = vma->vm_mm; pud_t entry; if (!pud_none(*pud)) { + const unsigned long pfn = fop.is_folio ? folio_pfn(fop.folio) : + pfn_t_to_pfn(fop.pfn); + if (write) { - if (WARN_ON_ONCE(pud_pfn(*pud) != pfn_t_to_pfn(pfn))) + if (WARN_ON_ONCE(pud_pfn(*pud) != pfn)) return; entry = pud_mkyoung(*pud); entry = maybe_pud_mkwrite(pud_mkdirty(entry), vma); @@ -1554,11 +1557,20 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, return; } - entry = pud_mkhuge(pfn_t_pud(pfn, prot)); - if (pfn_t_devmap(pfn)) - entry = pud_mkdevmap(entry); - else - entry = pud_mkspecial(entry); + if (fop.is_folio) { + entry = 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 = pud_mkhuge(pfn_t_pud(fop.pfn, prot)); + + if (pfn_t_devmap(fop.pfn)) + entry = pud_mkdevmap(entry); + else + entry = pud_mkspecial(entry); + } if (write) { entry = pud_mkyoung(pud_mkdirty(entry)); entry = maybe_pud_mkwrite(entry, vma); @@ -1582,6 +1594,9 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write) unsigned long addr = vmf->address & PUD_MASK; struct vm_area_struct *vma = vmf->vma; pgprot_t pgprot = vma->vm_page_prot; + struct folio_or_pfn fop = { + .pfn = pfn, + }; spinlock_t *ptl; /* @@ -1601,7 +1616,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, pgprot, write); + insert_pud(vma, addr, vmf->pud, fop, pgprot, write); spin_unlock(ptl); 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 = vmf->address & PUD_MASK; pud_t *pud = vmf->pud; struct mm_struct *mm = vma->vm_mm; + struct folio_or_pfn fop = { + .folio = folio, + .is_folio = true, + }; spinlock_t *ptl; if (addr < vma->vm_start || addr >= 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; ptl = 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); return VM_FAULT_NOPAGE; -- 2.49.0