Unverified Commit 8e2491eb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!443 OLK-5.10 backport sharepool and config isolation patches 

Merge Pull Request from: @zhang-zekun-zk 
 
OLK-5.10 backport sharepool and config isolation patches 
 
Link:https://gitee.com/openeuler/kernel/pulls/443

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6b10ee06 4a88f9b4

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ config ASCEND_CHARGE_MIGRATE_HUGEPAGES 
config ASCEND_SHARE_POOL

	bool "Enable support for the Share Pool Memory"

	default n

	depends on HAVE_ARCH_HUGE_VMALLOC

	depends on HAVE_ARCH_HUGE_VMALLOC && EXTEND_HUGEPAGE_MAPPING

	select ARCH_USES_HIGH_VMA_FLAGS

	help

	  This feature allows multiple processes to share virtual memory both

arch/arm64/configs/openeuler_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -721,6 +721,8 @@ CONFIG_ACPI_HMAT=y 
CONFIG_HAVE_ACPI_APEI=y

CONFIG_ACPI_APEI=y

CONFIG_ACPI_APEI_GHES=y

CONFIG_ACPI_APEI_GHES_TS_CORE=y

CONFIG_ACPI_APEI_GHES_NOTIFY_ALL_RAS_ERR=y

CONFIG_ACPI_APEI_PCIEAER=y

CONFIG_ACPI_APEI_SEA=y

CONFIG_ACPI_APEI_MEMORY_FAILURE=y
@@ -1129,6 +1131,7 @@ CONFIG_PIN_MEMORY=y 
CONFIG_PID_RESERVE=y

CONFIG_MEMORY_RELIABLE=y

# CONFIG_CLEAR_FREELIST_PAGE is not set

CONFIG_EXTEND_HUGEPAGE_MAPPING=y



#

# Data Access Monitoring
@@ -5927,6 +5930,7 @@ CONFIG_ARM_SMMU=y 
CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y

CONFIG_ARM_SMMU_V3=y

CONFIG_ARM_SMMU_V3_SVA=y

CONFIG_ARM_SMMU_V3_PM=y

# CONFIG_AGENT_SMMU_ATOS is not set

# CONFIG_QCOM_IOMMU is not set

# CONFIG_VIRTIO_IOMMU is not set
@@ -6110,6 +6114,8 @@ CONFIG_THUNDERX2_PMU=m 
CONFIG_XGENE_PMU=y

CONFIG_ARM_SPE_PMU=y

CONFIG_HISI_PMU=m

CONFIG_HISI_L3T_PMU=m

CONFIG_HISI_LPDDRC_PMU=m

CONFIG_HISI_PCIE_PMU=m

CONFIG_HNS3_PMU=m

# end of Performance monitor support

drivers/acpi/apei/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -33,6 +33,20 @@ config ACPI_APEI_GHES 
	  by firmware to produce more valuable hardware error

	  information for Linux.



config ACPI_APEI_GHES_TS_CORE

	bool "Support ts core ras process for ascend"

	depends on ARM64 && ACPI_APEI_GHES

	default n

	help

	  Enable the support for ts core ras process for ascend.



config ACPI_APEI_GHES_NOTIFY_ALL_RAS_ERR

	bool "Notify all ras err to driver"

	depends on ARM64 && ACPI_APEI_GHES

	default n

	help

	  Deliver all types of error to driver.



config ACPI_APEI_PCIEAER

	bool "APEI PCIe AER logging/recovering support"

	depends on ACPI_APEI && PCIEAER

drivers/acpi/apei/ghes.c

+9 −1
Original line number Diff line number Diff line
@@ -118,8 +118,10 @@ module_param_named(disable, ghes_disable, bool, 0); 
static LIST_HEAD(ghes_hed);

static DEFINE_MUTEX(ghes_list_mutex);



#ifdef CONFIG_ACPI_APEI_GHES_TS_CORE

BLOCKING_NOTIFIER_HEAD(ghes_ts_err_chain);

EXPORT_SYMBOL(ghes_ts_err_chain);

#endif



/*

 * Because the memory area used to transfer hardware error information
@@ -657,20 +659,26 @@ static bool ghes_do_proc(struct ghes *ghes, 
		}

		else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {

			queued = ghes_handle_arm_hw_error(gdata, sev);

#ifdef CONFIG_ACPI_APEI_GHES_TS_CORE

		}

		else if (guid_equal(sec_type, &CPER_SEC_TS_CORE)) {

			blocking_notifier_call_chain(&ghes_ts_err_chain,

					0, acpi_hest_get_payload(gdata));

#endif

		} else {

			void *err = acpi_hest_get_payload(gdata);



#ifndef CONFIG_ACPI_APEI_GHES_NOTIFY_ALL_RAS_ERR

			ghes_defer_non_standard_event(gdata, sev);

#endif

			log_non_standard_event(sec_type, fru_id, fru_text,

					       sec_sev, err,

					       gdata->error_data_length);

		}



#ifdef CONFIG_ACPI_APEI_GHES_NOTIFY_ALL_RAS_ERR

		/* Customization deliver all types error to driver. */

		ghes_defer_non_standard_event(gdata, sev);

#endif

	}



	return queued;

drivers/iommu/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,13 @@ config AGENT_SMMU_ATOS 
	  Say Y here if your system will be used in Ascend Advanced Accelerator

	  with HCCS bus. Or want use the ATOS of SMMU.



config ARM_SMMU_V3_PM

	bool "Add arm_smmu_v3  suspend and resume support"

	depends on ARM_SMMU_V3 && PM_SLEEP

	default n

	help

	  Add support for suspend and resume support for arm smmu v3.



config S390_IOMMU

	def_bool y if S390 && PCI

	depends on S390 && PCI