The patch titled
Subject: tmpfs: interleave the starting node of /dev/shmem
has been removed from the -mm tree. Its filename was
tmpfs-interleave-the-starting-node-of-dev-shmem.patch
This patch was dropped because an alternative patch was merged
------------------------------------------------------
From: Nathan Zimmer <nzimmer@xxxxxxx>
Subject: tmpfs: interleave the starting node of /dev/shmem
The tmpfs superblock grants an offset for each inode as they are created.
Each inode then uses that offset to provide a preferred first node for its
interleave in the newly provided shmem_interleave.
Signed-off-by: Nathan Zimmer <nzimmer@xxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 7 +++++++
include/linux/shmem_fs.h | 3 +++
mm/mempolicy.c | 4 ++++
mm/shmem.c | 17 +++++++++++++++++
4 files changed, 31 insertions(+)
diff -puN include/linux/mm.h~tmpfs-interleave-the-starting-node-of-dev-shmem include/linux/mm.h
--- a/include/linux/mm.h~tmpfs-interleave-the-starting-node-of-dev-shmem
+++ a/include/linux/mm.h
@@ -238,6 +238,13 @@ struct vm_operations_struct {
*/
struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
unsigned long addr);
+
+ /*
+ * If the policy is interleave allow the vma to suggest a node.
+ */
+ unsigned long (*interleave)(struct vm_area_struct *vma,
+ unsigned long addr);
+
int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from,
const nodemask_t *to, unsigned long flags);
#endif
diff -puN include/linux/shmem_fs.h~tmpfs-interleave-the-starting-node-of-dev-shmem include/linux/shmem_fs.h
--- a/include/linux/shmem_fs.h~tmpfs-interleave-the-starting-node-of-dev-shmem
+++ a/include/linux/shmem_fs.h
@@ -17,6 +17,7 @@ struct shmem_inode_info {
char *symlink; /* unswappable short symlink */
};
struct shared_policy policy; /* NUMA memory alloc policy */
+ unsigned long node_offset; /* bias for interleaved nodes */
struct list_head swaplist; /* chain of maybes on swap */
struct list_head xattr_list; /* list of shmem_xattr */
struct inode vfs_inode;
@@ -32,6 +33,8 @@ struct shmem_sb_info {
kgid_t gid; /* Mount gid for root directory */
umode_t mode; /* Mount mode for root directory */
struct mempolicy *mpol; /* default memory policy for mappings */
+ unsigned long next_pref_node;
+ /* next interleave bias to suggest for inodes */
};
static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
diff -puN mm/mempolicy.c~tmpfs-interleave-the-starting-node-of-dev-shmem mm/mempolicy.c
--- a/mm/mempolicy.c~tmpfs-interleave-the-starting-node-of-dev-shmem
+++ a/mm/mempolicy.c
@@ -1669,6 +1669,10 @@ static inline unsigned interleave_nid(st
{
if (vma) {
unsigned long off;
+ if (vma->vm_ops && vma->vm_ops->interleave) {
+ off = vma->vm_ops->interleave(vma, addr);
+ return offset_il_node(pol, vma, off);
+ }
/*
* for small pages, there is no difference between
diff -puN mm/shmem.c~tmpfs-interleave-the-starting-node-of-dev-shmem mm/shmem.c
--- a/mm/shmem.c~tmpfs-interleave-the-starting-node-of-dev-shmem
+++ a/mm/shmem.c
@@ -931,6 +931,7 @@ static struct page *shmem_swapin(swp_ent
pvma.vm_start = 0;
pvma.vm_pgoff = index;
pvma.vm_policy = spol;
+ pvma.vm_private_data = (void *) info->node_offset;
if (pvma.vm_policy)
pvma.vm_ops = &shmem_vm_ops;
else
@@ -947,6 +948,7 @@ static struct page *shmem_alloc_page(gfp
pvma.vm_start = 0;
pvma.vm_pgoff = index;
pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, index);
+ pvma.vm_private_data = (void *) info->node_offset;
if (pvma.vm_policy)
pvma.vm_ops = &shmem_vm_ops;
else
@@ -1329,6 +1331,19 @@ static struct mempolicy *shmem_get_polic
index = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
return mpol_shared_policy_lookup(&SHMEM_I(inode)->policy, index);
}
+
+static unsigned long shmem_interleave(struct vm_area_struct *vma,
+ unsigned long addr)
+{
+ unsigned long offset;
+
+ /* Use the vm_files prefered node as the initial offset. */
+ offset = (unsigned long)vma->vm_private_data;
+
+ offset += ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+
+ return offset;
+}
#endif
int shmem_lock(struct file *file, int lock, struct user_struct *user)
@@ -1401,6 +1416,7 @@ static struct inode *shmem_get_inode(str
inode->i_fop = &shmem_file_operations;
mpol_shared_policy_init(&info->policy,
shmem_get_sbmpol(sbinfo));
+ info->node_offset = ++(sbinfo->next_pref_node);
break;
case S_IFDIR:
inc_nlink(inode);
@@ -2795,6 +2811,7 @@ static const struct super_operations shm
static const struct vm_operations_struct shmem_vm_ops = {
.fault = shmem_fault,
#ifdef CONFIG_NUMA
+ .interleave = shmem_interleave,
.set_policy = shmem_set_policy,
.get_policy = shmem_get_policy,
#endif
_
Patches currently in -mm which might be from nzimmer@xxxxxxx are
shmem-provide-vm_ops-when-also-providing-a-mem-policy.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
