From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 8ED36277028 for ; Fri, 5 Sep 2025 05:53:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757051609; cv=none; b=mfJfsKdc5HNlv/gnqfcMw+fSBeL0LM72f9AD05Yk8upDS5MtSBByXGamsHTwuMUgM3xm27YW1fM+5TUpol4PtSGxDWzFclZYR42npAfSFivD0BuWwON4i5VNxyRc5naa+ORlwH/dVd6PhVKjTqEqjsZh0bcVSHvNXynQNsRuq1c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757051609; c=relaxed/simple; bh=Gn4opQ4aud63wvK/ceg58+faM/1ndYNs5LsS6KUMAhw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tzDtKItmEQDRKIiFnrbo6yKcEinniDlNTNqctt2xcRMdLxXk9JU8ZtqhsCSWRbiLp1SwoqYSHM7Athj/F4S29722Io1HaBWu09gvGvMEIC/WInt50pAL12nqwwxOIITqdXiBQ6jAkcxfu7eaaN1Ei2FvwjspvReZP3rDazVgyO8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=oBa0bDcp; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none 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="oBa0bDcp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757051608; x=1788587608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gn4opQ4aud63wvK/ceg58+faM/1ndYNs5LsS6KUMAhw=; b=oBa0bDcpwZ+LzjPYQef+8W3E5XlrfIltUXrRSKbvLmKjymzvAVTFKN/2 A+BPmIDhheU171dpe8qxDLg9tLTU/maRPrd1UZyYq/8sH8tUbCzsJNPWk UOMmY7ATAhwqNuDIUuOLbad3FBFEzarjVe4ODBE7B0OV+geNCvjdL6djj U/Mq9CMir990gQTCXvwLmIJQ/Hls2wyLRJEl9UwhDKTcbGBUxVv9fdCP4 aqgi5ZCMlZMJetFnKmqNEXu/lx33xAAxybo9uq071B/KXRT5fKa2j2+Pf uKB7gmXHwq9f/y8SHwHHtWTd3XhoEGLoSFJyO3Ve2ejOgXUdWZQkdIjAs A==; X-CSE-ConnectionGUID: eveSOmwRTHux/INUqySoUQ== X-CSE-MsgGUID: SXpYa7EUR7WRmJxMaCxVOA== X-IronPort-AV: E=McAfee;i="6800,10657,11543"; a="70015113" X-IronPort-AV: E=Sophos;i="6.18,240,1751266800"; d="scan'208";a="70015113" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2025 22:53:27 -0700 X-CSE-ConnectionGUID: YjD6Y/zeTIWJHr+9KeFgWQ== X-CSE-MsgGUID: AIF9YwzdTGC/Y+4cgFlDHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,240,1751266800"; d="scan'208";a="209257724" Received: from allen-box.sh.intel.com ([10.239.159.52]) by orviesa001.jf.intel.com with ESMTP; 04 Sep 2025 22:53:23 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , Jason Gunthorpe , Jann Horn , Vasant Hegde , Dave Hansen , Alistair Popple , Peter Zijlstra , Uladzislau Rezki , Jean-Philippe Brucker , Andy Lutomirski , Yi Lai Cc: iommu@lists.linux.dev, security@kernel.org, linux-kernel@vger.kernel.org, Dave Hansen , Lu Baolu Subject: [PATCH v4 3/8] x86/mm: Use 'ptdesc' when freeing PMD pages Date: Fri, 5 Sep 2025 13:50:58 +0800 Message-ID: <20250905055103.3821518-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250905055103.3821518-1-baolu.lu@linux.intel.com> References: <20250905055103.3821518-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: 8bit 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 --- 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; pmd = pud_pgtable(*pud); @@ -750,8 +750,8 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) for (i = 0; i < PTRS_PER_PMD; i++) { if (!pmd_none(pmd_sv[i])) { - pte = (pte_t *)pmd_page_vaddr(pmd_sv[i]); - pte_free_kernel(&init_mm, pte); + pt = page_ptdesc(pmd_page(pmd_sv[i])); + pagetable_dtor_free(pt); } } @@ -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; - pte = (pte_t *)pmd_page_vaddr(*pmd); + pt = page_ptdesc(pmd_page(*pmd)); pmd_clear(pmd); /* INVLPG to clear all paging-structure caches */ flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1); - pte_free_kernel(&init_mm, pte); + pagetable_dtor_free(pt); return 1; } -- 2.43.0