From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 ED89A3B895D; Mon, 13 Jul 2026 23:07:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783984050; cv=none; b=NboKoDL8pgMZ1DqUF2IoSMq7MANfWTqAlyquGHNaIAKAHxlwlPNxlWSCJmXWVNAzhP25Th23UTExmp70aDNZYSbrK8WNVmf5YCuknQ06ZUrhqUrTZF0OrIbxWA0dXdY+TtokYuydYmMWzwRj83TMa4EldArBj4Zt9LOPCRX/23g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783984050; c=relaxed/simple; bh=h6uqNFZpX72YACr/XRfPvVGOkYALJakigKdm+A6kY08=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RvaUP+pC8is04qDMa8pzxPnVqPDg4luDES2ODQrqcwoWChi799gukUOtuLiBvFtvkJI3A/MWZOd69kSXEPGIw7OU8QnWFnaW0f6JJsYgRr/gJMs0fPyic6Nkwgh3bxDTgey0lVHbGRl3/0OQsvDrBWjsZMp0uCUCDoOYpY89KMI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=FzANTG4I; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=l6fCe+GI; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="FzANTG4I"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="l6fCe+GI" Date: Mon, 13 Jul 2026 23:07:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783984041; h=from:from:sender:sender:reply-to: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=jpArpKni8qvN9YGpXTcOpmxhJvC+8yIKhLMW8urPgNc=; b=FzANTG4Iu7Ru+MF8xghDnoyfEqWkSvMEAShQmq/C4BP/5Xtb/YKqiJb9r74hu6zKLWaL77 h0RXyu7yqG05wxH+tyUU5G9ObvBT2Lai9P+J7LRfk22P6yErNUEq8c/Tro5CFEuDcCMhPP kip4Iix6yGZ3MoHR2n0gkPy2f263E8pBmQHGGU+V79wYiSQiyfmUNBtsnbPBSmqDbfCJ4p KaHWKqJbpUKuAvcN3foHJMU7Jp6+Vwu3bh0Q4R7Q+r3HuwnH05y0YRvXe6RREsy6y4p5qj dJCEFhDIULXVynOh38O2x6XVMa3M3jGPSYZtDJ0b66X13B0FTZI+/CXtDdUa2g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783984041; h=from:from:sender:sender:reply-to: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=jpArpKni8qvN9YGpXTcOpmxhJvC+8yIKhLMW8urPgNc=; b=l6fCe+GIyJkCibpdTKGNkrrvvvz/pmIobIYhvq4gkjAZKG32aOhmy2G310bacjDrKiXW7l gWJNmAY66vloztCQ== From: "tip-bot2 for Vishal Moola" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/mm/pat: Convert collapse_pmd_page() to ptdescs Cc: Vishal Moola , Dave Hansen , William Kucharski , "Mike Rapoport (Microsoft)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260629185742.126987-4-vishal.moola@gmail.com> References: <20260629185742.126987-4-vishal.moola@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178398403996.1844600.3141112424509320770.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/mm branch of tip: Commit-ID: 5fcb2abffe015017c252a5a720375145e808337e Gitweb: https://git.kernel.org/tip/5fcb2abffe015017c252a5a720375145e80= 8337e Author: Vishal Moola AuthorDate: Mon, 29 Jun 2026 11:57:36 -07:00 Committer: Dave Hansen CommitterDate: Mon, 13 Jul 2026 15:55:10 -07:00 x86/mm/pat: Convert collapse_pmd_page() to ptdescs Convert collapse_pmd_page() to ptdescs in preparation for the eventual splitting of ptdescs from struct page. Signed-off-by: Vishal Moola Signed-off-by: Dave Hansen Reviewed-by: William Kucharski Acked-by: Mike Rapoport (Microsoft) Link: https://patch.msgid.link/20260629185742.126987-4-vishal.moola@gmail.com --- arch/x86/mm/pat/set_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 93cb714..45623d4 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1297,11 +1297,11 @@ static int collapse_pmd_page(pmd_t *pmd, unsigned lon= g addr, list_add(&page_ptdesc(pmd_page(old_pmd))->pt_list, pgtables); =20 if (IS_ENABLED(CONFIG_X86_32)) { - struct page *page; + struct ptdesc *ptdesc; =20 /* Update all PGD tables to use the same large page */ - list_for_each_entry(page, &pgd_list, lru) { - pgd_t *pgd =3D (pgd_t *)page_address(page) + pgd_index(addr); + list_for_each_entry(ptdesc, &pgd_list, pt_list) { + pgd_t *pgd =3D (pgd_t *)ptdesc_address(ptdesc) + pgd_index(addr); p4d_t *p4d =3D p4d_offset(pgd, addr); pud_t *pud =3D pud_offset(p4d, addr); pmd_t *pmd =3D pmd_offset(pud, addr);