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 02095C61CE5 for ; Tue, 3 Jun 2025 21:16:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B20E6B051C; Tue, 3 Jun 2025 17:16:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63A706B051E; Tue, 3 Jun 2025 17:16:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DDC76B051F; Tue, 3 Jun 2025 17:16:48 -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 288C26B051C for ; Tue, 3 Jun 2025 17:16:48 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DDE29121757 for ; Tue, 3 Jun 2025 21:16:47 +0000 (UTC) X-FDA: 83515348854.02.B769E23 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id B948EA0009 for ; Tue, 3 Jun 2025 21:16:45 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Wd/s0bVC"; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1748985405; 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=odfwWYBsPrR2NiRATGhjsNB6SzvCCkIpMqMTiNvN67g=; b=bBXczqoRPz4/wVUttZ6SgEv4Vr2lXisGNQ9RtX/Av3kdfTGd8+Mh11KHgWoOH2g+SiWpiX mkeLHJ4CxJ/FBEVlkSxHAM5fSViNUqsLWx1/jAfPVHsuXo/zzJiM3Yjin3VimLO0HsgQzI I45wSmme4LnXQG2uKbxCuyOgeJPQwtY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Wd/s0bVC"; spf=pass (imf25.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1748985405; a=rsa-sha256; cv=none; b=aagUOQZMvmV8pyoS3exdSiG/tTWYiHymqKbmuJv9WQhEAjrSHoUfspHBQdh6yY0UEbWA1G XQDDtcflPgPEQJ6wcoH3UNRikwRf8/APvIBY/HFF4w1ElYWRamNHZcoqTAIOPbgyTmJvHM jgxsqWK0FO3kFIN9AMvPn1Z6ljDi+o8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748985405; 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=odfwWYBsPrR2NiRATGhjsNB6SzvCCkIpMqMTiNvN67g=; b=Wd/s0bVCCQEZqTdmV4ZB5Wgi2v4VJBYfNKJEa4ytUlVrWmiN+xYsb7+D1nNpxecTfuEkai p1AAKdeZ4pHWqXwTqRsyuGGQHTtjgkyutYpzOS9Bg7iKCaEW9EiDMxrsF9A8abOZvIA51z ZbiY8r6fTQjicJxr5OAi178UOXuS9Ao= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-pG4wO3XNPQSLtU6uB8QyoA-1; Tue, 03 Jun 2025 17:16:42 -0400 X-MC-Unique: pG4wO3XNPQSLtU6uB8QyoA-1 X-Mimecast-MFC-AGG-ID: pG4wO3XNPQSLtU6uB8QyoA_1748985401 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-450d64026baso25772815e9.1 for ; Tue, 03 Jun 2025 14:16:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748985401; x=1749590201; 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=odfwWYBsPrR2NiRATGhjsNB6SzvCCkIpMqMTiNvN67g=; b=QPSDtaveMCQUYbtwrP7FQP/QtQdAgEpKnn+RL+JYIIH/3tLBOckibZB2BGz6LUKu76 dVM98vB3Y6rAhPA+6DzNx/v5xUU7f/Ierrg+5h1cU2dycqaJGwi95iEqEzCdO9Z0bP4a 083w7+LfBFwFps2WzhqzVOnmsHlJc/vfh9+qIg/G3XzVUh7wOdim5vuU7JEj/CPqZRZ0 pj3giuP0s2qpM8XhSxuWD0GeGbcHBwfZ3uhLVQoIvgqohGw2N06mnp74+Bz09O0MUbH1 f53JGGMHvGuLKwd5qofdXFee9ygu/3ceq3M37VxqEef9q7nipa5HWEZGHDClFWIWqkoE BMJQ== X-Gm-Message-State: AOJu0Yxl3Uwlh5tIoxggT1raTo/LSt8+LY39qfBtRarkAuHgy/f/CBIU RJUXPFFkP5tTgW2rEXbNQoA/FmZ9tRkXHPKeGjgAnjIqLcbl/3ZkUCtX0qELwXj9qlBCybRFsYS VatultkcpfL5YJs/l6KRKRy0yvtRJ9yfRz8qgBR+qOPs6ZsEyupH6 X-Gm-Gg: ASbGncv4Td8jT+kDcWq0auMDhGg0nnj69yg4fUoZ+klTF5EE3lSm9GlqFAzj+cadGcG IxsIn/N86aRE2qVGaaJ/5GU1L6KWFjL9+xhyPfAKUfpKGDgIEs3JfvKmYOMOEFNt+GkoWwpGUQ3 sWFoSCWxfq9jYY3jhi6pS3TO+hNN7xk1ILBuN4robx/2H3Hu+Dk7vABZ5MFBOuS3M4lpPkJsgu1 tjRVZ+yLwaVm2dL1ef0r0X1Zpz0vARzxpYOOTXI0yq0fI07MdA3DbEqsWCJ2iyhVOpoq5w5WRaU K4ljCqQalMBfyAaWHeSVAdlbzMEhWdy+jKuJBcxwaEKbZRz2BRC7U0R+ynXrUw6dS+74Kl93BTh i4NEoo94= X-Received: by 2002:a05:600c:8b53:b0:450:d386:1afb with SMTP id 5b1f17b1804b1-451f0a77343mr1734555e9.9.1748985400737; Tue, 03 Jun 2025 14:16:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGU0uCWB4mipEA75Rgm+06vlkE4Cg+21PNhH9TeTgvc29mcVV+kilTSDzcCPjrD9lEWlpu3Rw== X-Received: by 2002:a05:600c:8b53:b0:450:d386:1afb with SMTP id 5b1f17b1804b1-451f0a77343mr1734345e9.9.1748985400273; Tue, 03 Jun 2025 14:16:40 -0700 (PDT) Received: from localhost (p200300d82f0df000eec92b8d4913f32a.dip0.t-ipconnect.de. [2003:d8:2f0d:f000:eec9:2b8d:4913:f32a]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a4efe5b96fsm19175970f8f.8.2025.06.03.14.16.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Jun 2025 14:16:39 -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 Subject: [PATCH v1 2/2] mm/huge_memory: don't mark refcounted pages special in vmf_insert_folio_pud() Date: Tue, 3 Jun 2025 23:16:34 +0200 Message-ID: <20250603211634.2925015-3-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603211634.2925015-1-david@redhat.com> References: <20250603211634.2925015-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ul_ELLvTdWPRWADnVWPvJiYqsgmtpDi4Dht9vUNbBqc_1748985401 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: B948EA0009 X-Stat-Signature: 13primg7a46pe8mpq5z5besa6wyujei6 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1748985405-140681 X-HE-Meta: U2FsdGVkX19HglLkuE3IP4Wtv4wTWenSTG5+xnsMfDrnAtDciLluBFvtalwgPn3hFkfqKv/XckmIYbSylYFwUCFGDPafoY/SHge1B30CdM3E8mYpRMWxKjeUFCisvUrDv7xtXxAkGLoldNRqcNJXIrJ6yWQ16nJQ16bhNYXM3FK30+zC2WHceUajH4hPdsyqDz6nw3/SBAEdTgBOBH24iom3reJ22kt58/o9uQtXhjx+9JCHaAflqoaluFnqBckhearEppqbSxLRHuZq+oWpylHgltYqPny9hivLJJiAfwqyTwx49GHTDtLf9UvILSaJvfMYqxjiCShyyIX2Crn0sJzNpZuMOOEczWd/+O5PammLKHTckWLIsO6yjxQvTVVUxlI9EMVPC+BiAuYU3+9Ox6LAJV4c/5timAtGKujCO93zBSkU+iADfjYJq6+0Znj4fPqTp40lghR3HOdXW93pn9WNEHjxDh+/4DF3cMDOkz9Y0GMXHFVEpbE4zHZfcOP/kLhRTQxpQFH8vQOu6icuoK3VVYfFlxCjBjy5BDjKvS8XQ+wiQeVHlp4Hw+/nhHIIACboUNSMlw2vne+H4RPDtmZgkdZl1yCM2GI9pO9UV/FlXQPS6/vlL+TMr6d9jnOCqkuFq2UZolIP/TOzHRFmcsv5JfUPmRKZE7vzHCNDxMO16xOtm0mrUsIAQ3Kzhqp6mPJdxNDBQRvCH0+eetB1Wh85/ppOn4ChFVFtxW3fWhpQRmpPL2jVc3q/ZzXYaQiJatnwhluvFEDN9NsNZ2WSPzjd+pi70EKuMJlaVB2czx07RATaWEUOP9NF4HnWuJkqbsGJv4k7nZDnPaDgDgl+841/HfEm7cJLaIdH6Y7ANywrBN8BcCfy/5KnEabXyTfqghGMlZQCgik/7Q/zdkOoMh/sfp/ykZ1fT/x0UczLHgJ8JAjfIg0fC6hNm0+Si8wsk0h7u4rtqzDQbXc+vse 8aEMpOCk oXgSD2xJJh/lfpT6jSXu07TZcCfCLUbYzD5579rYPn0bWOU5wNnTqzb+9kX4Y2rdL/32uv1O05hyxsrVeJ+akK3kGDcg2Fo6BVeQgL1L6c1pz7MIT8TojJowgEpMaWPwMhW51AswKX+AKnxTuKJCm9NduKzluXJFcZIBrXqZ1/uXmJwFLUwM3UWU8g9ulNaW0NlZfz9FZ468ZPz4oelpQC+IO7POhnF5MD4ZwEk4MgjRs4BWhVz2OrZ05BiADE+qulUBhfwhr6msr50Dm6IIIonFRgGz/Wv4TvENjhBNkRWmxM+pvA439CEWEdm58pvHi65Uk9sxBmJozLrrLs4B+XiRvsjPdE3i3Kovl4JEbAcDPSva61usYTsaaxxhKlXwn9HlfNl8wciTlO7f6kjhgw/IN0mhA3nDaDA8fKezbLIUPg4lEDU/+Mf2DJjIpU0Gx2yjkgPyyEvQiQv7lksleGFFrlDN4mg6nR9I8fRH2rc+LRIzGlscIXGPDe0Sx07Flv/csnDzLXmih++vcDlmkcsqb1fEGc0kNIBpi 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(). 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 by just inlining the relevant code, making the whole pud_none() handling cleaner. Add folio_mk_pud() to mimic what we do with folio_mk_pmd(). While at it, make sure that the pud that is non-none is actually present before comparing PFNs. Fixes: dbe54153296d ("mm/huge_memory: add vmf_insert_folio_pud()") Signed-off-by: David Hildenbrand --- include/linux/mm.h | 15 +++++++++++++++ mm/huge_memory.c | 33 +++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0ef2ba0c667af..047c8261d4002 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1816,6 +1816,21 @@ static inline pmd_t folio_mk_pmd(struct folio *folio, pgprot_t pgprot) { return pmd_mkhuge(pfn_pmd(folio_pfn(folio), pgprot)); } + +/** + * 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 #endif /* CONFIG_MMU */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f9e23dfea76f8..7b66a23089381 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1629,6 +1629,7 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, pud_t *pud = vmf->pud; struct mm_struct *mm = vma->vm_mm; spinlock_t *ptl; + pud_t entry; if (addr < vma->vm_start || addr >= vma->vm_end) return VM_FAULT_SIGBUS; @@ -1637,20 +1638,32 @@ 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)) { + if (pud_none(*pud)) { folio_get(folio); folio_add_file_rmap_pud(folio, &folio->page, vma); add_mm_counter(mm, mm_counter_file(folio), HPAGE_PUD_NR); + + entry = folio_mk_pud(folio, vma->vm_page_prot); + if (write) { + entry = pud_mkyoung(pud_mkdirty(entry)); + entry = maybe_pud_mkwrite(entry, vma); + } + set_pud_at(mm, addr, pud, entry); + update_mmu_cache_pud(vma, addr, pud); + } else if (pud_present(*pud) && write) { + /* + * We only allow for upgrading write permissions if the + * same folio is already mapped. + */ + if (pud_pfn(*pud) == folio_pfn(folio)) { + entry = pud_mkyoung(*pud); + entry = maybe_pud_mkwrite(pud_mkdirty(entry), vma); + if (pudp_set_access_flags(vma, addr, pud, entry, 1)) + update_mmu_cache_pud(vma, addr, pud); + } else { + WARN_ON_ONCE(1); + } } - insert_pfn_pud(vma, addr, vmf->pud, pfn_to_pfn_t(folio_pfn(folio)), - write); spin_unlock(ptl); return VM_FAULT_NOPAGE; -- 2.49.0