Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I6HRGK

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

Add CONFIG_HISI_L3T_PMU and CONFIG_HISI_LPDDRC_PMU to isolate features of hisi pmu driver.

This patch isolates commit 0edc58409e30 and 6bf896bea639.

Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- arch/arm64/configs/openeuler_defconfig | 2 ++ drivers/perf/hisilicon/Kconfig | 19 +++++++++++++++++++ drivers/perf/hisilicon/Makefile | 6 +++--- 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 67ee1ac76c7d..a2e93ba92d14 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -6110,6 +6110,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 diff --git a/drivers/perf/hisilicon/Kconfig b/drivers/perf/hisilicon/Kconfig index 171bfc1b6bc2..e19feba8b5d3 100644 --- a/drivers/perf/hisilicon/Kconfig +++ b/drivers/perf/hisilicon/Kconfig @@ -24,3 +24,22 @@ config HNS3_PMU devices. Adds the HNS3 PMU into perf events system for monitoring latency, bandwidth etc. + +config HISI_L3T_PMU + tristate "HiSilicon SoC L3T PMU drivers" + depends on HISI_PMU + default n + help + Support for HiSilicon SoC L3 Cache performance monitor, Hydra Home + Agent performance monitor and DDR Controller performance monitor. + L3T is a specialized PMU driver. + +config HISI_LPDDRC_PMU + tristate "HiSilicon SoC LDPPRC PMU drivers" + depends on HISI_PMU + default n + help + Support for HiSilicon SoC L3 Cache performance monitor, Hydra Home + Agent performance monitor and DDR Controller performance monitor. + LPDDRC is a specialize PMU driver. + diff --git a/drivers/perf/hisilicon/Makefile b/drivers/perf/hisilicon/Makefile index a35705795dfc..fc7ed8c6cc0f 100644 --- a/drivers/perf/hisilicon/Makefile +++ b/drivers/perf/hisilicon/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_HISI_PMU) += hisi_uncore_pmu.o hisi_uncore_l3c_pmu.o \ hisi_uncore_hha_pmu.o hisi_uncore_ddrc_pmu.o hisi_uncore_sllc_pmu.o \ - hisi_uncore_pa_pmu.o hisi_uncore_cpa_pmu.o \ - hisi_uncore_l3t_pmu.o \ - hisi_uncore_lpddrc_pmu.o + hisi_uncore_pa_pmu.o hisi_uncore_cpa_pmu.o

obj-$(CONFIG_HISI_PCIE_PMU) += hisi_pcie_pmu.o obj-$(CONFIG_HNS3_PMU) += hns3_pmu.o +obj-$(CONFIG_HISI_L3T_PMU) += hisi_uncore_l3t_pmu.o +obj-$(CONFIG_HISI_LPDDRC_PMU) += hisi_uncore_lpddrc_pmu.o

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I6HRGK

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

Add CONFIG_ACPI_APEI_NOTIFY_ALL_RAS_ERR to isolate Notify all ras err to driver, which was introduced in 924ceaed70a63e5eaaf39b78dc756e4a7ac3c250.

Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- arch/arm64/configs/openeuler_defconfig | 1 + drivers/acpi/apei/Kconfig | 7 +++++++ drivers/acpi/apei/ghes.c | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 218c77399da2..afe1060947e2 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -722,6 +722,7 @@ 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 diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig index f33c23062471..bf65cce12f61 100644 --- a/drivers/acpi/apei/Kconfig +++ b/drivers/acpi/apei/Kconfig @@ -40,6 +40,13 @@ config ACPI_APEI_GHES_TS_CORE 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 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 316648e09571..ec2c887bccb7 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -667,14 +667,18 @@ static bool ghes_do_proc(struct ghes *ghes, #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;

Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I6HRGK

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

Add CONFIG_ARM_SMMU_V3_PM to control the support for arm-smmu-v3 suspend and resume which was introduced in 4b009f708c37ce215483ac68c6a0b6b9f0d29c6d.

Signed-off-by: Zhang Zekun zhangzekun11@huawei.com --- arch/arm64/configs/openeuler_defconfig | 1 + drivers/iommu/Kconfig | 7 +++++++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++----- 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 3f1532646775..d5d28adedd5e 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -5930,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 diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index d632d456ed3c..f04a2bde0018 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -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 diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 3f6d25bf0587..be8cc53659f8 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -4349,7 +4349,7 @@ static void arm_smmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg) doorbell = (((u64)msg->address_hi) << 32) | msg->address_lo; doorbell &= MSI_CFG0_ADDR_MASK;

-#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_ARM_SMMU_V3_PM /* Saves the msg (base addr of msi irq) and restores it during resume */ desc->msg.address_lo = msg->address_lo; desc->msg.address_hi = msg->address_hi; @@ -4411,7 +4411,7 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu) devm_add_action(dev, arm_smmu_free_msis, dev); }

-#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_ARM_SMMU_V3_PM static void arm_smmu_resume_msis(struct arm_smmu_device *smmu) { struct msi_desc *desc; @@ -5313,8 +5313,7 @@ static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, return devm_ioremap_resource(dev, &res); }

-#ifdef CONFIG_PM_SLEEP - +#ifdef CONFIG_ARM_SMMU_V3_PM static int arm_smmu_ecmdq_disable(struct device *dev) { int i, j; @@ -5521,7 +5520,7 @@ static const struct of_device_id arm_smmu_of_match[] = { }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match);

-#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_ARM_SMMU_V3_PM static const struct dev_pm_ops arm_smmu_pm_ops = { .suspend = arm_smmu_suspend, .resume = arm_smmu_resume,

From: Chen Jun chenjun102@huawei.com

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I64Y5Y

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

If local_group_add_task fails in init_local_group. ida free the same id twice.

init_local_group local_group_add_task // failed goto free_spg

free_spg: free_sp_group_locked free_sp_group_id // free spg->id free_spg_id: free_new_spg_id // double free spg->id

To fix it, return before calling free_new_spg_id.

Signed-off-by: Chen Jun chenjun102@huawei.com --- mm/share_pool.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index e9d2ae0a5352..ababe279c44d 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -487,8 +487,8 @@ static int init_local_group(struct mm_struct *mm)

spg = create_spg(spg_id, 0); if (IS_ERR(spg)) { - ret = PTR_ERR(spg); - goto free_spg_id; + free_new_spg_id(true, spg_id); + return PTR_ERR(spg); }

master->local = spg; @@ -509,11 +509,9 @@ static int init_local_group(struct mm_struct *mm) return 0;

free_spg: + /* spg_id is freed in free_sp_group_locked */ free_sp_group_locked(spg); master->local = NULL; -free_spg_id: - free_new_spg_id(true, spg_id); - return ret; }

From: Zhou Guanghui zhouguanghui1@huawei.com

Offering: HULK ascend inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I6HRGK

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

The sharepool statistics record the sharepool memory information used by all containers in the system. We do not expect to query the sharepool memory information applied by processes in other containers in the container.

Therefore, the sharepool statistics cannot be queried in the container to solve this problem.

Signed-off-by: Zhou Guanghui zhouguanghui1@huawei.com --- mm/share_pool.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

diff --git a/mm/share_pool.c b/mm/share_pool.c index ee2d5fec7099..b3f5942dd7a4 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -4063,8 +4063,22 @@ void spg_overview_show(struct seq_file *seq) pr_info("\n"); }

