Unverified Commit 0ed14bf5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7405 v2 mm: prepare to support weighted interleaving mempolicy 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ze Zuo <zuoze1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LQIAC2AUXYIHFBE2GXECZXBBWNQGB2EA/ 
 
https://gitee.com/openeuler/kernel/issues/I9PD4G 
 
Link:https://gitee.com/openeuler/kernel/pulls/7405

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 9bdcea47 50afa875

fs/kernfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int kernfs_vma_set_policy(struct vm_area_struct *vma, 
}



static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma,

					       unsigned long addr)

					       unsigned long addr, pgoff_t *ilx)

{

	struct file *file = vma->vm_file;

	struct kernfs_open_file *of = kernfs_of(file);
@@ -470,7 +470,7 @@ static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma, 


	pol = vma->vm_policy;

	if (of->vm_ops->get_policy)

		pol = of->vm_ops->get_policy(vma, addr);

		pol = of->vm_ops->get_policy(vma, addr, NULL);



	kernfs_put_active(of->kn);

	return pol;

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ struct vm_operations_struct { 
	 * policy.

	 */

	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,

					unsigned long addr);

					unsigned long addr, pgoff_t *ilx);

#endif

	/*

	 * Called by vm_normal_page() for special PTEs to find the

include/linux/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,7 @@ struct task_struct { 
	/* Protected by alloc_lock: */

	struct mempolicy		*mempolicy;

	short				il_prev;

	u8				il_weight;

	short				pref_node_fork;

#endif

#ifdef CONFIG_NUMA_BALANCING

include/uapi/linux/mempolicy.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ enum { 
	MPOL_INTERLEAVE,

	MPOL_LOCAL,

	MPOL_PREFERRED_MANY,

	MPOL_WEIGHTED_INTERLEAVE,

	MPOL_MAX,	/* always last member of enum */

};

ipc/shm.c

+2 −2
Original line number Diff line number Diff line
@@ -574,14 +574,14 @@ static int shm_set_policy(struct vm_area_struct *vma, struct mempolicy *new) 
}



static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,

					unsigned long addr)

					unsigned long addr, pgoff_t *ilx)

{

	struct file *file = vma->vm_file;

	struct shm_file_data *sfd = shm_file_data(file);

	struct mempolicy *pol = NULL;



	if (sfd->vm_ops->get_policy)

		pol = sfd->vm_ops->get_policy(vma, addr);

		pol = sfd->vm_ops->get_policy(vma, addr, NULL);

	else if (vma->vm_policy)

		pol = vma->vm_policy;