From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1957042315B for ; Wed, 13 May 2026 13:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677896; cv=none; b=kmLlUmQ09rukeI3ckUOApbDC41eONCVlDq+I944N0ZjdW7S42YNLgLvoPATXCxK2v5yiULsPswAUX3r5yWLQxeK3jMQL0wHUt2sNZ3ktpYVFYLzunjGlBkPSTes8Qv5ScAu7iU2wUBZg+VGWOR/fR5rhPf474Wmrjvp9D1suG9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677896; c=relaxed/simple; bh=2VFNPjco7r3frmLvfQOYwA6Qb0fldWu843dFqSCBP0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KkPvuFmXLOXcOK3MjhcH3dMvJSxiv7z0KI7FnCn7uYgfpxhM3SiO/m9/myFbn/dC1maSxii5klJP4F1zNtdfUtZk1tgY5tZp7+tshQ3uFKVkK++k9cGTJxmK801VRU1+sAhI+Tid4hzKsHFbkgS49PFdx4Emg1LoFtSmINy7pBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=X0y+7NLi; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="X0y+7NLi" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2bcd730e090so24830715ad.2 for ; Wed, 13 May 2026 06:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677894; x=1779282694; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r3qZ6fKvu/W22OcYYEqHvfVb2RH2sc3ZeigSJrIXA9w=; b=X0y+7NLibur3VIQSyNeQrz5ZXzuBWCqQ2hqYfJDaoR/01NufMnv4E648r9RQlKmZ+1 +2jRbVgXsV+fc2457OKikz5GyrXCPH5s/vrmuADYT3O86dleFxAvmPjp7IyvBt5ZyrgY ahcKJ21MsxZv2c0mqIuoErsBiw48F3bIZN2GipkbwG5AhqhM0ZCXdybom0ioGuA1RYBR R6Yp8uHHL5koFrCr+cke1MahCseFmtGCSXsV6IkvZ+0HrSl8XEj7AnTbw2Ot1JI5P9WU za1qHrAUOVfFRqnqhOaJm1dUZSaHVe6gqRki/ZsFWoGmWCigjI+38kvRh7kn5W9yP6IB qSLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677894; x=1779282694; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=r3qZ6fKvu/W22OcYYEqHvfVb2RH2sc3ZeigSJrIXA9w=; b=ikKOsA1JPQ6tCBoNLa5IyXxUwGVMrvvXDJW1l+bZbBHvUclD5fcYC+nP/kJ4+RdYjP xlcnwIDgDWrtmBHvpc1lHTKqarol2EK48erIdzIIQXSR96zpP/Mpu4qvn21rDxCfl3tK Ub39xdGS+RgTvB5UylOUN8c2phLlNfVS7tCLC/k5DIXjgGDEayu7d3ZVQ3RNvD8HJlhJ m18GCxmFFeJzTjBD2Jx+FdNvaNRAutJgsPewexvRzkmctCXBUYWnpx/97vVpxrB8i9XO 5twaquC2Hpy7xBNHQZLGIKfxJBZK6eJ0EJTl5xZSJaV4Y4LZnADRnPALitBIJB/kL8fY LfjQ== X-Forwarded-Encrypted: i=1; AFNElJ/K+sZxXm7F/M3abt0X6O6oiCiV9zxuNav0Dspow62oKD/ny1ULvBaJgppZLPid3vZRolkWz2uFmlLCnhM=@vger.kernel.org X-Gm-Message-State: AOJu0YzNVfwXG3NK7RXZXdPTtWq340YwZ5a79Qzo8gfAyZdokvfdNLtE 2Qu+zA3yiuxu88rhYoron779dwxKR8eyWe3qhRy9940n40O2YB6SqR3eDd/RorERVOY= X-Gm-Gg: Acq92OGyP8xgZ3tPMRpt6QK7XdFX4L33ldjRluibGIDTwGooISq5sk/Kh8gQOykL29c 7kvKDCJfGhrtaoU82Pw0UjmzKKOqnZuSq80NeBADUkmoMosBwvGfC7TtPNzJ4iVbTAo40OFidmk r2knaXjFLPU5OnI/KuzeefAeF5ByoCnt+/NRE3nIKq8H7DySgHH2sm1n15blabpMaeo7A9Oo0Z5 vIaIKbplKfgqdiuLXezJ939AjxQC7MHkA1UgNbo30N9gZEE/ds1gD7wbRn2LtUdtvadwWooZl8l dC21IUd01CSXsDF5XUZDCYi5P1Qy59KJ41pqnnxX5aa1LxUHi++VL9znXsgATmZqMq8lk0E+S6o eWsnFliYtq3NQh4CSNU8fwP0Mvu3Up0N0fwulDJf9b40e9tdP0SIxAFjBNccvmuy+5wnRTidxkf 3UwOPqrl+Lf3yt258u2pSzgGlnGQ216mZndyL85Vh51K5UnA/plsEKhPHoK3o= X-Received: by 2002:a17:902:8648:b0:2b4:5dff:30fd with SMTP id d9443c01a7336-2bd2f4f734fmr21340805ad.4.1778677894343; Wed, 13 May 2026 06:11:34 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e90854sm166641925ad.66.2026.05.13.06.11.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:11:34 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Muchun Song , Oscar Salvador , Michael Ellerman , Madhavan Srinivasan Cc: Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nicholas Piggin , Christophe Leroy , Ackerley Tng , Frank van der Linden , aneesh.kumar@linux.ibm.com, joao.m.martins@oracle.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH v2 44/69] mm/sparse-vmemmap: Remove the unused ptpfn argument Date: Wed, 13 May 2026 21:05:12 +0800 Message-ID: <20260513130542.35604-45-songmuchun@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260513130542.35604-1-songmuchun@bytedance.com> References: <20260513130542.35604-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit vmemmap_pte_populate() no longer uses ptpfn as an input. It computes the PFN locally in both cases before building the PTE. Drop the argument and inline the PFN computation at the PTE creation sites. Signed-off-by: Muchun Song --- mm/sparse-vmemmap.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 4833a2295abb..182d0c7dd1e7 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -124,8 +124,7 @@ void __meminit vmemmap_verify(pte_t *pte, int node, } static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, - struct vmem_altmap *altmap, - unsigned long ptpfn) + struct vmem_altmap *altmap) { pte_t entry, *pte = pte_offset_kernel(pmd, addr); struct page *page = (struct page *)addr; @@ -158,15 +157,15 @@ static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, in */ if (slab_is_available()) get_page(page); - ptpfn = page_to_pfn(page); + + entry = pfn_pte(page_to_pfn(page), PAGE_KERNEL); } else { void *vaddr = vmemmap_alloc_block_buf(PAGE_SIZE, node, altmap); if (!vaddr) return NULL; - ptpfn = PHYS_PFN(__pa(vaddr)); + entry = pfn_pte(PHYS_PFN(__pa(vaddr)), PAGE_KERNEL); } - entry = pfn_pte(ptpfn, PAGE_KERNEL); set_pte_at(&init_mm, addr, pte, entry); return pte; @@ -235,8 +234,7 @@ static pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) } static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, - struct vmem_altmap *altmap, - unsigned long ptpfn) + struct vmem_altmap *altmap) { pgd_t *pgd; p4d_t *p4d; @@ -256,7 +254,7 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, pmd = vmemmap_pmd_populate(pud, addr, node); if (!pmd) return NULL; - pte = vmemmap_pte_populate(pmd, addr, node, altmap, ptpfn); + pte = vmemmap_pte_populate(pmd, addr, node, altmap); if (!pte) return NULL; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); @@ -268,7 +266,7 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap) { for (; start < end; start += PAGE_SIZE) - if (!vmemmap_populate_address(start, node, altmap, -1)) + if (!vmemmap_populate_address(start, node, altmap)) return -ENOMEM; return 0; -- 2.54.0