Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2a389610a7331d22344698f23ef2e8c55b2cde7b

Authored by David Rientjes
Committed by Linus Torvalds
1 parent 514ddb446c
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm, mempolicy: rename slab_node for clarity 

slab_node() is actually a mempolicy function, so rename it to
mempolicy_slab_node() to make it clearer that it used for processes with
mempolicies.

At the same time, cleanup its code by saving numa_mem_id() in a local
variable (since we require a node with memory, not just any node) and
remove an obsolete comment that assumes the mempolicy is actually passed
into the function.

Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Tim Hockin <thockin@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 10 additions and 13 deletions Side-by-side Diff

include/linux/mempolicy.h
Diff comments   View file @ 2a38961
... ... @@ -151,7 +151,7 @@
151 151 extern bool init_nodemask_of_mempolicy(nodemask_t *mask);
152 152 extern bool mempolicy_nodemask_intersects(struct task_struct *tsk,
153 153 const nodemask_t *mask);
154   -extern unsigned slab_node(void);
  154 +extern unsigned int mempolicy_slab_node(void);
155 155  
156 156 extern enum zone_type policy_zone;
157 157  
... ... @@ -1782,21 +1782,18 @@
1782 1782 /*
1783 1783 * Depending on the memory policy provide a node from which to allocate the
1784 1784 * next slab entry.
1785   - * @policy must be protected by freeing by the caller. If @policy is
1786   - * the current task's mempolicy, this protection is implicit, as only the
1787   - * task can change it's policy. The system default policy requires no
1788   - * such protection.
1789 1785 */
1790   -unsigned slab_node(void)
  1786 +unsigned int mempolicy_slab_node(void)
1791 1787 {
1792 1788 struct mempolicy *policy;
  1789 + int node = numa_mem_id();
1793 1790  
1794 1791 if (in_interrupt())
1795   - return numa_node_id();
  1792 + return node;
1796 1793  
1797 1794 policy = current->mempolicy;
1798 1795 if (!policy || policy->flags & MPOL_F_LOCAL)
1799   - return numa_node_id();
  1796 + return node;
1800 1797  
1801 1798 switch (policy->mode) {
1802 1799 case MPOL_PREFERRED:
1803 1800  
... ... @@ -1816,11 +1813,11 @@
1816 1813 struct zonelist *zonelist;
1817 1814 struct zone *zone;
1818 1815 enum zone_type highest_zoneidx = gfp_zone(GFP_KERNEL);
1819   - zonelist = &NODE_DATA(numa_node_id())->node_zonelists[0];
  1816 + zonelist = &NODE_DATA(node)->node_zonelists[0];
1820 1817 (void)first_zones_zonelist(zonelist, highest_zoneidx,
1821 1818 &policy->v.nodes,
1822 1819 &zone);
1823   - return zone ? zone->node : numa_node_id();
  1820 + return zone ? zone->node : node;
1824 1821 }
1825 1822  
1826 1823 default:
... ... @@ -3042,7 +3042,7 @@
3042 3042 if (cpuset_do_slab_mem_spread() && (cachep->flags & SLAB_MEM_SPREAD))
3043 3043 nid_alloc = cpuset_slab_spread_node();
3044 3044 else if (current->mempolicy)
3045   - nid_alloc = slab_node();
  3045 + nid_alloc = mempolicy_slab_node();
3046 3046 if (nid_alloc != nid_here)
3047 3047 return ____cache_alloc_node(cachep, flags, nid_alloc);
3048 3048 return NULL;
... ... @@ -3074,7 +3074,7 @@
3074 3074  
3075 3075 retry_cpuset:
3076 3076 cpuset_mems_cookie = read_mems_allowed_begin();
3077   - zonelist = node_zonelist(slab_node(), flags);
  3077 + zonelist = node_zonelist(mempolicy_slab_node(), flags);
3078 3078  
3079 3079 retry:
3080 3080 /*
... ... @@ -1685,7 +1685,7 @@
1685 1685  
1686 1686 do {
1687 1687 cpuset_mems_cookie = read_mems_allowed_begin();
1688   - zonelist = node_zonelist(slab_node(), flags);
  1688 + zonelist = node_zonelist(mempolicy_slab_node(), flags);
1689 1689 for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
1690 1690 struct kmem_cache_node *n;
1691 1691