From nobody Tue Dec 16 21:10:39 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C516630AAB3 for ; Wed, 22 Oct 2025 08:29:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761121782; cv=none; b=d17eKuM9yRF1dpShoocR2FLAI0Z26DLqOZ9lKoLtRmLyIoAW3sWAMGq0VpORBdJuqT5JPlS/omeASWRarZH1AFbH3OUdPQjzc5q2eGArbepTwsGjKnzzX/AQPifitoxQg+D5bB9bZrw4fStxqFOzHccelknjOBWgYXZSBWBSavM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761121782; c=relaxed/simple; bh=on6Ag9NJz0vk1kj+5aoSFuQQtRI0JdB9JVEfIv+bEQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u9saP6uz3W3UIuTHX9WH4jmx6XgngyJ/e82QmnLldq48R3c7wgs6LquuCtEjljpOPB1Sj+6JhaeHvS3l3VJ1QkRanoUyAb3MmiYnY6igjG4HSqjxDjTsVVfHPfnNribe9Ls3DG9sf/qjUAlQidHCb+Y3yQf7CYJWJ9qB+qBDRfw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=d2VxwsUz; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="d2VxwsUz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1761121780; x=1792657780; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=on6Ag9NJz0vk1kj+5aoSFuQQtRI0JdB9JVEfIv+bEQw=; b=d2VxwsUzF9lNLFgCo7Grpm8JzDGclfFXSHoA3viK5bdxUFI8vaktgzSr Zr3pkyhr+xJVhO/kUloJY5pPHe2Dc+0FTxooNPeEGJh1qGnhSPIqFzsdK OtDXaTaMgawtL2zttxZr0i0+i8V1MJAx9/q2PGJxthaLlvSqbE2JhR2pB 9NwvluxTuGwuqV0Wtd11BecCuKbRlJr+DYGfP/fvM2NFsOtjOMa1S5Uci wu93OltOakt5PAOqCVjzkcRLn61R2Pf6/0KMcWKiBmbwXOBczqoD+iwsK M86yqfiej6Ze4CYKeR1oslzTsfRkz2O+qvCQJdalpMieE+rkHT6blVQhR w==; X-CSE-ConnectionGUID: FfW5OGwRQOes2yvfqGUSGQ== X-CSE-MsgGUID: p2dsvoSsSWuNzjH1llwO7w== X-IronPort-AV: E=McAfee;i="6800,10657,11586"; a="65879179" X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="65879179" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2025 01:29:40 -0700 X-CSE-ConnectionGUID: Sa3UKoJgTC6E3excfo+Q9w== X-CSE-MsgGUID: /pRj0LcbRHm0dwuta+OIPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="183516346" Received: from allen-box.sh.intel.com ([10.239.159.52]) by fmviesa007.fm.intel.com with ESMTP; 22 Oct 2025 01:29:33 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , Jason Gunthorpe , Jann Horn , Vasant Hegde , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Alistair Popple , Peter Zijlstra , Uladzislau Rezki , Jean-Philippe Brucker , Andy Lutomirski , Yi Lai , David Hildenbrand , Lorenzo Stoakes , "Liam R . Howlett" , Andrew Morton , Vlastimil Babka , Mike Rapoport , Michal Hocko , Matthew Wilcox , Vinicius Costa Gomes Cc: iommu@lists.linux.dev, security@kernel.org, x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dave Hansen , Lu Baolu Subject: [PATCH v7 4/8] x86/mm: Use 'ptdesc' when freeing PMD pages Date: Wed, 22 Oct 2025 16:26:30 +0800 Message-ID: <20251022082635.2462433-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251022082635.2462433-1-baolu.lu@linux.intel.com> References: <20251022082635.2462433-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dave Hansen There are a billion ways to refer to a physical memory address. One of the x86 PMD freeing code location chooses to use a 'pte_t *' to point to a PMD page and then call a PTE-specific freeing function for it. That's a bit wonky. Just use a 'struct ptdesc *' instead. Its entire purpose is to refer to page table pages. It also means being able to remove an explicit cast. Right now, pte_free_kernel() is a one-liner that calls pagetable_dtor_free(). Effectively, all this patch does is remove one superfluous __pa(__va(paddr)) conversion and then call pagetable_dtor_free() directly instead of through a helper. Signed-off-by: Dave Hansen Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Acked-by: David Hildenbrand --- arch/x86/mm/pgtable.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index ddf248c3ee7d..2e5ecfdce73c 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -729,7 +729,7 @@ int pmd_clear_huge(pmd_t *pmd) int pud_free_pmd_page(pud_t *pud, unsigned long addr) { pmd_t *pmd, *pmd_sv; - pte_t *pte; + struct ptdesc *pt; int i; =20 pmd =3D pud_pgtable(*pud); @@ -750,8 +750,8 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) =20 for (i =3D 0; i < PTRS_PER_PMD; i++) { if (!pmd_none(pmd_sv[i])) { - pte =3D (pte_t *)pmd_page_vaddr(pmd_sv[i]); - pte_free_kernel(&init_mm, pte); + pt =3D page_ptdesc(pmd_page(pmd_sv[i])); + pagetable_dtor_free(pt); } } =20 @@ -772,15 +772,15 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) */ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { - pte_t *pte; + struct ptdesc *pt; =20 - pte =3D (pte_t *)pmd_page_vaddr(*pmd); + pt =3D page_ptdesc(pmd_page(*pmd)); pmd_clear(pmd); =20 /* INVLPG to clear all paging-structure caches */ flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1); =20 - pte_free_kernel(&init_mm, pte); + pagetable_dtor_free(pt); =20 return 1; } --=20 2.43.0