Sync patches for sharepool - Fix some bugs in code - Add a new feature for sharepool
v2: - Fix some errors in patch 1, missing some code because of using git format-patch wrongly.
Chen Jun (1): mm/sharepool: Add mg_sp_alloc_nodemask
Xu Qiang (5): mm/sharepool: Change data type of members in sp_spa_stat to atomic64. mm/sharepool: Delete SPG_FLAG_NON_DVPP. mm/sharepool: Add sp_group_sem protection. mm/sharepool: Delete total_num and total_size in sp_spa_stat mm/sharepool: Delete unused flag in sp_group.
include/linux/hugetlb.h | 15 ++ include/linux/share_pool.h | 12 +- include/linux/share_pool_interface.h | 19 +++ mm/hugetlb.c | 30 +++- mm/mempolicy.c | 4 +- mm/share_pool.c | 222 ++++++++++++++------------- 6 files changed, 180 insertions(+), 122 deletions(-) create mode 100644 include/linux/share_pool_interface.h
From: Chen Jun chenjun102@huawei.com
hulk inclusion category: feature bugzilla: N/A
--------------------------------
Support alloc memory from nodes.
mg_sp_alloc allow to alloc memory from one node. If the node have no enough memory, the caller would pick a next node. But that has a lot of overhead.
To improve performance, we support a new interface to alloc memory from nodes.
Signed-off-by: Chen Jun chenjun102@huawei.com --- include/linux/hugetlb.h | 15 +++++ include/linux/share_pool.h | 10 ++-- include/linux/share_pool_interface.h | 19 +++++++ mm/hugetlb.c | 30 ++++++++-- mm/mempolicy.c | 4 +- mm/share_pool.c | 84 +++++++++++++++++----------- 6 files changed, 118 insertions(+), 44 deletions(-) create mode 100644 include/linux/share_pool_interface.h
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 1c780d188e8c..366777ab3ba1 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -629,6 +629,9 @@ int huge_add_to_page_cache(struct page *page, struct address_space *mapping,
const struct hstate *hugetlb_get_hstate(void); struct page *hugetlb_alloc_hugepage(int nid, int flag); +struct page *hugetlb_alloc_hugepage_vma(struct vm_area_struct *vma, + unsigned long address, int flag); + int hugetlb_insert_hugepage_pte(struct mm_struct *mm, unsigned long addr, pgprot_t prot, struct page *hpage); int hugetlb_insert_hugepage_pte_by_pa(struct mm_struct *mm, @@ -645,6 +648,12 @@ static inline struct page *hugetlb_alloc_hugepage(int nid, int flag) return NULL; }
+static inline struct page *hugetlb_alloc_hugepage_vma(struct vm_area_struct *vma, + unsigned long address, int flag) +{ + return NULL; +} + static inline int hugetlb_insert_hugepage_pte(struct mm_struct *mm, unsigned long addr, pgprot_t prot, struct page *hpage) { @@ -1091,6 +1100,12 @@ static inline struct page *hugetlb_alloc_hugepage(int nid, int flag) return NULL; }
+static inline struct page *hugetlb_alloc_hugepage_vma(struct vm_area_struct *vma, + unsigned long address, int flag) +{ + return NULL; +} + static inline int hugetlb_insert_hugepage_pte(struct mm_struct *mm, unsigned long addr, pgprot_t prot, struct page *hpage) { diff --git a/include/linux/share_pool.h b/include/linux/share_pool.h index 8190c8d82439..04feea9b924d 100644 --- a/include/linux/share_pool.h +++ b/include/linux/share_pool.h @@ -12,6 +12,8 @@ #include <linux/jump_label.h> #include <linux/kabi.h>
+#include <linux/share_pool_interface.h> + #define SP_HUGEPAGE (1 << 0) #define SP_HUGEPAGE_ONLY (1 << 1) #define SP_DVPP (1 << 2) @@ -256,6 +258,8 @@ extern int proc_sp_group_state(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
extern void *mg_sp_alloc(unsigned long size, unsigned long sp_flags, int spg_id); +extern void *mg_sp_alloc_nodemask(unsigned long size, unsigned long sp_flags, int spg_id, + nodemask_t nodemask); extern int mg_sp_free(unsigned long addr, int id);
extern void *mg_sp_make_share_k2u(unsigned long kva, unsigned long size, @@ -286,7 +290,6 @@ vm_fault_t sharepool_no_page(struct mm_struct *mm, unsigned long address, pte_t *ptep, unsigned int flags); extern bool sp_check_addr(unsigned long addr); extern bool sp_check_mmap_addr(unsigned long addr, unsigned long flags); -extern int sp_node_id(struct vm_area_struct *vma);
static inline bool sp_is_enabled(void) { @@ -452,11 +455,6 @@ static inline bool is_vmalloc_sharepool(unsigned long vm_flags) return NULL; }
-static inline int sp_node_id(struct vm_area_struct *vma) -{ - return numa_node_id(); -} - static inline bool sp_check_addr(unsigned long addr) { return false; diff --git a/include/linux/share_pool_interface.h b/include/linux/share_pool_interface.h new file mode 100644 index 000000000000..8cd82859902f --- /dev/null +++ b/include/linux/share_pool_interface.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef LINUX_SHARE_POOL_INTERFACE_H +#define LINUX_SHARE_POOL_INTERFACE_H + +#include <linux/mman.h> +#include <linux/mm_types.h> +#include <linux/numa.h> +#include <linux/kabi.h> + +#ifdef CONFIG_ASCEND_SHARE_POOL +extern int sp_node_id(struct vm_area_struct *vma); +#else +static inline int sp_node_id(struct vm_area_struct *vma) +{ + return numa_node_id(); +} +#endif /* !CONFIG_ASCEND_SHARE_POOL */ + +#endif /* LINUX_SHARE_POOL_INTERFACE_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a55197135afa..a1cf6a1e9cec 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6312,7 +6312,7 @@ static struct page *hugetlb_alloc_hugepage_normal(struct hstate *h, /* * Allocate hugepage without reserve */ -struct page *hugetlb_alloc_hugepage(int nid, int flag) +struct page *hugetlb_alloc_hugepage_nodemask(int nid, int flag, nodemask_t *nodemask) { struct hstate *h = &default_hstate; gfp_t gfp_mask = htlb_alloc_mask(h); @@ -6327,7 +6327,6 @@ struct page *hugetlb_alloc_hugepage(int nid, int flag) if (flag & ~HUGETLB_ALLOC_MASK) return NULL;
- gfp_mask |= __GFP_THISNODE; if (enable_charge_mighp) gfp_mask |= __GFP_ACCOUNT;
@@ -6337,12 +6336,22 @@ struct page *hugetlb_alloc_hugepage(int nid, int flag) if (flag & HUGETLB_ALLOC_NORMAL) page = hugetlb_alloc_hugepage_normal(h, gfp_mask, nid); else if (flag & HUGETLB_ALLOC_BUDDY) - page = alloc_migrate_huge_page(h, gfp_mask, nid, NULL); + page = alloc_migrate_huge_page(h, gfp_mask, nid, nodemask); else - page = alloc_huge_page_nodemask(h, nid, NULL, gfp_mask); + page = alloc_huge_page_nodemask(h, nid, nodemask, gfp_mask);
return page; } + +struct page *hugetlb_alloc_hugepage(int nid, int flag) +{ + nodemask_t nodemask; + + nodes_clear(nodemask); + node_set(nid, nodemask); + + return hugetlb_alloc_hugepage_nodemask(nid, flag, &nodemask); +} EXPORT_SYMBOL_GPL(hugetlb_alloc_hugepage);
static pte_t *hugetlb_huge_pte_alloc(struct mm_struct *mm, unsigned long addr, @@ -6364,6 +6373,19 @@ static pte_t *hugetlb_huge_pte_alloc(struct mm_struct *mm, unsigned long addr, return ptep; }
+struct page *hugetlb_alloc_hugepage_vma(struct vm_area_struct *vma, unsigned long address, int flag) +{ + int nid; + struct hstate *h = hstate_vma(vma); + struct mempolicy *mpol; + nodemask_t *nodemask; + gfp_t gfp_mask; + + gfp_mask = htlb_alloc_mask(h); + nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask); + return hugetlb_alloc_hugepage_nodemask(nid, flag, nodemask); +} + static int __hugetlb_insert_hugepage(struct mm_struct *mm, unsigned long addr, pgprot_t prot, unsigned long pfn) { diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b58ec3f98896..c43df3206ab6 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -103,6 +103,8 @@ #include <linux/printk.h> #include <linux/swapops.h>
+#include <linux/share_pool_interface.h> + #include <asm/tlbflush.h> #include <linux/uaccess.h>
@@ -2198,7 +2200,7 @@ int huge_node(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, nid = interleave_nid(*mpol, vma, addr, huge_page_shift(hstate_vma(vma))); } else { - nid = policy_node(gfp_flags, *mpol, numa_node_id()); + nid = policy_node(gfp_flags, *mpol, sp_node_id(vma)); if ((*mpol)->mode == MPOL_BIND || mode == MPOL_PREFERRED_MANY) *nodemask = &(*mpol)->v.nodes; } diff --git a/mm/share_pool.c b/mm/share_pool.c index ce4837da8a9a..8b46af5fae47 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -700,7 +700,7 @@ struct sp_area { struct mm_struct *mm; /* owner of k2u(task) */ unsigned long kva; /* shared kva */ pid_t applier; /* the original applier process */ - int node_id; /* memory node */ + int preferred_node_id; /* memory node */ int device_id; }; static DEFINE_SPINLOCK(sp_area_lock); @@ -1892,7 +1892,7 @@ static struct sp_area *sp_alloc_area(unsigned long size, unsigned long flags, spa->mm = NULL; spa->kva = 0; /* NULL pointer */ spa->applier = applier; - spa->node_id = node_id; + spa->preferred_node_id = node_id; spa->device_id = device_id;
spa_inc_usage(spa); @@ -2191,7 +2191,9 @@ static int sp_free_get_spa(struct sp_free_context *fc) }
/** - * mg_sp_free() - Free the memory allocated by mg_sp_alloc(). + * mg_sp_free() - Free the memory allocated by mg_sp_alloc() or + * mg_sp_alloc_nodemask(). + * * @addr: the starting VA of the memory. * @id: Address space identifier, which is used to distinguish the addr. * @@ -2448,18 +2450,15 @@ static int sp_alloc_populate(struct mm_struct *mm, struct sp_area *spa, }
static long sp_mbind(struct mm_struct *mm, unsigned long start, unsigned long len, - unsigned long node) + nodemask_t *nodemask) { - nodemask_t nmask; - - nodes_clear(nmask); - node_set(node, nmask); return __do_mbind(start, len, MPOL_BIND, MPOL_F_STATIC_NODES, - &nmask, MPOL_MF_STRICT, mm); + nodemask, MPOL_MF_STRICT, mm); }
static int __sp_alloc_mmap_populate(struct mm_struct *mm, struct sp_area *spa, - struct sp_group_node *spg_node, struct sp_alloc_context *ac) + struct sp_group_node *spg_node, struct sp_alloc_context *ac, + nodemask_t *nodemask) { int ret;
@@ -2468,10 +2467,10 @@ static int __sp_alloc_mmap_populate(struct mm_struct *mm, struct sp_area *spa, return ret;
if (!ac->have_mbind) { - ret = sp_mbind(mm, spa->va_start, spa->real_size, spa->node_id); + ret = sp_mbind(mm, spa->va_start, spa->real_size, nodemask); if (ret < 0) { - pr_err("cannot bind the memory range to specified node:%d, err:%d\n", - spa->node_id, ret); + pr_err("cannot bind the memory range to node[%*pbl], err:%d\n", + nodemask_pr_args(nodemask), ret); return ret; } ac->have_mbind = true; @@ -2490,17 +2489,25 @@ static int __sp_alloc_mmap_populate(struct mm_struct *mm, struct sp_area *spa, }
static int sp_alloc_mmap_populate(struct sp_area *spa, - struct sp_alloc_context *ac) + struct sp_alloc_context *ac, + nodemask_t *nodemask) { int ret = -EINVAL; int mmap_ret = 0; struct mm_struct *mm, *end_mm = NULL; struct sp_group_node *spg_node; + nodemask_t __nodemask; + + if (!nodemask) { /* mg_sp_alloc */ + nodes_clear(__nodemask); + node_set(spa->preferred_node_id, __nodemask); + } else /* mg_sp_alloc_nodemask */ + __nodemask = *nodemask;
/* create mapping for each process in the group */ list_for_each_entry(spg_node, &spa->spg->procs, proc_node) { mm = spg_node->master->mm; - mmap_ret = __sp_alloc_mmap_populate(mm, spa, spg_node, ac); + mmap_ret = __sp_alloc_mmap_populate(mm, spa, spg_node, ac, &__nodemask); if (mmap_ret) {
/* @@ -2563,19 +2570,8 @@ static void sp_alloc_finish(int result, struct sp_area *spa, sp_group_put(spg); }
-/** - * mg_sp_alloc() - Allocate shared memory for all the processes in a sp_group. - * @size: the size of memory to allocate. - * @sp_flags: how to allocate the memory. - * @spg_id: the share group that the memory is allocated to. - * - * Use pass through allocation if spg_id == SPG_ID_DEFAULT in multi-group mode. - * - * Return: - * * if succeed, return the starting address of the shared memory. - * * if fail, return the pointer of -errno. - */ -void *mg_sp_alloc(unsigned long size, unsigned long sp_flags, int spg_id) +void *__mg_sp_alloc_nodemask(unsigned long size, unsigned long sp_flags, int spg_id, + nodemask_t *nodemask) { struct sp_area *spa = NULL; int ret = 0; @@ -2598,7 +2594,7 @@ void *mg_sp_alloc(unsigned long size, unsigned long sp_flags, int spg_id) goto out; }
- ret = sp_alloc_mmap_populate(spa, &ac); + ret = sp_alloc_mmap_populate(spa, &ac, nodemask); if (ret && ac.state == ALLOC_RETRY) { /* * The mempolicy for shared memory is located at backend file, which varies @@ -2616,6 +2612,30 @@ void *mg_sp_alloc(unsigned long size, unsigned long sp_flags, int spg_id) else return (void *)(spa->va_start); } + +void *mg_sp_alloc_nodemask(unsigned long size, unsigned long sp_flags, int spg_id, + nodemask_t nodemask) +{ + return __mg_sp_alloc_nodemask(size, sp_flags, spg_id, &nodemask); +} +EXPORT_SYMBOL_GPL(mg_sp_alloc_nodemask); + +/** + * mg_sp_alloc() - Allocate shared memory for all the processes in a sp_group. + * @size: the size of memory to allocate. + * @sp_flags: how to allocate the memory. + * @spg_id: the share group that the memory is allocated to. + * + * Use pass through allocation if spg_id == SPG_ID_DEFAULT in multi-group mode. + * + * Return: + * * if succeed, return the starting address of the shared memory. + * * if fail, return the pointer of -errno. + */ +void *mg_sp_alloc(unsigned long size, unsigned long sp_flags, int spg_id) +{ + return __mg_sp_alloc_nodemask(size, sp_flags, spg_id, NULL); +} EXPORT_SYMBOL_GPL(mg_sp_alloc);
/** @@ -3599,7 +3619,7 @@ int sp_node_id(struct vm_area_struct *vma)
if (vma && (vma->vm_flags & VM_SHARE_POOL) && vma->vm_private_data) { spa = vma->vm_private_data; - node_id = spa->node_id; + node_id = spa->preferred_node_id; }
return node_id; @@ -4028,7 +4048,6 @@ vm_fault_t sharepool_no_page(struct mm_struct *mm, unsigned long haddr = address & huge_page_mask(h); bool new_page = false; int err; - int node_id; struct sp_area *spa; bool charge_hpage;
@@ -4037,7 +4056,6 @@ vm_fault_t sharepool_no_page(struct mm_struct *mm, pr_err("share pool: vma is invalid, not from sp mmap\n"); return ret; } - node_id = spa->node_id;
retry: page = find_lock_page(mapping, idx); @@ -4049,7 +4067,7 @@ vm_fault_t sharepool_no_page(struct mm_struct *mm, charge_hpage = false; page = alloc_huge_page(vma, haddr, 0); if (IS_ERR(page)) { - page = hugetlb_alloc_hugepage(node_id, + page = hugetlb_alloc_hugepage_vma(vma, haddr, HUGETLB_ALLOC_BUDDY | HUGETLB_ALLOC_NORECLAIM); if (!page) page = ERR_PTR(-ENOMEM);
From: Xu Qiang xuqiang36@huawei.com
hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X
----------------------------------------------
Member of sp_spa_stat is changed to atomic64_t to solve the concurrency problem.Spa_stat no longer needs sp_area_lock protection.
Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 109 +++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 56 deletions(-)
diff --git a/mm/share_pool.c b/mm/share_pool.c index 8b46af5fae47..602daf128297 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -645,18 +645,17 @@ static void update_mem_usage_k2u(unsigned long size, bool inc, } }
-/* statistics of all sp area, protected by sp_area_lock */ struct sp_spa_stat { - unsigned int total_num; - unsigned int alloc_num; - unsigned int k2u_task_num; - unsigned int k2u_spg_num; - unsigned long total_size; - unsigned long alloc_size; - unsigned long k2u_task_size; - unsigned long k2u_spg_size; - unsigned long dvpp_size; - unsigned long dvpp_va_size; + atomic64_t total_num; + atomic64_t alloc_num; + atomic64_t k2u_task_num; + atomic64_t k2u_spg_num; + atomic64_t total_size; + atomic64_t alloc_size; + atomic64_t k2u_task_size; + atomic64_t k2u_spg_size; + atomic64_t dvpp_size; + atomic64_t dvpp_va_size; };
static struct sp_spa_stat spa_stat; @@ -728,18 +727,18 @@ static void spa_inc_usage(struct sp_area *spa)
switch (type) { case SPA_TYPE_ALLOC: - spa_stat.alloc_num += 1; - spa_stat.alloc_size += size; + atomic64_inc(&spa_stat.alloc_num); + atomic64_add(size, &spa_stat.alloc_size); meminfo_inc_usage(size, is_huge, &spa->spg->meminfo); break; case SPA_TYPE_K2TASK: - spa_stat.k2u_task_num += 1; - spa_stat.k2u_task_size += size; + atomic64_inc(&spa_stat.k2u_task_num); + atomic64_add(size, &spa_stat.k2u_task_size); meminfo_inc_k2u(size, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: - spa_stat.k2u_spg_num += 1; - spa_stat.k2u_spg_size += size; + atomic64_inc(&spa_stat.k2u_spg_num); + atomic64_add(size, &spa_stat.k2u_spg_size); meminfo_inc_k2u(size, &spa->spg->meminfo); break; default: @@ -747,8 +746,8 @@ static void spa_inc_usage(struct sp_area *spa) }
if (is_dvpp) { - spa_stat.dvpp_size += size; - spa_stat.dvpp_va_size += ALIGN(size, PMD_SIZE); + atomic64_add(size, &spa_stat.dvpp_size); + atomic64_add(ALIGN(size, PMD_SIZE), &spa_stat.dvpp_va_size); }
atomic_inc(&spa->spg->spa_num); @@ -756,8 +755,8 @@ static void spa_inc_usage(struct sp_area *spa) * all the calculations won't overflow due to system limitation and * parameter checking in sp_alloc_area() */ - spa_stat.total_num += 1; - spa_stat.total_size += size; + atomic64_inc(&spa_stat.total_num); + atomic64_add(size, &spa_stat.total_size);
if (!is_local_group(spa->spg->id)) { atomic_inc(&sp_overall_stat.spa_total_num); @@ -775,18 +774,18 @@ static void spa_dec_usage(struct sp_area *spa)
switch (type) { case SPA_TYPE_ALLOC: - spa_stat.alloc_num -= 1; - spa_stat.alloc_size -= size; + atomic64_dec(&spa_stat.alloc_num); + atomic64_sub(size, &spa_stat.alloc_size); meminfo_dec_usage(size, is_huge, &spa->spg->meminfo); break; case SPA_TYPE_K2TASK: - spa_stat.k2u_task_num -= 1; - spa_stat.k2u_task_size -= size; + atomic64_dec(&spa_stat.k2u_task_num); + atomic64_sub(size, &spa_stat.k2u_task_size); meminfo_dec_k2u(size, &spa->spg->meminfo); break; case SPA_TYPE_K2SPG: - spa_stat.k2u_spg_num -= 1; - spa_stat.k2u_spg_size -= size; + atomic64_dec(&spa_stat.k2u_spg_num); + atomic64_sub(size, &spa_stat.k2u_spg_size); meminfo_dec_k2u(size, &spa->spg->meminfo); break; default: @@ -794,13 +793,13 @@ static void spa_dec_usage(struct sp_area *spa) }
if (is_dvpp) { - spa_stat.dvpp_size -= size; - spa_stat.dvpp_va_size -= ALIGN(size, PMD_SIZE); + atomic64_sub(size, &spa_stat.dvpp_size); + atomic64_sub(ALIGN(size, PMD_SIZE), &spa_stat.dvpp_va_size); }
atomic_dec(&spa->spg->spa_num); - spa_stat.total_num -= 1; - spa_stat.total_size -= size; + atomic64_dec(&spa_stat.total_num); + atomic64_sub(size, &spa_stat.total_size);
if (!is_local_group(spa->spg->id)) { atomic_dec(&sp_overall_stat.spa_total_num); @@ -1895,13 +1894,13 @@ static struct sp_area *sp_alloc_area(unsigned long size, unsigned long flags, spa->preferred_node_id = node_id; spa->device_id = device_id;
- spa_inc_usage(spa); insert_sp_area(mapping, spa); mapping->free_area_cache = &spa->rb_node; list_add_tail(&spa->link, &spg->spa_list);
spin_unlock(&sp_area_lock);
+ spa_inc_usage(spa); return spa;
error: @@ -3817,35 +3816,33 @@ static void spa_dvpp_stat_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; - unsigned long dvpp_size, dvpp_va_size; + s64 total_num, alloc_num, k2u_task_num, k2u_spg_num; + s64 total_size, alloc_size, k2u_task_size, k2u_spg_size; + s64 dvpp_size, dvpp_va_size;
if (!sp_is_enabled()) return;
- spin_lock(&sp_area_lock); - total_num = spa_stat.total_num; - alloc_num = spa_stat.alloc_num; - k2u_task_num = spa_stat.k2u_task_num; - k2u_spg_num = spa_stat.k2u_spg_num; - total_size = spa_stat.total_size; - alloc_size = spa_stat.alloc_size; - k2u_task_size = spa_stat.k2u_task_size; - k2u_spg_size = spa_stat.k2u_spg_size; - dvpp_size = spa_stat.dvpp_size; - dvpp_va_size = spa_stat.dvpp_va_size; - spin_unlock(&sp_area_lock); - - SEQ_printf(seq, "Spa total num %u.\n", total_num); - SEQ_printf(seq, "Spa alloc num %u, k2u(task) num %u, k2u(spg) num %u.\n", + total_num = atomic64_read(&spa_stat.total_num); + alloc_num = atomic64_read(&spa_stat.alloc_num); + k2u_task_num = atomic64_read(&spa_stat.k2u_task_num); + k2u_spg_num = atomic64_read(&spa_stat.k2u_spg_num); + total_size = atomic64_read(&spa_stat.total_size); + alloc_size = atomic64_read(&spa_stat.alloc_size); + k2u_task_size = atomic64_read(&spa_stat.k2u_task_size); + k2u_spg_size = atomic64_read(&spa_stat.k2u_spg_size); + dvpp_size = atomic64_read(&spa_stat.dvpp_size); + dvpp_va_size = atomic64_read(&spa_stat.dvpp_va_size); + + SEQ_printf(seq, "Spa total num %lld.\n", total_num); + SEQ_printf(seq, "Spa alloc num %lld, k2u(task) num %lld, k2u(spg) num %lld.\n", alloc_num, k2u_task_num, k2u_spg_num); - SEQ_printf(seq, "Spa total size: %13lu KB\n", byte2kb(total_size)); - SEQ_printf(seq, "Spa alloc size: %13lu KB\n", byte2kb(alloc_size)); - SEQ_printf(seq, "Spa k2u(task) size: %13lu KB\n", byte2kb(k2u_task_size)); - SEQ_printf(seq, "Spa k2u(spg) size: %13lu KB\n", byte2kb(k2u_spg_size)); - SEQ_printf(seq, "Spa dvpp size: %13lu KB\n", byte2kb(dvpp_size)); - SEQ_printf(seq, "Spa dvpp va size: %13lu MB\n", byte2mb(dvpp_va_size)); + SEQ_printf(seq, "Spa total size: %13lld KB\n", byte2kb(total_size)); + SEQ_printf(seq, "Spa alloc size: %13lld KB\n", byte2kb(alloc_size)); + SEQ_printf(seq, "Spa k2u(task) size: %13lld KB\n", byte2kb(k2u_task_size)); + SEQ_printf(seq, "Spa k2u(spg) size: %13lld KB\n", byte2kb(k2u_spg_size)); + SEQ_printf(seq, "Spa dvpp size: %13lld KB\n", byte2kb(dvpp_size)); + SEQ_printf(seq, "Spa dvpp va size: %13lld MB\n", byte2mb(dvpp_va_size)); SEQ_printf(seq, "\n"); }
From: Xu Qiang xuqiang36@huawei.com
hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X
----------------------------------------------
SPG_FLAG_NON_DVPP is no longer used in downstream systems.
Signed-off-by: Xu Qiang xuqiang36@huawei.com --- include/linux/share_pool.h | 2 -- mm/share_pool.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/linux/share_pool.h b/include/linux/share_pool.h index 04feea9b924d..3fdb38c2357f 100644 --- a/include/linux/share_pool.h +++ b/include/linux/share_pool.h @@ -50,8 +50,6 @@ #define SPG_ID_LOCAL_MIN 200001 #define SPG_ID_LOCAL_MAX 299999
-#define SPG_FLAG_NON_DVPP (1 << 0) - #define MAX_DEVID 8 /* the max num of Da-vinci devices */
extern struct static_key_false share_pool_enabled_key; diff --git a/mm/share_pool.c b/mm/share_pool.c index 602daf128297..852a70abc73e 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -452,7 +452,7 @@ static int sp_mapping_group_setup(struct mm_struct *mm, struct sp_group *spg) local_dvpp_mapping = mm->sp_group_master->local->mapping[SP_MAPPING_DVPP]; spg_dvpp_mapping = spg->mapping[SP_MAPPING_DVPP];
- if (!list_empty(&spg->procs) && !(spg->flag & SPG_FLAG_NON_DVPP)) { + if (!list_empty(&spg->procs)) { /* * Don't return an error when the mappings' address range conflict. * As long as the mapping is unused, we can drop the empty mapping. @@ -476,9 +476,8 @@ static int sp_mapping_group_setup(struct mm_struct *mm, struct sp_group *spg) return -EINVAL; } } else { - if (!(spg->flag & SPG_FLAG_NON_DVPP)) - /* the mapping of local group is always set */ - sp_mapping_attach(spg, local_dvpp_mapping); + /* the mapping of local group is always set */ + sp_mapping_attach(spg, local_dvpp_mapping); if (!spg->mapping[SP_MAPPING_NORMAL]) sp_mapping_attach(spg, sp_mapping_normal); if (!spg->mapping[SP_MAPPING_RO])
From: Xu Qiang xuqiang36@huawei.com
hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X
----------------------------------------------
In sp_update_process_stat, traverse node_list and lock protection is required.
Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mm/share_pool.c b/mm/share_pool.c index 852a70abc73e..edfc86bdee9e 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -841,8 +841,11 @@ static void sp_update_process_stat(struct task_struct *tsk, bool inc, unsigned long size = spa->real_size; enum spa_type type = spa->type;
+ down_read(&sp_group_sem); spg_node = find_spg_node_by_spg(tsk->mm, spa->spg); - update_mem_usage(size, inc, spa->is_hugepage, spg_node, type); + if (spg_node != NULL) + update_mem_usage(size, inc, spa->is_hugepage, spg_node, type); + up_read(&sp_group_sem); }
static inline void check_interrupt_context(void)
From: Xu Qiang xuqiang36@huawei.com
hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X
----------------------------------------------
total_num and total_size in sp_spa_stat is redundant, they can be calculated, so delete them.
Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/mm/share_pool.c b/mm/share_pool.c index edfc86bdee9e..a0e13a3b7fb9 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -645,11 +645,9 @@ static void update_mem_usage_k2u(unsigned long size, bool inc, }
struct sp_spa_stat { - atomic64_t total_num; atomic64_t alloc_num; atomic64_t k2u_task_num; atomic64_t k2u_spg_num; - atomic64_t total_size; atomic64_t alloc_size; atomic64_t k2u_task_size; atomic64_t k2u_spg_size; @@ -750,12 +748,6 @@ static void spa_inc_usage(struct sp_area *spa) }
atomic_inc(&spa->spg->spa_num); - /* - * all the calculations won't overflow due to system limitation and - * parameter checking in sp_alloc_area() - */ - atomic64_inc(&spa_stat.total_num); - atomic64_add(size, &spa_stat.total_size);
if (!is_local_group(spa->spg->id)) { atomic_inc(&sp_overall_stat.spa_total_num); @@ -797,8 +789,6 @@ static void spa_dec_usage(struct sp_area *spa) }
atomic_dec(&spa->spg->spa_num); - atomic64_dec(&spa_stat.total_num); - atomic64_sub(size, &spa_stat.total_size);
if (!is_local_group(spa->spg->id)) { atomic_dec(&sp_overall_stat.spa_total_num); @@ -3825,16 +3815,16 @@ static void spa_overview_show(struct seq_file *seq) if (!sp_is_enabled()) return;
- total_num = atomic64_read(&spa_stat.total_num); alloc_num = atomic64_read(&spa_stat.alloc_num); k2u_task_num = atomic64_read(&spa_stat.k2u_task_num); k2u_spg_num = atomic64_read(&spa_stat.k2u_spg_num); - total_size = atomic64_read(&spa_stat.total_size); alloc_size = atomic64_read(&spa_stat.alloc_size); k2u_task_size = atomic64_read(&spa_stat.k2u_task_size); k2u_spg_size = atomic64_read(&spa_stat.k2u_spg_size); dvpp_size = atomic64_read(&spa_stat.dvpp_size); dvpp_va_size = atomic64_read(&spa_stat.dvpp_va_size); + total_num = alloc_num + k2u_task_num + k2u_spg_num; + total_size = alloc_size + k2u_task_size + k2u_spg_size;
SEQ_printf(seq, "Spa total num %lld.\n", total_num); SEQ_printf(seq, "Spa alloc num %lld, k2u(task) num %lld, k2u(spg) num %lld.\n",
From: Xu Qiang xuqiang36@huawei.com
hulk inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X
----------------------------------------------
flag in sp_group is unused, so delete it.
Signed-off-by: Xu Qiang xuqiang36@huawei.com --- mm/share_pool.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/mm/share_pool.c b/mm/share_pool.c index a0e13a3b7fb9..80a36e792965 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -165,7 +165,6 @@ struct sp_mapping { */ struct sp_group { int id; - unsigned long flag; struct file *file; struct file *file_hugetlb; /* number of process in this group */ @@ -499,7 +498,7 @@ static struct sp_mapping *sp_mapping_find(struct sp_group *spg, return spg->mapping[SP_MAPPING_DVPP]; }
-static struct sp_group *create_spg(int spg_id, unsigned long flag); +static struct sp_group *create_spg(int spg_id); static void free_new_spg_id(bool new, int spg_id); static void free_sp_group_locked(struct sp_group *spg); static struct sp_group_node *group_add_task(struct mm_struct *mm, struct sp_group *spg, @@ -519,7 +518,7 @@ static int init_local_group(struct mm_struct *mm) return spg_id; }
- spg = create_spg(spg_id, 0); + spg = create_spg(spg_id); if (IS_ERR(spg)) { free_new_spg_id(true, spg_id); return PTR_ERR(spg); @@ -1081,10 +1080,9 @@ static bool is_online_node_id(int node_id) return node_id >= 0 && node_id < MAX_NUMNODES && node_online(node_id); }
-static void sp_group_init(struct sp_group *spg, int spg_id, unsigned long flag) +static void sp_group_init(struct sp_group *spg, int spg_id) { spg->id = spg_id; - spg->flag = flag; spg->is_alive = true; spg->proc_num = 0; atomic_set(&spg->use_count, 1); @@ -1096,7 +1094,7 @@ static void sp_group_init(struct sp_group *spg, int spg_id, unsigned long flag) meminfo_init(&spg->meminfo); }
-static struct sp_group *create_spg(int spg_id, unsigned long flag) +static struct sp_group *create_spg(int spg_id) { int ret; struct sp_group *spg; @@ -1131,7 +1129,7 @@ static struct sp_group *create_spg(int spg_id, unsigned long flag) goto out_fput; }
- sp_group_init(spg, spg_id, flag); + sp_group_init(spg, spg_id);
ret = idr_alloc(&sp_group_idr, spg, spg_id, spg_id + 1, GFP_KERNEL); if (ret < 0) { @@ -1154,14 +1152,14 @@ static struct sp_group *create_spg(int spg_id, unsigned long flag) }
/* the caller must hold sp_group_sem */ -static struct sp_group *find_or_alloc_sp_group(int spg_id, unsigned long flag) +static struct sp_group *find_or_alloc_sp_group(int spg_id) { struct sp_group *spg;
spg = sp_group_get_locked(current->tgid, spg_id);
if (!spg) { - spg = create_spg(spg_id, flag); + spg = create_spg(spg_id); } else { down_read(&spg->rw_lock); if (!spg_valid(spg)) { @@ -1332,7 +1330,6 @@ static struct sp_group_node *group_add_task(struct mm_struct *mm, struct sp_grou */ int mg_sp_group_add_task(int tgid, unsigned long prot, int spg_id) { - unsigned long flag = 0; struct task_struct *tsk; struct mm_struct *mm; struct sp_group *spg; @@ -1433,7 +1430,7 @@ int mg_sp_group_add_task(int tgid, unsigned long prot, int spg_id) goto out_put_mm; }
- spg = find_or_alloc_sp_group(spg_id, flag); + spg = find_or_alloc_sp_group(spg_id); if (IS_ERR(spg)) { up_write(&sp_group_sem); ret = PTR_ERR(spg);
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/1550 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N...
FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/1550 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N...
-
patchwork bot -
Zhang Zekun