Commit 1bddcc64 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge x86/urgent into x86/cache 



Merge it to pick up dependent urgent changes before applying more
resctrl stuff.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parents dc4060a5 a943245a

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ config X86_CPA_STATISTICS 
	depends on DEBUG_FS

	---help---

	  Expose statistics about the Change Page Attribute mechanims, which

	  helps to determine the effectivness of preserving large and huge

	  helps to determine the effectiveness of preserving large and huge

	  page mappings when mapping protections are changed.



config ARCH_HAS_MEM_ENCRYPT

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+2 −1
Original line number Diff line number Diff line
@@ -2610,9 +2610,10 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) 
			rdt_last_cmd_puts("Failed to initialize allocations\n");

			return ret;

		}

		rdtgrp->mode = RDT_MODE_SHAREABLE;

	}



	rdtgrp->mode = RDT_MODE_SHAREABLE;



	return 0;

}

arch/x86/kernel/process.c

+6 −2
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ static __always_inline void __speculation_ctrl_update(unsigned long tifp, 
	u64 msr = x86_spec_ctrl_base;

	bool updmsr = false;



	lockdep_assert_irqs_disabled();



	/*

	 * If TIF_SSBD is different, select the proper mitigation

	 * method. Note that if SSBD mitigation is disabled or permanentely
@@ -477,10 +479,12 @@ static unsigned long speculation_ctrl_update_tif(struct task_struct *tsk) 


void speculation_ctrl_update(unsigned long tif)

{

	unsigned long flags;



	/* Forced update. Make sure all relevant TIF flags are different */

	preempt_disable();

	local_irq_save(flags);

	__speculation_ctrl_update(~tif, tif);

	preempt_enable();

	local_irq_restore(flags);

}



/* Called from seccomp/prctl update */

arch/x86/kernel/reboot.c

+21 −0
Original line number Diff line number Diff line
@@ -81,6 +81,19 @@ static int __init set_bios_reboot(const struct dmi_system_id *d) 
	return 0;

}



/*

 * Some machines don't handle the default ACPI reboot method and

 * require the EFI reboot method:

 */

static int __init set_efi_reboot(const struct dmi_system_id *d)

{

	if (reboot_type != BOOT_EFI && !efi_runtime_disabled()) {

		reboot_type = BOOT_EFI;

		pr_info("%s series board detected. Selecting EFI-method for reboot.\n", d->ident);

	}

	return 0;

}



void __noreturn machine_real_restart(unsigned int type)

{

	local_irq_disable();
@@ -166,6 +179,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),

		},

	},

	{	/* Handle reboot issue on Acer TravelMate X514-51T */

		.callback = set_efi_reboot,

		.ident = "Acer TravelMate X514-51T",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T"),

		},

	},



	/* Apple */

	{	/* Handle problems with rebooting on Apple MacBook5 */

arch/x86/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ SECTIONS 
	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__bss_start = .;

		*(.bss..page_aligned)

		*(.bss)

		*(BSS_MAIN)

		BSS_DECRYPTED

		. = ALIGN(PAGE_SIZE);

		__bss_stop = .;