Commit 5132dffc authored by Steve Wahl's avatar Steve Wahl Committed by Wentao Guan
Browse files

x86/mm/ident_map: Use gbpages only where full GB page should be mapped. 

stable inclusion
from stable-v6.6.78
commit d113f9723f2bfd9c6feeb899b8ddbee6b8a6e01f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBX1M5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d113f9723f2bfd9c6feeb899b8ddbee6b8a6e01f



--------------------------------

commit cc31744a294584a36bf764a0ffa3255a8e69f036 upstream.

When ident_pud_init() uses only GB pages to create identity maps, large
ranges of addresses not actually requested can be included in the resulting
table; a 4K request will map a full GB.  This can include a lot of extra
address space past that requested, including areas marked reserved by the
BIOS.  That allows processor speculation into reserved regions, that on UV
systems can cause system halts.

Only use GB pages when map creation requests include the full GB page of
space.  Fall back to using smaller 2M pages when only portions of a GB page
are included in the request.

No attempt is made to coalesce mapping requests. If a request requires a
map entry at the 2M (pmd) level, subsequent mapping requests within the
same 1G region will also be at the pmd level, even if adjacent or
overlapping such requests could have been combined to map a full GB page.
Existing usage starts with larger regions and then adds smaller regions, so
this should not have any great consequence.

Signed-off-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarPavin Joseph <me@pavinjoseph.com>
Tested-by: default avatarSarah Brofeldt <srhb@dbc.dk>
Tested-by: default avatarEric Hagberg <ehagberg@gmail.com>
Link: https://lore.kernel.org/all/20240717213121.3064030-3-steve.wahl@hpe.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit d113f9723f2bfd9c6feeb899b8ddbee6b8a6e01f)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 8d8739a8

arch/x86/mm/ident_map.c

+18 −5
Original line number Diff line number Diff line
@@ -26,18 +26,31 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, 
	for (; addr < end; addr = next) {

		pud_t *pud = pud_page + pud_index(addr);

		pmd_t *pmd;

		bool use_gbpage;



		next = (addr & PUD_MASK) + PUD_SIZE;

		if (next > end)

			next = end;



		if (info->direct_gbpages) {

			pud_t pudval;



			if (pud_present(*pud))

		/* if this is already a gbpage, this portion is already mapped */

		if (pud_leaf(*pud))

			continue;



			addr &= PUD_MASK;

		/* Is using a gbpage allowed? */

		use_gbpage = info->direct_gbpages;



		/* Don't use gbpage if it maps more than the requested region. */

		/* at the begining: */

		use_gbpage &= ((addr & ~PUD_MASK) == 0);

		/* ... or at the end: */

		use_gbpage &= ((next & ~PUD_MASK) == 0);



		/* Never overwrite existing mappings */

		use_gbpage &= !pud_present(*pud);



		if (use_gbpage) {

			pud_t pudval;



			pudval = __pud((addr - info->offset) | info->page_flag);

			set_pud(pud, pudval);

			continue;