https://github.com/torvalds/linux
Revision 47aee4d8e314384807e98b67ade07f6da476aa75 authored by Minchan Kim on 22 October 2015, 20:32:19 UTC, committed by Linus Torvalds on 23 October 2015, 08:55:10 UTC
Use is_zero_pfn() on pteval only after pte_present() check on pteval
(It might be better idea to introduce is_zero_pte() which checks
pte_present() first).

Otherwise when working on a swap or migration entry and if pte_pfn's
result is equal to zero_pfn by chance, we lose user's data in
__collapse_huge_page_copy().  So if you're unlucky, the application
segfaults and finally you could see below message on exit:

BUG: Bad rss-counter state mm:ffff88007f099300 idx:2 val:3

Fixes: ca0984caa823 ("mm: incorporate zero pages into transparent huge pages")
Signed-off-by: Minchan Kim <minchan@kernel.org>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: <stable@vger.kernel.org>	[4.1+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent b8fa0ef
Raw File
Tip revision: 47aee4d8e314384807e98b67ade07f6da476aa75 authored by Minchan Kim on 22 October 2015, 20:32:19 UTC
thp: use is_zero_pfn() only after pte_present() check
Tip revision: 47aee4d
test_static_keys.c
/*
 * Kernel module for testing static keys.
 *
 * Copyright 2015 Akamai Technologies Inc. All Rights Reserved
 *
 * Authors:
 *      Jason Baron       <jbaron@akamai.com>
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
 * may be copied, distributed, and modified under those terms.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

#include <linux/module.h>
#include <linux/jump_label.h>

/* old keys */
struct static_key old_true_key	= STATIC_KEY_INIT_TRUE;
struct static_key old_false_key	= STATIC_KEY_INIT_FALSE;

/* new api */
DEFINE_STATIC_KEY_TRUE(true_key);
DEFINE_STATIC_KEY_FALSE(false_key);

/* external */
extern struct static_key base_old_true_key;
extern struct static_key base_inv_old_true_key;
extern struct static_key base_old_false_key;
extern struct static_key base_inv_old_false_key;

/* new api */
extern struct static_key_true base_true_key;
extern struct static_key_true base_inv_true_key;
extern struct static_key_false base_false_key;
extern struct static_key_false base_inv_false_key;


struct test_key {
	bool			init_state;
	struct static_key	*key;
	bool			(*test_key)(void);
};

#define test_key_func(key, branch) \
	({bool func(void) { return branch(key); } func;	})

static void invert_key(struct static_key *key)
{
	if (static_key_enabled(key))
		static_key_disable(key);
	else
		static_key_enable(key);
}

static void invert_keys(struct test_key *keys, int size)
{
	struct static_key *previous = NULL;
	int i;

	for (i = 0; i < size; i++) {
		if (previous != keys[i].key) {
			invert_key(keys[i].key);
			previous = keys[i].key;
		}
	}
}

static int verify_keys(struct test_key *keys, int size, bool invert)
{
	int i;
	bool ret, init;

	for (i = 0; i < size; i++) {
		ret = static_key_enabled(keys[i].key);
		init = keys[i].init_state;
		if (ret != (invert ? !init : init))
			return -EINVAL;
		ret = keys[i].test_key();
		if (static_key_enabled(keys[i].key)) {
			if (!ret)
				return -EINVAL;
		} else {
			if (ret)
				return -EINVAL;
		}
	}
	return 0;
}

static int __init test_static_key_init(void)
{
	int ret;
	int size;

	struct test_key static_key_tests[] = {
		/* internal keys - old keys */
		{
			.init_state	= true,
			.key		= &old_true_key,
			.test_key	= test_key_func(&old_true_key, static_key_true),
		},
		{
			.init_state	= false,
			.key		= &old_false_key,
			.test_key	= test_key_func(&old_false_key, static_key_false),
		},
		/* internal keys - new keys */
		{
			.init_state	= true,
			.key		= &true_key.key,
			.test_key	= test_key_func(&true_key, static_branch_likely),
		},
		{
			.init_state	= true,
			.key		= &true_key.key,
			.test_key	= test_key_func(&true_key, static_branch_unlikely),
		},
		{
			.init_state	= false,
			.key		= &false_key.key,
			.test_key	= test_key_func(&false_key, static_branch_likely),
		},
		{
			.init_state	= false,
			.key		= &false_key.key,
			.test_key	= test_key_func(&false_key, static_branch_unlikely),
		},
		/* external keys - old keys */
		{
			.init_state	= true,
			.key		= &base_old_true_key,
			.test_key	= test_key_func(&base_old_true_key, static_key_true),
		},
		{
			.init_state	= false,
			.key		= &base_inv_old_true_key,
			.test_key	= test_key_func(&base_inv_old_true_key, static_key_true),
		},
		{
			.init_state	= false,
			.key		= &base_old_false_key,
			.test_key	= test_key_func(&base_old_false_key, static_key_false),
		},
		{
			.init_state	= true,
			.key		= &base_inv_old_false_key,
			.test_key	= test_key_func(&base_inv_old_false_key, static_key_false),
		},
		/* external keys - new keys */
		{
			.init_state	= true,
			.key		= &base_true_key.key,
			.test_key	= test_key_func(&base_true_key, static_branch_likely),
		},
		{
			.init_state	= true,
			.key		= &base_true_key.key,
			.test_key	= test_key_func(&base_true_key, static_branch_unlikely),
		},
		{
			.init_state	= false,
			.key		= &base_inv_true_key.key,
			.test_key	= test_key_func(&base_inv_true_key, static_branch_likely),
		},
		{
			.init_state	= false,
			.key		= &base_inv_true_key.key,
			.test_key	= test_key_func(&base_inv_true_key, static_branch_unlikely),
		},
		{
			.init_state	= false,
			.key		= &base_false_key.key,
			.test_key	= test_key_func(&base_false_key, static_branch_likely),
		},
		{
			.init_state	= false,
			.key		= &base_false_key.key,
			.test_key	= test_key_func(&base_false_key, static_branch_unlikely),
		},
		{
			.init_state	= true,
			.key		= &base_inv_false_key.key,
			.test_key	= test_key_func(&base_inv_false_key, static_branch_likely),
		},
		{
			.init_state	= true,
			.key		= &base_inv_false_key.key,
			.test_key	= test_key_func(&base_inv_false_key, static_branch_unlikely),
		},
	};

	size = ARRAY_SIZE(static_key_tests);

	ret = verify_keys(static_key_tests, size, false);
	if (ret)
		goto out;

	invert_keys(static_key_tests, size);
	ret = verify_keys(static_key_tests, size, true);
	if (ret)
		goto out;

	invert_keys(static_key_tests, size);
	ret = verify_keys(static_key_tests, size, false);
	if (ret)
		goto out;
	return 0;
out:
	return ret;
}

static void __exit test_static_key_exit(void)
{
}

module_init(test_static_key_init);
module_exit(test_static_key_exit);

MODULE_AUTHOR("Jason Baron <jbaron@akamai.com>");
MODULE_LICENSE("GPL");
back to top