Merge branch 'rhash_prove_locking' (9cf5476b) · Commits · 戴 / test

include/linux/rhashtable.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,10 @@ struct rhashtable_params {
	size_t new_size);		size_t new_size);
	bool (shrink_decision)(const struct rhashtable ht,		bool (shrink_decision)(const struct rhashtable ht,
	size_t new_size);		size_t new_size);
	int (*mutex_is_held)(void);		#ifdef CONFIG_PROVE_LOCKING
			int (mutex_is_held)(void parent);
			void *parent;
			#endif
	};		};

	/**		/**

lib/rhashtable.c

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@
	#ifdef CONFIG_PROVE_LOCKING		#ifdef CONFIG_PROVE_LOCKING
	int lockdep_rht_mutex_is_held(const struct rhashtable *ht)		int lockdep_rht_mutex_is_held(const struct rhashtable *ht)
	{		{
	return ht->p.mutex_is_held();		return ht->p.mutex_is_held(ht->p.parent);
	}		}
	EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held);		EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held);
	#endif		#endif
	@@ -532,7 +532,9 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params)
	* .key_offset = offsetof(struct test_obj, key),		* .key_offset = offsetof(struct test_obj, key),
	* .key_len = sizeof(int),		* .key_len = sizeof(int),
	* .hashfn = arch_fast_hash,		* .hashfn = arch_fast_hash,
			* #ifdef CONFIG_PROVE_LOCKING
	* .mutex_is_held = &my_mutex_is_held,		* .mutex_is_held = &my_mutex_is_held,
			* #endif
	* };		* };
	*		*
	* Configuration Example 2: Variable length keys		* Configuration Example 2: Variable length keys
	@@ -552,7 +554,9 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params)
	* .head_offset = offsetof(struct test_obj, node),		* .head_offset = offsetof(struct test_obj, node),
	* .hashfn = arch_fast_hash,		* .hashfn = arch_fast_hash,
	* .obj_hashfn = my_hash_fn,		* .obj_hashfn = my_hash_fn,
			* #ifdef CONFIG_PROVE_LOCKING
	* .mutex_is_held = &my_mutex_is_held,		* .mutex_is_held = &my_mutex_is_held,
			* #endif
	* };		* };
	*/		*/
	int rhashtable_init(struct rhashtable ht, struct rhashtable_params params)		int rhashtable_init(struct rhashtable ht, struct rhashtable_params params)
	@@ -613,10 +617,12 @@ EXPORT_SYMBOL_GPL(rhashtable_destroy);
	#define TEST_PTR ((void *) 0xdeadbeef)		#define TEST_PTR ((void *) 0xdeadbeef)
	#define TEST_NEXPANDS 4		#define TEST_NEXPANDS 4

	static int test_mutex_is_held(void)		#ifdef CONFIG_PROVE_LOCKING
			static int test_mutex_is_held(void *parent)
	{		{
	return 1;		return 1;
	}		}
			#endif

	struct test_obj {		struct test_obj {
	void *ptr;		void *ptr;
	@@ -767,7 +773,9 @@ static int __init test_rht_init(void)
	.key_offset = offsetof(struct test_obj, value),		.key_offset = offsetof(struct test_obj, value),
	.key_len = sizeof(int),		.key_len = sizeof(int),
	.hashfn = arch_fast_hash,		.hashfn = arch_fast_hash,
			#ifdef CONFIG_PROVE_LOCKING
	.mutex_is_held = &test_mutex_is_held,		.mutex_is_held = &test_mutex_is_held,
			#endif
	.grow_decision = rht_grow_above_75,		.grow_decision = rht_grow_above_75,
	.shrink_decision = rht_shrink_below_30,		.shrink_decision = rht_shrink_below_30,
	};		};

net/netfilter/nft_hash.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -153,10 +153,12 @@ static unsigned int nft_hash_privsize(const struct nlattr * const nla[])
	return sizeof(struct rhashtable);		return sizeof(struct rhashtable);
	}		}

	static int lockdep_nfnl_lock_is_held(void)		#ifdef CONFIG_PROVE_LOCKING
			static int lockdep_nfnl_lock_is_held(void *parent)
	{		{
	return lockdep_nfnl_is_held(NFNL_SUBSYS_NFTABLES);		return lockdep_nfnl_is_held(NFNL_SUBSYS_NFTABLES);
	}		}
			#endif

	static int nft_hash_init(const struct nft_set *set,		static int nft_hash_init(const struct nft_set *set,
	const struct nft_set_desc *desc,		const struct nft_set_desc *desc,
	@@ -171,7 +173,9 @@ static int nft_hash_init(const struct nft_set *set,
	.hashfn = jhash,		.hashfn = jhash,
	.grow_decision = rht_grow_above_75,		.grow_decision = rht_grow_above_75,
	.shrink_decision = rht_shrink_below_30,		.shrink_decision = rht_shrink_below_30,
			#ifdef CONFIG_PROVE_LOCKING
	.mutex_is_held = lockdep_nfnl_lock_is_held,		.mutex_is_held = lockdep_nfnl_lock_is_held,
			#endif
	};		};

	return rhashtable_init(priv, &params);		return rhashtable_init(priv, &params);

net/netlink/af_netlink.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -114,14 +114,14 @@ static atomic_t nl_table_users = ATOMIC_INIT(0);
	DEFINE_MUTEX(nl_sk_hash_lock);		DEFINE_MUTEX(nl_sk_hash_lock);
	EXPORT_SYMBOL_GPL(nl_sk_hash_lock);		EXPORT_SYMBOL_GPL(nl_sk_hash_lock);

	static int lockdep_nl_sk_hash_is_held(void)		#ifdef CONFIG_PROVE_LOCKING
			static int lockdep_nl_sk_hash_is_held(void *parent)
	{		{
	#ifdef CONFIG_LOCKDEP
	if (debug_locks)		if (debug_locks)
	return lockdep_is_held(&nl_sk_hash_lock) \|\| lockdep_is_held(&nl_table_lock);		return lockdep_is_held(&nl_sk_hash_lock) \|\| lockdep_is_held(&nl_table_lock);
	#endif
	return 1;		return 1;
	}		}
			#endif

	static ATOMIC_NOTIFIER_HEAD(netlink_chain);		static ATOMIC_NOTIFIER_HEAD(netlink_chain);

	@@ -3133,7 +3133,9 @@ static int __init netlink_proto_init(void)
	.max_shift = 16, /* 64K */		.max_shift = 16, /* 64K */
	.grow_decision = rht_grow_above_75,		.grow_decision = rht_grow_above_75,
	.shrink_decision = rht_shrink_below_30,		.shrink_decision = rht_shrink_below_30,
			#ifdef CONFIG_PROVE_LOCKING
	.mutex_is_held = lockdep_nl_sk_hash_is_held,		.mutex_is_held = lockdep_nl_sk_hash_is_held,
			#endif
	};		};

	if (err != 0)		if (err != 0)

Admin message