linux5.5: re-enable KASLR, PAGE_POISONING.
Sync i686 with x86_64, reduce diff.
This commit is contained in:
parent
070731d36b
commit
d501529421
2 changed files with 848 additions and 725 deletions
File diff suppressed because it is too large
Load diff
|
@ -294,6 +294,7 @@ CONFIG_HAVE_INTEL_TXT=y
|
|||
CONFIG_X86_64_SMP=y
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DYNAMIC_PHYSICAL_MASK=y
|
||||
CONFIG_PGTABLE_LEVELS=5
|
||||
CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
|
||||
|
||||
|
@ -307,7 +308,7 @@ CONFIG_X86_X2APIC=y
|
|||
CONFIG_X86_MPPARSE=y
|
||||
# CONFIG_GOLDFISH is not set
|
||||
CONFIG_RETPOLINE=y
|
||||
# CONFIG_X86_CPU_RESCTRL is not set
|
||||
CONFIG_X86_CPU_RESCTRL=y
|
||||
# CONFIG_X86_EXTENDED_PLATFORM is not set
|
||||
CONFIG_X86_INTEL_LPSS=y
|
||||
CONFIG_X86_AMD_PLATFORM_DEVICE=y
|
||||
|
@ -403,7 +404,8 @@ CONFIG_X86_CPUID=m
|
|||
CONFIG_X86_5LEVEL=y
|
||||
CONFIG_X86_DIRECT_GBPAGES=y
|
||||
# CONFIG_X86_CPA_STATISTICS is not set
|
||||
# CONFIG_AMD_MEM_ENCRYPT is not set
|
||||
CONFIG_AMD_MEM_ENCRYPT=y
|
||||
CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_AMD_NUMA=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
|
@ -451,9 +453,12 @@ CONFIG_CRASH_DUMP=y
|
|||
# CONFIG_KEXEC_JUMP is not set
|
||||
CONFIG_PHYSICAL_START=0x1000000
|
||||
CONFIG_RELOCATABLE=y
|
||||
# CONFIG_RANDOMIZE_BASE is not set
|
||||
CONFIG_RANDOMIZE_BASE=y
|
||||
CONFIG_X86_NEED_RELOCS=y
|
||||
CONFIG_PHYSICAL_ALIGN=0x1000000
|
||||
CONFIG_DYNAMIC_MEMORY_LAYOUT=y
|
||||
CONFIG_RANDOMIZE_MEMORY=y
|
||||
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
|
||||
CONFIG_HOTPLUG_CPU=y
|
||||
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
|
||||
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
|
||||
|
@ -714,7 +719,8 @@ CONFIG_OPROFILE_EVENT_MULTIPLEX=y
|
|||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_OPROFILE_NMI_TIMER=y
|
||||
CONFIG_KPROBES=y
|
||||
# CONFIG_JUMP_LABEL is not set
|
||||
CONFIG_JUMP_LABEL=y
|
||||
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||
CONFIG_OPTPROBES=y
|
||||
CONFIG_KPROBES_ON_FTRACE=y
|
||||
CONFIG_UPROBES=y
|
||||
|
@ -835,7 +841,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y
|
|||
CONFIG_BLK_DEV_BSG=y
|
||||
CONFIG_BLK_DEV_BSGLIB=y
|
||||
CONFIG_BLK_DEV_INTEGRITY=y
|
||||
# CONFIG_BLK_DEV_ZONED is not set
|
||||
CONFIG_BLK_DEV_ZONED=y
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
|
||||
CONFIG_BLK_CMDLINE_PARSER=y
|
||||
|
@ -843,6 +849,7 @@ CONFIG_BLK_CMDLINE_PARSER=y
|
|||
# CONFIG_BLK_CGROUP_IOLATENCY is not set
|
||||
# CONFIG_BLK_CGROUP_IOCOST is not set
|
||||
CONFIG_BLK_DEBUG_FS=y
|
||||
CONFIG_BLK_DEBUG_FS_ZONED=y
|
||||
# CONFIG_BLK_SED_OPAL is not set
|
||||
|
||||
#
|
||||
|
@ -880,7 +887,7 @@ CONFIG_BLK_PM=y
|
|||
#
|
||||
# IO Schedulers
|
||||
#
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=m
|
||||
CONFIG_MQ_IOSCHED_DEADLINE=y
|
||||
CONFIG_MQ_IOSCHED_KYBER=m
|
||||
CONFIG_IOSCHED_BFQ=m
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
|
@ -1848,9 +1855,9 @@ CONFIG_PCIEASPM=y
|
|||
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
|
||||
CONFIG_PCIEASPM_PERFORMANCE=y
|
||||
CONFIG_PCIE_PME=y
|
||||
# CONFIG_PCIE_DPC is not set
|
||||
# CONFIG_PCIE_PTM is not set
|
||||
# CONFIG_PCIE_BW is not set
|
||||
CONFIG_PCIE_DPC=y
|
||||
CONFIG_PCIE_PTM=y
|
||||
CONFIG_PCIE_BW=y
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
CONFIG_PCI_QUIRKS=y
|
||||
|
@ -2171,8 +2178,8 @@ CONFIG_BLK_DEV_RSXX=m
|
|||
#
|
||||
CONFIG_NVME_CORE=m
|
||||
CONFIG_BLK_DEV_NVME=m
|
||||
# CONFIG_NVME_MULTIPATH is not set
|
||||
# CONFIG_NVME_HWMON is not set
|
||||
CONFIG_NVME_MULTIPATH=y
|
||||
CONFIG_NVME_HWMON=y
|
||||
CONFIG_NVME_FABRICS=m
|
||||
CONFIG_NVME_RDMA=m
|
||||
CONFIG_NVME_FC=m
|
||||
|
@ -2193,7 +2200,7 @@ CONFIG_AD525X_DPOT=m
|
|||
CONFIG_AD525X_DPOT_I2C=m
|
||||
CONFIG_AD525X_DPOT_SPI=m
|
||||
CONFIG_DUMMY_IRQ=m
|
||||
# CONFIG_IBM_ASM is not set
|
||||
CONFIG_IBM_ASM=m
|
||||
CONFIG_PHANTOM=m
|
||||
CONFIG_TIFM_CORE=m
|
||||
CONFIG_TIFM_7XX1=m
|
||||
|
@ -2565,6 +2572,7 @@ CONFIG_DM_VERITY=m
|
|||
CONFIG_DM_SWITCH=m
|
||||
CONFIG_DM_LOG_WRITES=m
|
||||
CONFIG_DM_INTEGRITY=m
|
||||
# CONFIG_DM_ZONED is not set
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
|
@ -9274,6 +9282,7 @@ CONFIG_HAS_DMA=y
|
|||
CONFIG_NEED_SG_DMA_LENGTH=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
|
||||
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
|
||||
CONFIG_DMA_VIRT_OPS=y
|
||||
CONFIG_SWIOTLB=y
|
||||
CONFIG_DMA_CMA=y
|
||||
|
@ -9391,10 +9400,12 @@ CONFIG_DEBUG_MISC=y
|
|||
#
|
||||
# Memory Debugging
|
||||
#
|
||||
# CONFIG_PAGE_EXTENSION is not set
|
||||
CONFIG_PAGE_EXTENSION=y
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_PAGE_OWNER is not set
|
||||
# CONFIG_PAGE_POISONING is not set
|
||||
CONFIG_PAGE_POISONING=y
|
||||
CONFIG_PAGE_POISONING_NO_SANITY=y
|
||||
CONFIG_PAGE_POISONING_ZERO=y
|
||||
# CONFIG_DEBUG_PAGE_REF is not set
|
||||
# CONFIG_DEBUG_RODATA_TEST is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
|
|
Loading…
Reference in a new issue