Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479e2802 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Mel Gorman
Browse files

mm: mempolicy: Make MPOL_LOCAL a real policy 



Make MPOL_LOCAL a real and exposed policy such that applications that
relied on the previous default behaviour can explicitly request it.

Requested-by: default avatarChristoph Lameter <cl@linux.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
parent d10e63f2

include/uapi/linux/mempolicy.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ enum { 
	MPOL_PREFERRED,

	MPOL_BIND,

	MPOL_INTERLEAVE,

	MPOL_LOCAL,

	MPOL_MAX,	/* always last member of enum */

};

mm/mempolicy.c

+6 −3
Original line number Diff line number Diff line
@@ -269,6 +269,10 @@ static struct mempolicy *mpol_new(unsigned short mode, unsigned short flags, 
			     (flags & MPOL_F_RELATIVE_NODES)))

				return ERR_PTR(-EINVAL);

		}

	} else if (mode == MPOL_LOCAL) {

		if (!nodes_empty(*nodes))

			return ERR_PTR(-EINVAL);

		mode = MPOL_PREFERRED;

	} else if (nodes_empty(*nodes))

		return ERR_PTR(-EINVAL);

	policy = kmem_cache_alloc(policy_cache, GFP_KERNEL);
@@ -2399,7 +2403,6 @@ void numa_default_policy(void) 
 * "local" is pseudo-policy:  MPOL_PREFERRED with MPOL_F_LOCAL flag

 * Used only for mpol_parse_str() and mpol_to_str()

 */

#define MPOL_LOCAL MPOL_MAX

static const char * const policy_modes[] =

{

	[MPOL_DEFAULT]    = "default",
@@ -2452,12 +2455,12 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) 
	if (flags)

		*flags++ = '\0';	/* terminate mode string */



	for (mode = 0; mode <= MPOL_LOCAL; mode++) {

	for (mode = 0; mode < MPOL_MAX; mode++) {

		if (!strcmp(str, policy_modes[mode])) {

			break;

		}

	}

	if (mode > MPOL_LOCAL)

	if (mode >= MPOL_MAX)

		goto out;



	switch (mode) {