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 1E97DC5AD49 for ; Fri, 6 Jun 2025 08:20:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A89EB6B007B; Fri, 6 Jun 2025 04:20:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A62276B0088; Fri, 6 Jun 2025 04:20:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9777B6B0089; Fri, 6 Jun 2025 04:20:20 -0400 (EDT) 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 791B76B007B for ; Fri, 6 Jun 2025 04:20:20 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E5F67BAB88 for ; Fri, 6 Jun 2025 08:20:19 +0000 (UTC) X-FDA: 83524278558.29.57B2050 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf27.hostedemail.com (Postfix) with ESMTP id B2E3240003 for ; Fri, 6 Jun 2025 08:20:17 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MitPkhnC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=pr7ciNVw; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MitPkhnC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=pr7ciNVw; spf=pass (imf27.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749198018; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xPPCQgVTU9igB5wVJT7oj3CtdzrH4k5GbPxzRDDz2ws=; b=uVa2tREdAbNcoAR8K0eo46rOvViyGqYcSF0AIU/1S1ANtDs8L/d+k3RpJf06u/sHomMqjM qbl/Hdc3H/hDoPfnX6dcgqfH9uP5Bkgd54xHNu3JXs5TPC89Nd6qShVTcq88e0PQY/NTPN JWSYV6oCRwTN1F9+W2QBCTxXbnwTpJI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749198018; a=rsa-sha256; cv=none; b=teqFBUIVTy7eMbJUhmfX1WXYrLP+hgUK235PZdZYhdmK2T97sxBZI/flyPcvx0eo/dbHwR SvoYhvsDcd9yLdrk6QRITH/GtgG4GCe3aF+Ay4sBd0qR8S88JEFGC7SwxbLJL+t0FUaxxd eP82wiyYH1LGHlKGnML8sAFcwy3m9Kg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MitPkhnC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=pr7ciNVw; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MitPkhnC; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=pr7ciNVw; spf=pass (imf27.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 12EE91F46E; Fri, 6 Jun 2025 08:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749198016; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xPPCQgVTU9igB5wVJT7oj3CtdzrH4k5GbPxzRDDz2ws=; b=MitPkhnCE/m1UL+eiwSqT48a8zIh4RmGtHolImnFPG0Y8bwen2/MXzyvn82oZBa+ByhvBF Yc9lgYMCuADcGRTJGmBzFPzQi3Bpn+GWCJqwT928WI9fyN0eybt68nPD6uDm3t16ANUJ1O LYhvc67RpnmSlNbW89XNPzerd22tENA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749198016; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xPPCQgVTU9igB5wVJT7oj3CtdzrH4k5GbPxzRDDz2ws=; b=pr7ciNVwces3HHVQ0sy0AjX6ZZBoczoDFUyAmHwDKNxZevZNa0w7ZxkkWv92FCF+9rbTUW WHtHTvD3VAlmbxAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749198016; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xPPCQgVTU9igB5wVJT7oj3CtdzrH4k5GbPxzRDDz2ws=; b=MitPkhnCE/m1UL+eiwSqT48a8zIh4RmGtHolImnFPG0Y8bwen2/MXzyvn82oZBa+ByhvBF Yc9lgYMCuADcGRTJGmBzFPzQi3Bpn+GWCJqwT928WI9fyN0eybt68nPD6uDm3t16ANUJ1O LYhvc67RpnmSlNbW89XNPzerd22tENA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749198016; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xPPCQgVTU9igB5wVJT7oj3CtdzrH4k5GbPxzRDDz2ws=; b=pr7ciNVwces3HHVQ0sy0AjX6ZZBoczoDFUyAmHwDKNxZevZNa0w7ZxkkWv92FCF+9rbTUW WHtHTvD3VAlmbxAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 105D21369F; Fri, 6 Jun 2025 08:20:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OmoQO76kQmgbBAAAD6G6ig (envelope-from ); Fri, 06 Jun 2025 08:20:14 +0000 Date: Fri, 6 Jun 2025 10:20:13 +0200 From: Oscar Salvador To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, 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 Subject: Re: [PATCH v1 1/2] mm/huge_memory: don't mark refcounted pages special in vmf_insert_folio_pmd() Message-ID: References: <20250603211634.2925015-1-david@redhat.com> <20250603211634.2925015-2-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250603211634.2925015-2-david@redhat.com> X-Rspamd-Action: no action X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B2E3240003 X-Stat-Signature: bis558wuq6igjz9c51rr9nbt6dg7u6g7 X-Rspam-User: X-HE-Tag: 1749198017-744691 X-HE-Meta: U2FsdGVkX19NVacj2esSxI1wg2V6Fq9vRe9l2Jt1PG3bzUlGxxl58po80Gdjrh8Ht2+OfWwqabI19hbFIN3o9G9dys7Bhls0Vtld2mPgeYumWHf23QrxVHjA8EUk76vwlDV/Hx94xe+yySJHzS2kZ1qpKXTnQZCRUkRCjOPoqQRQaD4OD7t/8d/aQpZfruZ6cYvELoB7n587PGpOs8YvuXkCgRDsPaiKmuQy7HrRUQtrLt/d9CVXEyK3rBIfWxXHrL9yHltxbH8O6yghjYnv9HDgmxV0pJhzs67GYXXUzUW8In2UD5cYm4kebXMNAwaCNPIrvWfUuL5zC5vGNwU+dH+QTHm7hbrjrx2b6jVDGtOn3+8n+VdmRWnxgqXtQhPUkONIhisirhhAi9vNLmb730X57g2ItNNG4DrCGamrXLotpOOy7CIMUEQqGCGyRYeZmpvqZ+q7rggHHT3yhGatAZt+4cG2LjZo2+ZTBLgfE1u70nc7SgpktfOC2FSk9swZy0S9Mi5MaooRoj0Spwuo2EWt/zDJtslN3vDjmSuTYBMHAZ1Qj9IXU56rHsjwobLxnJ8PluLBgPlK1BAeHCXUU6B7tzCF2whuCGqs/23wNTDNOVVOKwA48GQX0MZSmyf1tPpkZQkHtOJOIlLAD4hn1HhonbpY1sfD3FXAkBHkAGE6t0ozaF4HrIsJsuQLf371TGT3/gOxqUSDtVBACtiZ0ij9iqCR5Xnp4xvHeaOEMfTXCEg3K3ZKq7bmfTkQ2ZtSo50NpUtkbXXbGsHMT03EeB7GVksQQu2TlWTgDJnmT88UTqByvE5UV6ul1ECdSs+yNO3PtzvPn2eptEBrKBuhzUce0JTXEyfCQpm2Wc454/BNhXYJa7E2/U6HO7IWvyBETPYjtqMk6xeK3VmbWCXTjBgSsKT8D3RwYzvcsxpoQ5nuw9BbC9xUpkJycDSFXHgSmTNKKFS+abRdrHaSJjB LnECXmyI 9bcK9PosYXbyg7Off7zOIZ6o+tW9I5C9gVeUueanLgIikJh8hl0yEoJOuNLbBSnMiSlZ74LfFOhwCQZSeqP69O/n8ROR0VJAE4JsGdn/4tGNxdPw55SmXkoJBhRt4yle4tZ/+l8f+lccew9PmM62JnGQKQcmhU8SmTi08LvsqyyeSQfe01EBHKrMf6N4f1ZeQz0s5IuS5pS+4eMkLIovBwYtd32UA0td5ytNUMuKU9agnadn4fjyx5cpAycWTmU2+7zMEfYxm+Gpu2Rn1ytBa+1h3+fuIQtCm4ccfMFjFkSWTpsHkHpaUplYElmhtOVvYT1TBSGRUboADiuk= 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: On Tue, Jun 03, 2025 at 11:16:33PM +0200, David Hildenbrand wrote: > 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 just inlining the relevant code, making the whole > pmd_none() handling cleaner. We can now use folio_mk_pmd(). > > While at it, make sure that a pmd that is not-none is actually present > before comparing PFNs. > > Fixes: 6c88f72691f8 ("mm/huge_memory: add vmf_insert_folio_pmd()") > Signed-off-by: David Hildenbrand Hi David, > --- > mm/huge_memory.c | 39 ++++++++++++++++++++++++++++++++------- > 1 file changed, 32 insertions(+), 7 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index d3e66136e41a3..f9e23dfea76f8 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -1474,9 +1474,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; > + pmd_t *pmd = vmf->pmd; > spinlock_t *ptl; > pgtable_t pgtable = NULL; > - int error; > + pmd_t entry; > > if (addr < vma->vm_start || addr >= vma->vm_end) > return VM_FAULT_SIGBUS; > @@ -1490,17 +1491,41 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, > return VM_FAULT_OOM; > } > > - ptl = pmd_lock(mm, vmf->pmd); > - if (pmd_none(*vmf->pmd)) { > + ptl = pmd_lock(mm, pmd); > + if (pmd_none(*pmd)) { > folio_get(folio); > folio_add_file_rmap_pmd(folio, &folio->page, vma); > add_mm_counter(mm, mm_counter_file(folio), HPAGE_PMD_NR); > + > + entry = folio_mk_pmd(folio, vma->vm_page_prot); > + if (write) { > + entry = pmd_mkyoung(pmd_mkdirty(entry)); > + entry = maybe_pmd_mkwrite(entry, vma); > + } > + set_pmd_at(mm, addr, pmd, entry); > + update_mmu_cache_pmd(vma, addr, pmd); > + > + if (pgtable) { > + pgtable_trans_huge_deposit(mm, pmd, pgtable); > + mm_inc_nr_ptes(mm); > + pgtable = NULL; > + } > + } else if (pmd_present(*pmd) && write) { > + /* > + * We only allow for upgrading write permissions if the > + * same folio is already mapped. > + */ > + if (pmd_pfn(*pmd) == folio_pfn(folio)) { > + entry = pmd_mkyoung(*pmd); > + entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > + if (pmdp_set_access_flags(vma, addr, pmd, entry, 1)) > + update_mmu_cache_pmd(vma, addr, pmd); > + } else { > + WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); > + } So, this is pretty much insert_pfn_pmd without pmd_mkdevmap/pmd_mkspecial(). I guess vmf_inser_folio_pmd() doesn't have to be concerned with devmaps either, right? Looks good to me, just a nit: would it not be better to pass a boolean to insert_pfn_pmd() that lets it know whether it "can" create a devmap/special entries? -- Oscar Salvador SUSE Labs