+static bool should_show_statistics(void) +{ + if (!capable(CAP_SYS_ADMIN)) + return false; + + if (task_active_pid_ns(current) != &init_pid_ns) + return false; + + return true; +} + static int spa_stat_show(struct seq_file *seq, void *offset) { + if (!should_show_statistics()) + return -EPERM; + spg_overview_show(seq); spa_overview_show(seq); /* print the file header */ @@ -4113,6 +4127,9 @@ static int proc_usage_by_group(int id, void *p, void *data)

static int proc_group_usage_show(struct seq_file *seq, void *offset) { + if (!should_show_statistics()) + return -EPERM; + spg_overview_show(seq); spa_overview_show(seq);

@@ -4140,6 +4157,9 @@ static int proc_usage_show(struct seq_file *seq, void *offset) long sp_res, sp_res_nsize, non_sp_res, non_sp_shm; struct sp_proc_stat *proc_stat;

+ if (!should_show_statistics()) + return -EPERM; + seq_printf(seq, "%-8s %-16s %-9s %-9s %-9s %-10s %-10s %-8s\n", "PID", "COMM", "SP_ALLOC", "SP_K2U", "SP_RES", "Non-SP_RES", "Non-SP_Shm", "VIRT");

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6HRGK

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

Add two Helper functions sp_add_group_master and sp_del_group_master to manipulate master_list.

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index ffba9ee1d2eb..b8ba31314adf 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -264,6 +264,20 @@ struct sp_group_node { }; #endif

+static inline void sp_add_group_master(struct sp_group_master *master) +{ + mutex_lock(&master_list_lock); + list_add_tail(&master->list_node, &master_list); + mutex_unlock(&master_list_lock); +} + +static inline void sp_del_group_master(struct sp_group_master *master) +{ + mutex_lock(&master_list_lock); + list_del(&master->list_node); + mutex_unlock(&master_list_lock); +} + /* The caller should hold mmap_sem to protect master (TBD) */ static void sp_init_group_master_stat(int tgid, struct mm_struct *mm, struct sp_proc_stat *stat) @@ -541,10 +555,7 @@ static int sp_init_group_master_locked(struct task_struct *tsk, struct mm_struct master->mm = mm; sp_init_group_master_stat(tsk->tgid, mm, &master->instat); mm->sp_group_master = master; - - mutex_lock(&master_list_lock); - list_add_tail(&master->list_node, &master_list); - mutex_unlock(&master_list_lock); + sp_add_group_master(master);

ret = init_local_group(mm); if (ret) @@ -553,9 +564,7 @@ static int sp_init_group_master_locked(struct task_struct *tsk, struct mm_struct return 0;

free_master: - mutex_lock(&master_list_lock); - list_del(&master->list_node); - mutex_unlock(&master_list_lock); + sp_del_group_master(master); mm->sp_group_master = NULL; kfree(master);

@@ -4387,9 +4396,7 @@ void sp_group_post_exit(struct mm_struct *mm) } up_write(&sp_group_sem);

- mutex_lock(&master_list_lock); - list_del(&master->list_node); - mutex_unlock(&master_list_lock); + sp_del_group_master(master);

kfree(master); }

From: Wang Wensheng wangwensheng4@huawei.com

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I650K6

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

The process for k2task can be normalized with k2spg since there exist a local sp group for k2task.

Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- mm/share_pool.c | 152 +++++++++++++++--------------------------------- 1 file changed, 48 insertions(+), 104 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 9a7923eab134..4ffc384ea160 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -928,12 +928,11 @@ struct sp_k2u_context { unsigned long size_aligned; unsigned long sp_flags; int state; - int spg_id; - bool to_task; + enum spa_type type; };

-static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa, - struct mm_struct *mm, unsigned long prot, struct sp_k2u_context *kc); +static unsigned long sp_remap_kva_to_vma(struct sp_area *spa, struct mm_struct *mm, + unsigned long prot, struct sp_k2u_context *kc);

static void free_sp_group_id(int spg_id) { @@ -1539,7 +1538,7 @@ int mg_sp_group_add_task(int tgid, unsigned long prot, int spg_id) spin_unlock(&sp_area_lock);

if (spa->type == SPA_TYPE_K2SPG && spa->kva) { - addr = sp_remap_kva_to_vma(spa->kva, spa, mm, prot_spa, NULL); + addr = sp_remap_kva_to_vma(spa, mm, prot_spa, NULL); if (IS_ERR_VALUE(addr)) pr_warn("add group remap k2u failed %ld\n", addr);

@@ -2699,14 +2698,15 @@ static unsigned long __sp_remap_get_pfn(unsigned long kva) }

/* when called by k2u to group, always make sure rw_lock of spg is down */ -static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa, - struct mm_struct *mm, unsigned long prot, struct sp_k2u_context *kc) +static unsigned long sp_remap_kva_to_vma(struct sp_area *spa, struct mm_struct *mm, + unsigned long prot, struct sp_k2u_context *kc) { struct vm_area_struct *vma; unsigned long ret_addr; unsigned long populate = 0; int ret = 0; unsigned long addr, buf, offset; + unsigned long kva = spa->kva;

down_write(&mm->mmap_lock); if (unlikely(mm->core_state)) { @@ -2767,111 +2767,50 @@ static unsigned long sp_remap_kva_to_vma(unsigned long kva, struct sp_area *spa, return ret_addr; }

-/** - * sp_make_share_kva_to_task() - Share kernel memory to current task. - * @kva: the VA of shared kernel memory - * @size: the size of area to share, should be aligned properly - * @sp_flags: the flags for the opreation - * - * Return: - * * if succeed, return the shared user address to start at. - * * if fail, return the pointer of -errno. - */ -static void *sp_make_share_kva_to_task(unsigned long kva, unsigned long size, unsigned long sp_flags) -{ - int ret; - void *uva; - struct sp_area *spa; - struct sp_group_node *spg_node; - unsigned long prot = PROT_READ | PROT_WRITE; - struct sp_k2u_context kc; - struct sp_group *spg; - - down_write(&sp_group_sem); - ret = sp_init_group_master_locked(current, current->mm); - if (ret) { - up_write(&sp_group_sem); - pr_err_ratelimited("k2u_task init local mapping failed %d\n", ret); - return ERR_PTR(ret); - } - - spg = current->mm->sp_group_master->local; - up_write(&sp_group_sem); - - spa = sp_alloc_area(size, sp_flags, spg, SPA_TYPE_K2TASK, current->tgid); - if (IS_ERR(spa)) { - pr_err_ratelimited("alloc spa failed in k2u_task (potential no enough virtual memory when -75): %ld\n", - PTR_ERR(spa)); - return spa; - } - - spa->kva = kva; - kc.sp_flags = sp_flags; - uva = (void *)sp_remap_kva_to_vma(kva, spa, current->mm, prot, &kc); - if (IS_ERR(uva)) - pr_err("remap k2u to task failed %ld\n", PTR_ERR(uva)); - else { - spg_node = find_spg_node_by_spg(current->mm, spa->spg); - update_mem_usage(size, true, spa->is_hugepage, spg_node, SPA_TYPE_K2TASK); - spa->mm = current->mm; - } - __sp_area_drop(spa); - - return uva; -} - /** * Share kernel memory to a spg, the current process must be in that group - * @kva: the VA of shared kernel memory - * @size: the size of area to share, should be aligned properly - * @sp_flags: the flags for the opreation + * @kc: the context for k2u, including kva, size, flags... * @spg: the sp group to be shared with * * Return: the shared user address to start at */ -static void *sp_make_share_kva_to_spg(unsigned long kva, unsigned long size, - unsigned long sp_flags, struct sp_group *spg) +static void *sp_make_share_kva_to_spg(struct sp_k2u_context *kc, struct sp_group *spg) { struct sp_area *spa; struct mm_struct *mm; struct sp_group_node *spg_node; - void *uva = ERR_PTR(-ENODEV); - struct sp_k2u_context kc; unsigned long ret_addr = -ENODEV;

down_read(&spg->rw_lock); - spa = sp_alloc_area(size, sp_flags, spg, SPA_TYPE_K2SPG, current->tgid); + spa = sp_alloc_area(kc->size_aligned, kc->sp_flags, spg, kc->type, current->tgid); if (IS_ERR(spa)) { up_read(&spg->rw_lock); - pr_err_ratelimited("alloc spa failed in k2u_spg (potential no enough virtual memory when -75): %ld\n", + pr_err("alloc spa failed in k2u_spg (potential no enough virtual memory when -75): %ld\n", PTR_ERR(spa)); return spa; }

- spa->kva = kva; - kc.sp_flags = sp_flags; + spa->kva = kc->kva_aligned; list_for_each_entry(spg_node, &spg->procs, proc_node) { mm = spg_node->master->mm; - kc.state = K2U_NORMAL; - ret_addr = sp_remap_kva_to_vma(kva, spa, mm, spg_node->prot, &kc); + kc->state = K2U_NORMAL; + ret_addr = sp_remap_kva_to_vma(spa, mm, spg_node->prot, kc); if (IS_ERR_VALUE(ret_addr)) { - if (kc.state == K2U_COREDUMP) + if (kc->state == K2U_COREDUMP) continue; - uva = (void *)ret_addr; - pr_err("remap k2u to spg failed %ld\n", PTR_ERR(uva)); + pr_err("remap k2u to spg failed %ld\n", ret_addr); __sp_free(spg, spa->va_start, spa_size(spa), mm); goto out; } - uva = (void *)ret_addr; }

out: up_read(&spg->rw_lock); - if (!IS_ERR(uva)) + if (!IS_ERR_VALUE(ret_addr)) sp_update_process_stat(current, true, spa); __sp_area_drop(spa);

- return uva; + return (void *)ret_addr; }

static bool vmalloc_area_set_flag(unsigned long kva, unsigned long flags) @@ -2930,16 +2869,13 @@ static int sp_k2u_prepare(unsigned long kva, unsigned long size, return -EINVAL; }

- kc->kva = kva; - kc->kva_aligned = kva_aligned; - kc->size = size; + kc->kva = kva; + kc->kva_aligned = kva_aligned; + kc->size = size; kc->size_aligned = size_aligned; - kc->sp_flags = sp_flags; - kc->spg_id = spg_id; - if (spg_id == SPG_ID_DEFAULT || spg_id == SPG_ID_NONE) - kc->to_task = true; - else - kc->to_task = false; + kc->sp_flags = sp_flags; + kc->type = (spg_id == SPG_ID_DEFAULT || spg_id == SPG_ID_NONE) + ? SPA_TYPE_K2TASK : SPA_TYPE_K2SPG;

return 0; } @@ -2977,6 +2913,7 @@ void *mg_sp_make_share_k2u(unsigned long kva, unsigned long size, void *uva; int ret; struct sp_k2u_context kc; + struct sp_group *spg;

if (!sp_is_enabled()) return ERR_PTR(-EOPNOTSUPP); @@ -2987,24 +2924,31 @@ void *mg_sp_make_share_k2u(unsigned long kva, unsigned long size, if (ret) return ERR_PTR(ret);

- if (kc.to_task) { - uva = sp_make_share_kva_to_task(kc.kva_aligned, kc.size_aligned, kc.sp_flags); - } else { - struct sp_group *spg; - - spg = __sp_find_spg(current->tgid, kc.spg_id); - if (spg) { - ret = sp_check_caller_permission(spg, current->mm); - if (ret < 0) { - sp_group_drop(spg); - uva = ERR_PTR(ret); - goto out; - } - uva = sp_make_share_kva_to_spg(kc.kva_aligned, kc.size_aligned, kc.sp_flags, spg); + if (kc.type == SPA_TYPE_K2TASK) { + down_write(&sp_group_sem); + ret = sp_init_group_master_locked(current, current->mm); + up_write(&sp_group_sem); + if (ret) { + pr_err("k2u_task init local mapping failed %d\n", ret); + uva = ERR_PTR(ret); + goto out; + } + /* the caller could use SPG_ID_NONE */ + spg_id = SPG_ID_DEFAULT; + } + + spg = __sp_find_spg(current->tgid, spg_id); + if (spg) { + ret = sp_check_caller_permission(spg, current->mm); + if (ret < 0) { sp_group_drop(spg); - } else { - uva = ERR_PTR(-ENODEV); + uva = ERR_PTR(ret); + goto out; } + uva = sp_make_share_kva_to_spg(&kc, spg); + sp_group_drop(spg); + } else { + uva = ERR_PTR(-ENODEV); }

out:

From: Wang Wensheng wangwensheng4@huawei.com

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I650K6

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

The unshare process for k2task can be normalized with k2spg since there exist a local sp group for k2task.

Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- mm/share_pool.c | 147 +++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 102 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 6c4ab8d397af..5ffcb40e174e 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -3264,54 +3264,42 @@ void *mg_sp_make_share_u2k(unsigned long uva, unsigned long size, int tgid) EXPORT_SYMBOL_GPL(mg_sp_make_share_u2k);

/* - * Input parameters uva, tgid and spg_id are now useless. spg_id will be useful - * when supporting a process in multiple sp groups. + * sp_unshare_uva - unshare a uva from sp_make_share_k2u + * @uva: the uva to be unshared + * @size: not used actually and we just check it + * @group_id: specify the spg of the uva; for local group, it can be SPG_ID_DEFAULT + * unless current process is exiting. * * Procedure of unshare uva must be compatible with: * * 1. DVPP channel destroy procedure: * do_exit() -> exit_mm() (mm no longer in spg and current->mm == NULL) -> * exit_task_work() -> task_work_run() -> __fput() -> ... -> vdec_close() -> - * sp_unshare(uva, SPG_ID_DEFAULT) - * - * 2. Process A once was the target of k2u(to group), then it exits. - * Guard worker kthread tries to free this uva and it must succeed, otherwise - * spa of this uva leaks. - * - * This also means we must trust DVPP channel destroy and guard worker code. + * sp_unshare(uva, local_spg_id) */ static int sp_unshare_uva(unsigned long uva, unsigned long size, int group_id) { int ret = 0; - struct mm_struct *mm; struct sp_area *spa; - unsigned long uva_aligned; - unsigned long size_aligned; unsigned int page_size; struct sp_group *spg;

spg = sp_group_get(current->tgid, group_id); if (!spg) { - pr_debug("sp unshare find group failed %d\n", group_id); + pr_err("sp unshare find group failed %d\n", group_id); return -EINVAL; }

- /* - * at first we guess it's a hugepage addr - * we can tolerate at most PMD_SIZE or PAGE_SIZE which is matched in k2u - */ + /* All the spa are aligned to 2M. */ spa = get_sp_area(spg, ALIGN_DOWN(uva, PMD_SIZE)); if (!spa) { - spa = get_sp_area(spg, ALIGN_DOWN(uva, PAGE_SIZE)); - if (!spa) { - ret = -EINVAL; - pr_debug("invalid input uva %lx in unshare uva\n", (unsigned long)uva); - goto out; - } + ret = -EINVAL; + pr_err("invalid input uva %lx in unshare uva\n", (unsigned long)uva); + goto out; }

if (spa->type != SPA_TYPE_K2TASK && spa->type != SPA_TYPE_K2SPG) { - pr_err_ratelimited("unshare wrong type spa\n"); + pr_err("unshare wrong type spa\n"); ret = -EINVAL; goto out_drop_area; } @@ -3322,97 +3310,52 @@ static int sp_unshare_uva(unsigned long uva, unsigned long size, int group_id) * Thus input parameter size is not necessarily needed. */ page_size = (spa->is_hugepage ? PMD_SIZE : PAGE_SIZE); - uva_aligned = spa->va_start; - size_aligned = spa->real_size;

- if (size_aligned < ALIGN(size, page_size)) { + if (spa->real_size < ALIGN(size, page_size)) { ret = -EINVAL; - pr_err_ratelimited("unshare uva failed, invalid parameter size %lu\n", size); + pr_err("unshare uva failed, invalid parameter size %lu\n", size); goto out_drop_area; }

- if (spa->type == SPA_TYPE_K2TASK) { - if (spa->applier != current->tgid) { - pr_err_ratelimited("unshare uva(to task) no permission\n"); - ret = -EPERM; - goto out_drop_area; - } - - /* - * current thread may be exiting in a multithread process - * - * 1. never need a kthread to make unshare when process has exited - * 2. in dvpp channel destroy procedure, exit_mm() has been called - * and don't need to make unshare - */ - mm = get_task_mm(current->group_leader); - if (!mm) { - pr_info_ratelimited("no need to unshare uva(to task), target process mm is exiting\n"); - goto out_clr_flag; - } - - down_write(&mm->mmap_lock); - if (unlikely(mm->core_state)) { - ret = 0; - up_write(&mm->mmap_lock); - mmput(mm); - goto out_drop_area; - } - - ret = do_munmap(mm, uva_aligned, size_aligned, NULL); - up_write(&mm->mmap_lock); - mmput(mm); - /* we are not supposed to fail */ - if (ret) - pr_err("failed to unmap VA %pK when munmap in unshare uva\n", - (void *)uva_aligned); - sp_update_process_stat(current, false, spa); - - } else if (spa->type == SPA_TYPE_K2SPG) { - down_read(&spa->spg->rw_lock); - /* always allow kthread and dvpp channel destroy procedure */ - if (current->mm) { - if (!is_process_in_group(spa->spg, current->mm)) { - up_read(&spa->spg->rw_lock); - pr_err_ratelimited("unshare uva(to group) failed, caller process doesn't belong to target group\n"); - ret = -EPERM; - goto out_drop_area; - } - } + down_read(&spa->spg->rw_lock); + /* always allow dvpp channel destroy procedure */ + if (current->mm && !is_process_in_group(spa->spg, current->mm)) { up_read(&spa->spg->rw_lock); + pr_err("unshare uva failed, caller process doesn't belong to target group\n"); + ret = -EPERM; + goto out_drop_area; + } + up_read(&spa->spg->rw_lock);

- down_write(&spa->spg->rw_lock); - if (!spg_valid(spa->spg)) { - up_write(&spa->spg->rw_lock); - pr_info_ratelimited("share pool: no need to unshare uva(to group), sp group of spa is dead\n"); - goto out_clr_flag; - } - /* the life cycle of spa has a direct relation with sp group */ - if (unlikely(spa->is_dead)) { - up_write(&spa->spg->rw_lock); - pr_err_ratelimited("unexpected double sp unshare\n"); - dump_stack(); - ret = -EINVAL; - goto out_drop_area; - } - spa->is_dead = true; + down_write(&spa->spg->rw_lock); + if (!spg_valid(spa->spg)) { up_write(&spa->spg->rw_lock); + pr_info("no need to unshare uva, sp group of spa is dead\n"); + goto out_clr_flag; + } + /* the life cycle of spa has a direct relation with sp group */ + if (unlikely(spa->is_dead)) { + up_write(&spa->spg->rw_lock); + pr_err("unexpected double sp unshare\n"); + dump_stack(); + ret = -EINVAL; + goto out_drop_area; + } + spa->is_dead = true; + up_write(&spa->spg->rw_lock);

- down_read(&spa->spg->rw_lock); - __sp_free(spa->spg, uva_aligned, size_aligned, NULL); - up_read(&spa->spg->rw_lock); + down_read(&spa->spg->rw_lock); + __sp_free(spa->spg, spa->va_start, spa->real_size, NULL); + up_read(&spa->spg->rw_lock);

- if (current->mm == NULL) - atomic64_sub(spa->real_size, &kthread_stat.k2u_size); - else - sp_update_process_stat(current, false, spa); - } else { - WARN(1, "unshare uva invalid spa type"); - } + if (current->mm == NULL) + atomic64_sub(spa->real_size, &kthread_stat.k2u_size); + else + sp_update_process_stat(current, false, spa);

out_clr_flag: if (!vmalloc_area_clr_flag(spa->kva, VM_SHAREPOOL)) - pr_debug("clear spa->kva %ld is not valid\n", spa->kva); + pr_info("clear spa->kva %ld is not valid\n", spa->kva); spa->kva = 0;

out_drop_area:

From: Wang Wensheng wangwensheng4@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6G76L

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

1. Give more informaton in the error log. 2. No need to limit thre rate. 3. Add a '\n' at the end of the format string.

Signed-off-by: Wang Wensheng wangwensheng4@huawei.com --- mm/share_pool.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 3f0b10696e9d..8ae0aa75222c 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -1642,20 +1642,21 @@ int mg_sp_group_del_task(int tgid, int spg_id) return -EOPNOTSUPP;

if (spg_id < SPG_ID_MIN || spg_id > SPG_ID_AUTO) { - pr_err_ratelimited("del from group failed, invalid group id %d\n", spg_id); + pr_err("del from group failed, invalid group id %d\n", spg_id); return -EINVAL; }

spg = sp_group_get(tgid, spg_id); if (!spg) { - pr_err_ratelimited("spg not found or get task failed."); + pr_err("spg not found or get task failed, tgid:%d, spg_id:%d\n", + tgid, spg_id); return -EINVAL; } down_write(&sp_group_sem);

if (!spg_valid(spg)) { up_write(&sp_group_sem); - pr_err_ratelimited("spg dead."); + pr_err("spg dead, spg_id:%d\n", spg_id); ret = -EINVAL; goto out; } @@ -1663,13 +1664,13 @@ int mg_sp_group_del_task(int tgid, int spg_id) ret = get_task(tgid, &tsk); if (ret) { up_write(&sp_group_sem); - pr_err_ratelimited("task is not found"); + pr_err("task is not found, tgid:%d\n", tgid); goto out; } mm = get_task_mm(tsk->group_leader); if (!mm) { up_write(&sp_group_sem); - pr_err_ratelimited("mm is not found"); + pr_err("mm is not found, tgid:%d\n", tgid); ret = -ESRCH; goto out_put_task; } @@ -1684,7 +1685,7 @@ int mg_sp_group_del_task(int tgid, int spg_id) spg_node = find_spg_node_by_spg(mm, spg); if (!spg_node) { up_write(&sp_group_sem); - pr_err_ratelimited("process not in group"); + pr_err("task(%d) not in group(%d)\n", tgid, spg_id); ret = -ESRCH; goto out_put_mm; } @@ -1694,7 +1695,7 @@ int mg_sp_group_del_task(int tgid, int spg_id) if (!list_empty(&spg->spa_list)) { up_write(&spg->rw_lock); up_write(&sp_group_sem); - pr_err_ratelimited("spa is not empty"); + pr_err("spa is not empty, task:%d, spg_id:%d\n", tgid, spg_id); ret = -EINVAL; goto out_put_mm; }

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 2 -- 1 file changed, 2 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 014c95d6c95d..3dfd8d4b7c45 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -126,7 +126,6 @@ struct sp_spg_stat { /* per process memory usage statistics indexed by tgid */ struct sp_proc_stat { int tgid; - struct mm_struct *mm; char comm[TASK_COMM_LEN]; /* * alloc amount minus free amount, may be negative when freed by @@ -282,7 +281,6 @@ static void sp_init_group_master_stat(int tgid, struct mm_struct *mm, atomic64_set(&stat->alloc_nsize, 0); atomic64_set(&stat->alloc_hsize, 0); atomic64_set(&stat->k2u_size, 0); - stat->mm = mm; stat->tgid = tgid; get_task_comm(stat->comm, current); }

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 136 +++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 70 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index b72aed1258f9..1732a615ea32 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -107,20 +107,20 @@ do { \ pr_info(x); \ } while (0)

-#ifndef __GENKSYMS__ -struct sp_spg_stat { - /* total size of all sp_area from sp_alloc and k2u */ - atomic64_t size; - /* total size of all sp_area from sp_alloc 0-order page */ - atomic64_t alloc_nsize; - /* total size of all sp_area from sp_alloc hugepage */ - atomic64_t alloc_hsize; - /* total size of all sp_area from ap_alloc */ - atomic64_t alloc_size; - /* total size of all sp_area from sp_k2u */ - atomic64_t k2u_size; +struct sp_meminfo { + /* total size from sp_alloc and k2u */ + atomic64_t size; + /* not huge page size from sp_alloc */ + atomic64_t alloc_nsize; + /* huge page size from sp_alloc */ + atomic64_t alloc_hsize; + /* total size from sp_alloc */ + atomic64_t alloc_size; + /* total size from sp_k2u */ + atomic64_t k2u_size; };

+#ifndef __GENKSYMS__ /* per process memory usage statistics indexed by tgid */ struct sp_proc_stat { int tgid; @@ -210,7 +210,7 @@ struct sp_group { /* list head of sp_area. it is protected by spin_lock sp_area_lock */ struct list_head spa_list; /* group statistics */ - struct sp_spg_stat instat; + struct sp_meminfo meminfo; /* is_alive == false means it's being destroyed */ bool is_alive; atomic_t use_count; @@ -273,6 +273,43 @@ static inline void sp_del_group_master(struct sp_group_master *master) mutex_unlock(&master_list_lock); }

+static void meminfo_init(struct sp_meminfo *meminfo) +{ + memset(meminfo, 0, sizeof(struct sp_meminfo)); +} + +static void meminfo_update(unsigned long size, bool inc, + bool huge, struct sp_meminfo *meminfo) +{ + if (inc) { + atomic64_add(size, &meminfo->size); + atomic64_add(size, &meminfo->alloc_size); + if (huge) + atomic64_add(size, &meminfo->alloc_hsize); + else + atomic64_add(size, &meminfo->alloc_nsize); + } else { + atomic64_sub(size, &meminfo->size); + atomic64_sub(size, &meminfo->alloc_size); + if (huge) + atomic64_sub(size, &meminfo->alloc_hsize); + else + atomic64_sub(size, &meminfo->alloc_nsize); + } +} + +static void meminfo_update_k2u(unsigned long size, bool inc, + struct sp_meminfo *meminfo) +{ + if (inc) { + atomic64_add(size, &meminfo->size); + atomic64_add(size, &meminfo->k2u_size); + } else { + atomic64_sub(size, &meminfo->size); + atomic64_sub(size, &meminfo->k2u_size); + } +} + /* The caller should hold mmap_sem to protect master (TBD) */ static void sp_init_group_master_stat(int tgid, struct mm_struct *mm, struct sp_proc_stat *stat) @@ -597,38 +634,6 @@ static struct sp_group *sp_get_local_group(struct task_struct *tsk, struct mm_st return master->local; }

-static void update_spg_stat_alloc(unsigned long size, bool inc, - bool huge, struct sp_spg_stat *stat) -{ - if (inc) { - atomic64_add(size, &stat->size); - atomic64_add(size, &stat->alloc_size); - if (huge) - atomic64_add(size, &stat->alloc_hsize); - else - atomic64_add(size, &stat->alloc_nsize); - } else { - atomic64_sub(size, &stat->size); - atomic64_sub(size, &stat->alloc_size); - if (huge) - atomic64_sub(size, &stat->alloc_hsize); - else - atomic64_sub(size, &stat->alloc_nsize); - } -} - -static void update_spg_stat_k2u(unsigned long size, bool inc, - struct sp_spg_stat *stat) -{ - if (inc) { - atomic64_add(size, &stat->size); - atomic64_add(size, &stat->k2u_size); - } else { - atomic64_sub(size, &stat->size); - atomic64_sub(size, &stat->k2u_size); - } -} - static void update_mem_usage_alloc(unsigned long size, bool inc, bool is_hugepage, struct sp_group_node *spg_node) { @@ -678,15 +683,6 @@ static void sp_init_spg_proc_stat(struct spg_proc_stat *stat, int spg_id) atomic64_set(&stat->k2u_size, 0); }

-static void sp_init_group_stat(struct sp_spg_stat *stat) -{ - atomic64_set(&stat->size, 0); - atomic64_set(&stat->alloc_nsize, 0); - atomic64_set(&stat->alloc_hsize, 0); - atomic64_set(&stat->alloc_size, 0); - atomic64_set(&stat->k2u_size, 0); -} - /* statistics of all sp area, protected by sp_area_lock */ struct sp_spa_stat { unsigned int total_num; @@ -772,17 +768,17 @@ static void spa_inc_usage(struct sp_area *spa) case SPA_TYPE_ALLOC: spa_stat.alloc_num += 1; spa_stat.alloc_size += size; - update_spg_stat_alloc(size, true, is_huge, &spa->spg->instat); + meminfo_update(size, true, is_huge, &spa->spg->meminfo); break; case SPA_TYPE_K2TASK: spa_stat.k2u_task_num += 1; spa_stat.k2u_task_size += size; - update_spg_stat_k2u(size, true, &spa->spg->instat); + meminfo_update_k2u(size, true, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: spa_stat.k2u_spg_num += 1; spa_stat.k2u_spg_size += size; - update_spg_stat_k2u(size, true, &spa->spg->instat); + meminfo_update_k2u(size, true, &spa->spg->meminfo); break; default: WARN(1, "invalid spa type"); @@ -819,17 +815,17 @@ static void spa_dec_usage(struct sp_area *spa) case SPA_TYPE_ALLOC: spa_stat.alloc_num -= 1; spa_stat.alloc_size -= size; - update_spg_stat_alloc(size, false, is_huge, &spa->spg->instat); + meminfo_update(size, false, is_huge, &spa->spg->meminfo); break; case SPA_TYPE_K2TASK: spa_stat.k2u_task_num -= 1; spa_stat.k2u_task_size -= size; - update_spg_stat_k2u(size, false, &spa->spg->instat); + meminfo_update_k2u(size, false, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: spa_stat.k2u_spg_num -= 1; spa_stat.k2u_spg_size -= size; - update_spg_stat_k2u(size, false, &spa->spg->instat); + meminfo_update_k2u(size, false, &spa->spg->meminfo); break; default: WARN(1, "invalid spa type"); @@ -1144,7 +1140,7 @@ static void sp_group_init(struct sp_group *spg, int spg_id, unsigned long flag) INIT_LIST_HEAD(&spg->spa_list); INIT_LIST_HEAD(&spg->mnode); init_rwsem(&spg->rw_lock); - sp_init_group_stat(&spg->instat); + meminfo_init(&spg->meminfo); }

static struct sp_group *create_spg(int spg_id, unsigned long flag) @@ -3671,16 +3667,16 @@ static void get_process_sp_res(struct sp_group_master *master,

list_for_each_entry(spg_node, &master->node_list, group_node) { spg = spg_node->spg; - *sp_res_out += byte2kb(atomic64_read(&spg->instat.alloc_nsize)); - *sp_res_out += byte2kb(atomic64_read(&spg->instat.alloc_hsize)); - *sp_res_nsize_out += byte2kb(atomic64_read(&spg->instat.alloc_nsize)); + *sp_res_out += byte2kb(atomic64_read(&spg->meminfo.alloc_nsize)); + *sp_res_out += byte2kb(atomic64_read(&spg->meminfo.alloc_hsize)); + *sp_res_nsize_out += byte2kb(atomic64_read(&spg->meminfo.alloc_nsize)); } }

static long get_sp_res_by_spg_proc(struct sp_group_node *spg_node) { - return byte2kb(atomic64_read(&spg_node->spg->instat.alloc_nsize) + - atomic64_read(&spg_node->spg->instat.alloc_hsize)); + return byte2kb(atomic64_read(&spg_node->spg->meminfo.alloc_nsize) + + atomic64_read(&spg_node->spg->meminfo.alloc_hsize)); }

/* @@ -3903,11 +3899,11 @@ static int spg_info_show(int id, void *p, void *data)

down_read(&spg->rw_lock); SEQ_printf(seq, "size: %lld KB, spa num: %d, total alloc: %lld KB, normal alloc: %lld KB, huge alloc: %lld KB\n", - byte2kb(atomic64_read(&spg->instat.size)), + byte2kb(atomic64_read(&spg->meminfo.size)), atomic_read(&spg->spa_num), - byte2kb(atomic64_read(&spg->instat.alloc_size)), - byte2kb(atomic64_read(&spg->instat.alloc_nsize)), - byte2kb(atomic64_read(&spg->instat.alloc_hsize))); + byte2kb(atomic64_read(&spg->meminfo.alloc_size)), + byte2kb(atomic64_read(&spg->meminfo.alloc_nsize)), + byte2kb(atomic64_read(&spg->meminfo.alloc_hsize))); up_read(&spg->rw_lock);

return 0;

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 9dd6692d75d1..1dd699371879 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -298,16 +298,16 @@ static void meminfo_dec_usage(unsigned long size, bool huge, struct sp_meminfo * atomic64_sub(size, &meminfo->alloc_nsize); }

-static void meminfo_update_k2u(unsigned long size, bool inc, - struct sp_meminfo *meminfo) +static void meminfo_inc_k2u(unsigned long size, struct sp_meminfo *meminfo) { - if (inc) { - atomic64_add(size, &meminfo->size); - atomic64_add(size, &meminfo->k2u_size); - } else { - atomic64_sub(size, &meminfo->size); - atomic64_sub(size, &meminfo->k2u_size); - } + atomic64_add(size, &meminfo->size); + atomic64_add(size, &meminfo->k2u_size); +} + +static void meminfo_dec_k2u(unsigned long size, struct sp_meminfo *meminfo) +{ + atomic64_sub(size, &meminfo->size); + atomic64_sub(size, &meminfo->k2u_size); }

/* The caller should hold mmap_sem to protect master (TBD) */ @@ -773,12 +773,12 @@ static void spa_inc_usage(struct sp_area *spa) case SPA_TYPE_K2TASK: spa_stat.k2u_task_num += 1; spa_stat.k2u_task_size += size; - meminfo_update_k2u(size, true, &spa->spg->meminfo); + meminfo_inc_k2u(size, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: spa_stat.k2u_spg_num += 1; spa_stat.k2u_spg_size += size; - meminfo_update_k2u(size, true, &spa->spg->meminfo); + meminfo_inc_k2u(size, &spa->spg->meminfo); break; default: WARN(1, "invalid spa type"); @@ -820,12 +820,12 @@ static void spa_dec_usage(struct sp_area *spa) case SPA_TYPE_K2TASK: spa_stat.k2u_task_num -= 1; spa_stat.k2u_task_size -= size; - meminfo_update_k2u(size, false, &spa->spg->meminfo); + meminfo_dec_k2u(size, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: spa_stat.k2u_spg_num -= 1; spa_stat.k2u_spg_size -= size; - meminfo_update_k2u(size, false, &spa->spg->meminfo); + meminfo_dec_k2u(size, &spa->spg->meminfo); break; default: WARN(1, "invalid spa type");

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

The tgid information is also stored in sp_group_master.

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 2ba05eb7d1ca..e11dc2769de5 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -123,7 +123,6 @@ struct sp_meminfo { #ifndef __GENKSYMS__ /* per process memory usage statistics indexed by tgid */ struct sp_proc_stat { - int tgid; char comm[TASK_COMM_LEN]; /* * alloc amount minus free amount, may be negative when freed by @@ -312,13 +311,12 @@ static void meminfo_dec_k2u(unsigned long size, struct sp_meminfo *meminfo) }

/* The caller should hold mmap_sem to protect master (TBD) */ -static void sp_init_group_master_stat(int tgid, struct mm_struct *mm, +static void sp_init_group_master_stat(struct mm_struct *mm, struct sp_proc_stat *stat) { atomic64_set(&stat->alloc_nsize, 0); atomic64_set(&stat->alloc_hsize, 0); atomic64_set(&stat->k2u_size, 0); - stat->tgid = tgid; get_task_comm(stat->comm, current); }

@@ -586,7 +584,7 @@ static int sp_init_group_master_locked(struct task_struct *tsk, struct mm_struct master->count = 0; master->mm = mm; master->tgid = tsk->tgid; - sp_init_group_master_stat(tsk->tgid, mm, &master->instat); + sp_init_group_master_stat(mm, &master->instat); mm->sp_group_master = master; sp_add_group_master(master);

@@ -3771,7 +3769,7 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, "PID", "COMM", "SP_ALLOC", "SP_K2U", "SP_RES", "Non-SP_RES", "Non-SP_Shm", "VIRT"); seq_printf(m, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", - proc_stat->tgid, proc_stat->comm, + master->tgid, proc_stat->comm, get_proc_alloc(proc_stat), get_proc_k2u(proc_stat), sp_res, non_sp_res, non_sp_shm, @@ -3985,7 +3983,7 @@ static int proc_usage_by_group(int id, void *p, void *data) list_for_each_entry(spg_node, &spg->procs, proc_node) { master = spg_node->master; mm = master->mm; - tgid = master->instat.tgid; + tgid = master->tgid;

get_mm_rss_info(mm, &anon, &file, &shmem, &total_rss);

@@ -4054,7 +4052,7 @@ static int proc_usage_show(struct seq_file *seq, void *offset) get_process_non_sp_res(total_rss, shmem, sp_res_nsize, &non_sp_res, &non_sp_shm); seq_printf(seq, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", - proc_stat->tgid, proc_stat->comm, + master->tgid, proc_stat->comm, get_proc_alloc(proc_stat), get_proc_k2u(proc_stat), sp_res, non_sp_res, non_sp_shm, @@ -4285,7 +4283,7 @@ void sp_group_post_exit(struct mm_struct *mm)

if (alloc_size != 0 || k2u_size != 0) pr_info("process %s(%d) exits. It applied %ld aligned KB, k2u shared %ld aligned KB\n", - stat->comm, stat->tgid, + stat->comm, master->tgid, byte2kb(alloc_size), byte2kb(k2u_size)); }

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 106 ++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 70 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 701a7811c012..fd109b452257 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -97,7 +97,7 @@ static LIST_HEAD(spm_dvpp_list); static DEFINE_MUTEX(spm_list_lock);

/* for kthread buff_module_guard_work */ -static struct sp_proc_stat kthread_stat; +static struct sp_meminfo kthread_stat;

#define SEQ_printf(m, x...) \ do { \ @@ -121,18 +121,6 @@ struct sp_meminfo { };

#ifndef __GENKSYMS__ -/* per process memory usage statistics indexed by tgid */ -struct sp_proc_stat { - /* - * alloc amount minus free amount, may be negative when freed by - * another task in the same sp group. - */ - atomic64_t alloc_size; - atomic64_t alloc_nsize; - atomic64_t alloc_hsize; - atomic64_t k2u_size; -}; - /* per process/sp-group memory usage statistics */ struct spg_proc_stat { int tgid; @@ -236,7 +224,7 @@ struct sp_group_master { * For example, sp_alloc non-share memory or k2task. */ struct sp_group *local; - struct sp_proc_stat instat; + struct sp_meminfo meminfo; struct list_head list_node; char comm[TASK_COMM_LEN]; }; @@ -310,15 +298,6 @@ static void meminfo_dec_k2u(unsigned long size, struct sp_meminfo *meminfo) atomic64_sub(size, &meminfo->k2u_size); }

-/* The caller should hold mmap_sem to protect master (TBD) */ -static void sp_init_group_master_stat(struct mm_struct *mm, - struct sp_proc_stat *stat) -{ - atomic64_set(&stat->alloc_nsize, 0); - atomic64_set(&stat->alloc_hsize, 0); - atomic64_set(&stat->k2u_size, 0); -} - static unsigned long sp_mapping_type(struct sp_mapping *spm) { return spm->type; @@ -584,7 +563,7 @@ static int sp_init_group_master_locked(struct task_struct *tsk, struct mm_struct master->mm = mm; master->tgid = tsk->tgid; get_task_comm(master->comm, current); - sp_init_group_master_stat(mm, &master->instat); + meminfo_init(&master->meminfo); mm->sp_group_master = master; sp_add_group_master(master);

@@ -637,40 +616,30 @@ static struct sp_group *sp_get_local_group(struct task_struct *tsk, struct mm_st static void update_mem_usage_alloc(unsigned long size, bool inc, bool is_hugepage, struct sp_group_node *spg_node) { - struct sp_proc_stat *proc_stat = &spg_node->master->instat; - if (inc) { - if (is_hugepage) { + if (is_hugepage) atomic64_add(size, &spg_node->instat.alloc_hsize); - atomic64_add(size, &proc_stat->alloc_hsize); - return; - } - atomic64_add(size, &spg_node->instat.alloc_nsize); - atomic64_add(size, &proc_stat->alloc_nsize); - return; - } - - if (is_hugepage) { - atomic64_sub(size, &spg_node->instat.alloc_hsize); - atomic64_sub(size, &proc_stat->alloc_hsize); - return; + else + atomic64_add(size, &spg_node->instat.alloc_nsize); + meminfo_inc_usage(size, is_hugepage, &spg_node->master->meminfo); + } else { + if (is_hugepage) + atomic64_sub(size, &spg_node->instat.alloc_hsize); + else + atomic64_sub(size, &spg_node->instat.alloc_nsize); + meminfo_dec_usage(size, is_hugepage, &spg_node->master->meminfo); } - atomic64_sub(size, &spg_node->instat.alloc_nsize); - atomic64_sub(size, &proc_stat->alloc_nsize); - return; }

static void update_mem_usage_k2u(unsigned long size, bool inc, struct sp_group_node *spg_node) { - struct sp_proc_stat *proc_stat = &spg_node->master->instat; - if (inc) { atomic64_add(size, &spg_node->instat.k2u_size); - atomic64_add(size, &proc_stat->k2u_size); + meminfo_inc_k2u(size, &spg_node->master->meminfo); } else { atomic64_sub(size, &spg_node->instat.k2u_size); - atomic64_sub(size, &proc_stat->k2u_size); + meminfo_dec_k2u(size, &spg_node->master->meminfo); } }

@@ -3662,15 +3631,15 @@ static void get_mm_rss_info(struct mm_struct *mm, unsigned long *anon, *total_rss = *anon + *file + *shmem; }

-static long get_proc_k2u(struct sp_proc_stat *stat) +static long get_proc_k2u(struct sp_meminfo *meminfo) { - return byte2kb(atomic64_read(&stat->k2u_size)); + return byte2kb(atomic64_read(&meminfo->k2u_size)); }

-static long get_proc_alloc(struct sp_proc_stat *stat) +static long get_proc_alloc(struct sp_meminfo *meminfo) { - return byte2kb(atomic64_read(&stat->alloc_nsize) + - atomic64_read(&stat->alloc_hsize)); + return byte2kb(atomic64_read(&meminfo->alloc_nsize) + + atomic64_read(&meminfo->alloc_hsize)); }

static void get_process_sp_res(struct sp_group_master *master, @@ -3740,7 +3709,7 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, { struct mm_struct *mm; struct sp_group_master *master; - struct sp_proc_stat *proc_stat; + struct sp_meminfo *meminfo; struct sp_group_node *spg_node; unsigned long anon, file, shmem, total_rss; long sp_res, sp_res_nsize, non_sp_res, non_sp_shm; @@ -3759,7 +3728,7 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, goto out;

get_mm_rss_info(mm, &anon, &file, &shmem, &total_rss); - proc_stat = &master->instat; + meminfo = &master->meminfo; get_process_sp_res(master, &sp_res, &sp_res_nsize); get_process_non_sp_res(total_rss, shmem, sp_res_nsize, &non_sp_res, &non_sp_shm); @@ -3770,8 +3739,8 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, "Non-SP_Shm", "VIRT"); seq_printf(m, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", master->tgid, master->comm, - get_proc_alloc(proc_stat), - get_proc_k2u(proc_stat), + get_proc_alloc(meminfo), + get_proc_k2u(meminfo), sp_res, non_sp_res, non_sp_shm, page2kb(mm->total_vm));

@@ -4034,7 +4003,7 @@ static int proc_usage_show(struct seq_file *seq, void *offset) struct sp_group_master *master = NULL; unsigned long anon, file, shmem, total_rss; long sp_res, sp_res_nsize, non_sp_res, non_sp_shm; - struct sp_proc_stat *proc_stat; + struct sp_meminfo *meminfo;

if (!should_show_statistics()) return -EPERM; @@ -4046,15 +4015,15 @@ static int proc_usage_show(struct seq_file *seq, void *offset) down_read(&sp_group_sem); mutex_lock(&master_list_lock); list_for_each_entry(master, &master_list, list_node) { - proc_stat = &master->instat; + meminfo = &master->meminfo; get_mm_rss_info(master->mm, &anon, &file, &shmem, &total_rss); get_process_sp_res(master, &sp_res, &sp_res_nsize); get_process_non_sp_res(total_rss, shmem, sp_res_nsize, &non_sp_res, &non_sp_shm); seq_printf(seq, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", master->tgid, master->comm, - get_proc_alloc(proc_stat), - get_proc_k2u(proc_stat), + get_proc_alloc(meminfo), + get_proc_k2u(meminfo), sp_res, non_sp_res, non_sp_shm, page2kb(master->mm->total_vm)); } @@ -4251,7 +4220,7 @@ int sp_group_exit(void)

void sp_group_post_exit(struct mm_struct *mm) { - struct sp_proc_stat *stat; + struct sp_meminfo *meminfo; long alloc_size, k2u_size; /* lockless visit */ struct sp_group_master *master = mm->sp_group_master; @@ -4276,16 +4245,13 @@ void sp_group_post_exit(struct mm_struct *mm) * A process not in an sp group doesn't need to print because there * wont't be any memory which is not freed. */ - stat = &master->instat; - if (stat) { - alloc_size = atomic64_read(&stat->alloc_nsize) + atomic64_read(&stat->alloc_hsize); - k2u_size = atomic64_read(&stat->k2u_size); - - if (alloc_size != 0 || k2u_size != 0) - pr_info("process %s(%d) exits. It applied %ld aligned KB, k2u shared %ld aligned KB\n", - master->comm, master->tgid, - byte2kb(alloc_size), byte2kb(k2u_size)); - } + meminfo = &master->meminfo; + alloc_size = atomic64_read(&meminfo->alloc_nsize) + atomic64_read(&meminfo->alloc_hsize); + k2u_size = atomic64_read(&meminfo->k2u_size); + if (alloc_size != 0 || k2u_size != 0) + pr_info("process %s(%d) exits. It applied %ld aligned KB, k2u shared %ld aligned KB\n", + master->comm, master->tgid, + byte2kb(alloc_size), byte2kb(k2u_size));

down_write(&sp_group_sem); list_for_each_entry_safe(spg_node, tmp, &master->node_list, group_node) {

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 54994d38ff5b..f823486d5343 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -121,17 +121,6 @@ struct sp_meminfo { };

#ifndef __GENKSYMS__ -/* per process/sp-group memory usage statistics */ -struct spg_proc_stat { - /* - * alloc amount minus free amount, may be negative when freed by - * another task in the same sp group. - */ - atomic64_t alloc_size; - atomic64_t alloc_nsize; - atomic64_t alloc_hsize; - atomic64_t k2u_size; -};

enum sp_mapping_type { SP_MAPPING_START, @@ -241,7 +230,12 @@ struct sp_group_node { struct sp_group_master *master; struct sp_group *spg; unsigned long prot; - struct spg_proc_stat instat; + + /* + * alloc amount minus free amount, may be negative when freed by + * another task in the same sp group. + */ + struct sp_meminfo meminfo; }; #endif

@@ -615,16 +609,10 @@ static void update_mem_usage_alloc(unsigned long size, bool inc, bool is_hugepage, struct sp_group_node *spg_node) { if (inc) { - if (is_hugepage) - atomic64_add(size, &spg_node->instat.alloc_hsize); - else - atomic64_add(size, &spg_node->instat.alloc_nsize); + meminfo_inc_usage(size, is_hugepage, &spg_node->meminfo); meminfo_inc_usage(size, is_hugepage, &spg_node->master->meminfo); } else { - if (is_hugepage) - atomic64_sub(size, &spg_node->instat.alloc_hsize); - else - atomic64_sub(size, &spg_node->instat.alloc_nsize); + meminfo_dec_usage(size, is_hugepage, &spg_node->meminfo); meminfo_dec_usage(size, is_hugepage, &spg_node->master->meminfo); } } @@ -633,21 +621,14 @@ static void update_mem_usage_k2u(unsigned long size, bool inc, struct sp_group_node *spg_node) { if (inc) { - atomic64_add(size, &spg_node->instat.k2u_size); + meminfo_inc_k2u(size, &spg_node->meminfo); meminfo_inc_k2u(size, &spg_node->master->meminfo); } else { - atomic64_sub(size, &spg_node->instat.k2u_size); + meminfo_dec_k2u(size, &spg_node->meminfo); meminfo_dec_k2u(size, &spg_node->master->meminfo); } }

-static void sp_init_spg_proc_stat(struct spg_proc_stat *stat) -{ - atomic64_set(&stat->alloc_nsize, 0); - atomic64_set(&stat->alloc_hsize, 0); - atomic64_set(&stat->k2u_size, 0); -} - /* statistics of all sp area, protected by sp_area_lock */ struct sp_spa_stat { unsigned int total_num; @@ -1265,7 +1246,7 @@ static struct sp_group_node *create_spg_node(struct mm_struct *mm, spg_node->spg = spg; spg_node->master = master; spg_node->prot = prot; - sp_init_spg_proc_stat(&spg_node->instat); + meminfo_init(&spg_node->meminfo);

list_add_tail(&spg_node->group_node, &master->node_list); master->count++; @@ -3681,13 +3662,13 @@ static void get_process_non_sp_res(unsigned long total_rss, unsigned long shmem,

static long get_spg_proc_alloc(struct sp_group_node *spg_node) { - return byte2kb(atomic64_read(&spg_node->instat.alloc_nsize) + - atomic64_read(&spg_node->instat.alloc_hsize)); + return byte2kb(atomic64_read(&spg_node->meminfo.alloc_nsize) + + atomic64_read(&spg_node->meminfo.alloc_hsize)); }

static long get_spg_proc_k2u(struct sp_group_node *spg_node) { - return byte2kb(atomic64_read(&spg_node->instat.k2u_size)); + return byte2kb(atomic64_read(&spg_node->meminfo.k2u_size)); }

static void print_process_prot(struct seq_file *seq, unsigned long prot)

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

Add meminfo_k2u_size and delete duplicate or similar code.

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index beff18790354..5337fcda8ba3 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -301,6 +301,11 @@ static inline long meminfo_alloc_sum_byKB(struct sp_meminfo *meminfo) return byte2kb(meminfo_alloc_sum(meminfo)); }

+static inline long meminfo_k2u_size(struct sp_meminfo *meminfo) +{ + return byte2kb(atomic64_read(&meminfo->k2u_size)); +} + static unsigned long sp_mapping_type(struct sp_mapping *spm) { return spm->type; @@ -3619,11 +3624,6 @@ static void get_mm_rss_info(struct mm_struct *mm, unsigned long *anon, *total_rss = *anon + *file + *shmem; }

-static long get_proc_k2u(struct sp_meminfo *meminfo) -{ - return byte2kb(atomic64_read(&meminfo->k2u_size)); -} - static void get_process_sp_res(struct sp_group_master *master, long *sp_res_out, long *sp_res_nsize_out) { @@ -3658,11 +3658,6 @@ static void get_process_non_sp_res(unsigned long total_rss, unsigned long shmem, *non_sp_shm_out = non_sp_shm; }

-static long get_spg_proc_k2u(struct sp_group_node *spg_node) -{ - return byte2kb(atomic64_read(&spg_node->meminfo.k2u_size)); -} - static void print_process_prot(struct seq_file *seq, unsigned long prot) { if (prot == PROT_READ) @@ -3709,7 +3704,7 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, seq_printf(m, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", master->tgid, master->comm, meminfo_alloc_sum_byKB(meminfo), - get_proc_k2u(meminfo), + meminfo_k2u_size(meminfo), sp_res, non_sp_res, non_sp_shm, page2kb(mm->total_vm));

@@ -3721,7 +3716,7 @@ int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, seq_printf(m, "%-8d %-9ld %-9ld %-9ld ", spg_node->spg->id, meminfo_alloc_sum_byKB(&spg_node->meminfo), - get_spg_proc_k2u(spg_node), + meminfo_k2u_size(&spg_node->meminfo), meminfo_alloc_sum_byKB(&spg_node->spg->meminfo)); print_process_prot(m, spg_node->prot); seq_putc(m, '\n'); @@ -3929,7 +3924,7 @@ static int proc_usage_by_group(int id, void *p, void *data) seq_printf(seq, "%-8d ", id); seq_printf(seq, "%-9ld %-9ld %-9ld %-8ld %-7ld %-7ld ", meminfo_alloc_sum_byKB(&spg_node->meminfo), - get_spg_proc_k2u(spg_node), + meminfo_k2u_size(&spg_node->meminfo), meminfo_alloc_sum_byKB(&spg_node->spg->meminfo), page2kb(mm->total_vm), page2kb(total_rss), page2kb(shmem)); @@ -3992,7 +3987,7 @@ static int proc_usage_show(struct seq_file *seq, void *offset) seq_printf(seq, "%-8d %-16s %-9ld %-9ld %-9ld %-10ld %-10ld %-8ld\n", master->tgid, master->comm, meminfo_alloc_sum_byKB(meminfo), - get_proc_k2u(meminfo), + meminfo_k2u_size(meminfo), sp_res, non_sp_res, non_sp_shm, page2kb(master->mm->total_vm)); }

From: Xu Qiang xuqiang36@huawei.com

Offering: HULK hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6ET9W

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

alloc_size can be obtained by adding alloc_nsize to alloc_hsize, and size can be obtained by adding alloc_nsize to alloc_hsize and k2u_size. Therefore, alloc_size and size are redundant and can be deleted.

Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index 51625bf11b87..eed1a454f3bd 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -105,14 +105,10 @@ do { \ } while (0)

struct sp_meminfo { - /* total size from sp_alloc and k2u */ - atomic64_t size; /* not huge page size from sp_alloc */ atomic64_t alloc_nsize; /* huge page size from sp_alloc */ atomic64_t alloc_hsize; - /* total size from sp_alloc */ - atomic64_t alloc_size; /* total size from sp_k2u */ atomic64_t k2u_size; }; @@ -257,8 +253,6 @@ static void meminfo_init(struct sp_meminfo *meminfo)

static void meminfo_inc_usage(unsigned long size, bool huge, struct sp_meminfo *meminfo) { - atomic64_add(size, &meminfo->size); - atomic64_add(size, &meminfo->alloc_size); if (huge) atomic64_add(size, &meminfo->alloc_hsize); else @@ -267,8 +261,6 @@ static void meminfo_inc_usage(unsigned long size, bool huge, struct sp_meminfo *

static void meminfo_dec_usage(unsigned long size, bool huge, struct sp_meminfo *meminfo) { - atomic64_sub(size, &meminfo->size); - atomic64_sub(size, &meminfo->alloc_size); if (huge) atomic64_sub(size, &meminfo->alloc_hsize); else @@ -277,13 +269,11 @@ static void meminfo_dec_usage(unsigned long size, bool huge, struct sp_meminfo *

static void meminfo_inc_k2u(unsigned long size, struct sp_meminfo *meminfo) { - atomic64_add(size, &meminfo->size); atomic64_add(size, &meminfo->k2u_size); }

static void meminfo_dec_k2u(unsigned long size, struct sp_meminfo *meminfo) { - atomic64_sub(size, &meminfo->size); atomic64_sub(size, &meminfo->k2u_size); }

@@ -303,6 +293,13 @@ static inline long meminfo_k2u_size(struct sp_meminfo *meminfo) return byte2kb(atomic64_read(&meminfo->k2u_size)); }

+static inline long long meminfo_total_size(struct sp_meminfo *meminfo) +{ + return atomic64_read(&meminfo->alloc_nsize) + + atomic64_read(&meminfo->alloc_hsize) + + atomic64_read(&meminfo->k2u_size); +} + static unsigned long sp_mapping_type(struct sp_mapping *spm) { return spm->type; @@ -3841,10 +3838,10 @@ static int spg_info_show(int id, void *p, void *data) SEQ_printf(seq, "Group %6d ", id);

down_read(&spg->rw_lock); - SEQ_printf(seq, "size: %lld KB, spa num: %d, total alloc: %lld KB, normal alloc: %lld KB, huge alloc: %lld KB\n", - byte2kb(atomic64_read(&spg->meminfo.size)), + SEQ_printf(seq, "size: %lld KB, spa num: %d, total alloc: %ld KB, normal alloc: %lld KB, huge alloc: %lld KB\n", + byte2kb(meminfo_total_size(&spg->meminfo)), atomic_read(&spg->spa_num), - byte2kb(atomic64_read(&spg->meminfo.alloc_size)), + meminfo_alloc_sum_byKB(&spg->meminfo), byte2kb(atomic64_read(&spg->meminfo.alloc_nsize)), byte2kb(atomic64_read(&spg->meminfo.alloc_hsize))); up_read(&spg->rw_lock);

From: Chen Jun chenjun102@huawei.com

Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I650K6

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

delete_spg_node can be use to replace the code snippets as follows: list_del(&node->proc_node); spg->proc_num--;

Signed-off-by: Chen Jun chenjun102@huawei.com --- mm/share_pool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index f0e3cd26076e..55f3a00971a5 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -1666,8 +1666,7 @@ int mg_sp_group_del_task(int tgid, int spg_id)

if (list_is_singular(&spg->procs)) is_alive = spg->is_alive = false; - spg->proc_num--; - list_del(&spg_node->proc_node); + delete_spg_node(spg, spg_node); sp_group_put(spg); up_write(&spg->rw_lock); if (!is_alive) @@ -4151,8 +4150,7 @@ int sp_group_exit(void) /* a dead group should NOT be reactive again */ if (spg_valid(spg) && list_is_singular(&spg->procs)) is_alive = spg->is_alive = false; - spg->proc_num--; - list_del(&spg_node->proc_node); + delete_spg_node(spg, spg_node); up_write(&spg->rw_lock);

if (!is_alive)

From: Guo Mengqi guomengqi3@huawei.com

Offering: HULK hulk inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0N5

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

Add static modifier to find_spg_node_by_spg(), for this function is designed as an internal helper function, should only be used in share_pool.c scope. Also add static modifier to spa_overview_show and spg_overview_show.

Signed-off-by: Guo Mengqi guomengqi3@huawei.com --- mm/share_pool.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/mm/share_pool.c b/mm/share_pool.c index bf5e75e36c87..ce4837da8a9a 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -114,7 +114,6 @@ struct sp_meminfo { };

#ifndef __GENKSYMS__ - enum sp_mapping_type { SP_MAPPING_START, SP_MAPPING_DVPP = SP_MAPPING_START, @@ -465,11 +464,13 @@ static int sp_mapping_group_setup(struct mm_struct *mm, struct sp_group *spg) if (is_mapping_empty(local_dvpp_mapping)) { sp_mapping_merge(spg_dvpp_mapping, local_dvpp_mapping); if (is_conflict) - pr_warn_ratelimited("task address space conflict, spg_id=%d\n", spg->id); + pr_warn_ratelimited("task address space conflict, spg_id=%d\n", + spg->id); } else if (is_mapping_empty(spg_dvpp_mapping)) { sp_mapping_merge(local_dvpp_mapping, spg_dvpp_mapping); if (is_conflict) - pr_warn_ratelimited("group address space conflict, spg_id=%d\n", spg->id); + pr_warn_ratelimited("group address space conflict, spg_id=%d\n", + spg->id); } else { pr_info_ratelimited("Duplicate address space, id=%d\n", spg->id); return -EINVAL; @@ -823,7 +824,7 @@ static void update_mem_usage(unsigned long size, bool inc, bool is_hugepage, } }

-struct sp_group_node *find_spg_node_by_spg(struct mm_struct *mm, +static struct sp_group_node *find_spg_node_by_spg(struct mm_struct *mm, struct sp_group *spg) { struct sp_group_node *spg_node; @@ -2443,7 +2444,6 @@ static int sp_alloc_populate(struct mm_struct *mm, struct sp_area *spa, * page fault later on, and more importantly sp_make_share_u2k() * depends on this feature (and MAP_LOCKED) to work correctly. */ - return do_mm_populate(mm, spa->va_start, ac->populate, 0); }

@@ -2464,7 +2464,6 @@ static int __sp_alloc_mmap_populate(struct mm_struct *mm, struct sp_area *spa, int ret;

ret = sp_alloc_mmap(mm, spa, spg_node, ac); - if (ret < 0) return ret;

@@ -2486,6 +2485,7 @@ static int __sp_alloc_mmap_populate(struct mm_struct *mm, struct sp_area *spa, pr_warn_ratelimited("allocation failed due to mm populate failed(potential no enough memory when -12): %d\n", ret); } + return ret; }

@@ -2538,8 +2538,7 @@ static int sp_alloc_mmap_populate(struct sp_area *spa, sp_fallocate(spa);

/* if hugepage allocation fails, this will transfer to normal page - * and try again. (only if SP_HUGEPAGE_ONLY is not flagged - */ + * and try again. (only if SP_HUGEPAGE_ONLY is not flagged */ sp_alloc_fallback(spa, ac);

return mmap_ret; @@ -3796,7 +3795,7 @@ static void spa_dvpp_stat_show(struct seq_file *seq) }

-void spa_overview_show(struct seq_file *seq) +static void spa_overview_show(struct seq_file *seq) { unsigned int total_num, alloc_num, k2u_task_num, k2u_spg_num; unsigned long total_size, alloc_size, k2u_task_size, k2u_spg_size; @@ -3852,7 +3851,7 @@ static int spg_info_show(int id, void *p, void *data) return 0; }

-void spg_overview_show(struct seq_file *seq) +static void spg_overview_show(struct seq_file *seq) { if (!sp_is_enabled()) return; @@ -4121,7 +4120,7 @@ vm_fault_t sharepool_no_page(struct mm_struct *mm, goto out; }

-/* +/** * The caller must ensure that this function is called * when the last thread in the thread group exits. */