mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-11-01 09:13:37 +00:00 
			
		
		
		
	This contains just the average.h change in order to get it
into the tree before adding new users through -next trees. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEExu3sM/nZ1eRSfR9Ha3t4Rpy0AB0FAli3yxoACgkQa3t4Rpy0 AB13Eg//Sru1b80k889hCYM14hViPAlGD2z2K9dLP5XujKuzLP1UYlB8xk0usqWm ZyPOUOt50OIgdE4jSPT/P79teArZLOQ/nUpuR/I8JgVLo3TiuOSGD8SfN0dWXDkc 2/ywYiRed9PwZfRpTvrgyyB3LPp1gvvOmwpLWVf2ndinfL4SHN31V1tBuIJxYAhm sFhxhHvy+inpIdfLpZaF/7CydT8oG/k+G3xiR8C1xUCTYEIztVq4ynMkMvA9SEch dx7MHLMFyl/mHXGW1JSE2nQ97tdGyqFGBrY4wHHIW105Q10Qta0p9IutMqfzokE1 Shkes/JFUaJqU+QRXGkomA+BjcT+mvHODwY6rt73o6lEV24EU1FCI4pR+tPgGCL2 ub893LOIot5xORL2KZwgliMnreGYfdkRPKxAZPgruTm7TENCLQ8c/5R5ZgPhrePT +pAtqGAOvSX8WkT2JpWdxcvl16dsREBDIlDFPx8MkCD05+6hDjWsm69RW50d2sNM oVpSJG87ZHw6nV4L6i+7lHQSPsZDOS6Y+IpfY1MZmoAI/v+6eFPuoiM/SRLCmDKS EX22iw7xe6gOfVMFAwVqxycvF0g5LoO3Bx7oGW0k+o+3X3ZgreuPGGN0C+GKYa7H Km8axU1ZdvyB23pY3dlbuqVQFFrsIUlIhcGaWk4tjU00C5F32sg= =Bge/ -----END PGP SIGNATURE----- Merge tag 'mac80211-for-davem-2017-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 Johannes Berg says: ==================== This contains just the average.h change in order to get it into the tree before adding new users through -next trees. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
						commit
						35576ee17f
					
				
					 7 changed files with 47 additions and 26 deletions
				
			
		| 
						 | 
				
			
			@ -51,7 +51,7 @@ module_param(gso, bool, 0444);
 | 
			
		|||
 * at once, the weight is chosen so that the EWMA will be insensitive to short-
 | 
			
		||||
 * term, transient changes in packet size.
 | 
			
		||||
 */
 | 
			
		||||
DECLARE_EWMA(pkt_len, 1, 64)
 | 
			
		||||
DECLARE_EWMA(pkt_len, 0, 64)
 | 
			
		||||
 | 
			
		||||
/* With mergeable buffers we align buffer address and use the low bits to
 | 
			
		||||
 * encode its true size. Buffer size is up to 1 page so we need to align to
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1252,7 +1252,7 @@ struct ath5k_statistics {
 | 
			
		|||
#define ATH5K_TXQ_LEN_MAX	(ATH_TXBUF / 4)		/* bufs per queue */
 | 
			
		||||
#define ATH5K_TXQ_LEN_LOW	(ATH5K_TXQ_LEN_MAX / 2)	/* low mark */
 | 
			
		||||
 | 
			
		||||
DECLARE_EWMA(beacon_rssi, 1024, 8)
 | 
			
		||||
DECLARE_EWMA(beacon_rssi, 10, 8)
 | 
			
		||||
 | 
			
		||||
/* Driver state associated with an instance of a device */
 | 
			
		||||
struct ath5k_hw {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -257,7 +257,7 @@ struct link_qual {
 | 
			
		|||
	int tx_failed;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
DECLARE_EWMA(rssi, 1024, 8)
 | 
			
		||||
DECLARE_EWMA(rssi, 10, 8)
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Antenna settings about the currently active link.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,45 +1,66 @@
 | 
			
		|||
#ifndef _LINUX_AVERAGE_H
 | 
			
		||||
#define _LINUX_AVERAGE_H
 | 
			
		||||
 | 
			
		||||
/* Exponentially weighted moving average (EWMA) */
 | 
			
		||||
/*
 | 
			
		||||
 * Exponentially weighted moving average (EWMA)
 | 
			
		||||
 *
 | 
			
		||||
 * This implements a fixed-precision EWMA algorithm, with both the
 | 
			
		||||
 * precision and fall-off coefficient determined at compile-time
 | 
			
		||||
 * and built into the generated helper funtions.
 | 
			
		||||
 *
 | 
			
		||||
 * The first argument to the macro is the name that will be used
 | 
			
		||||
 * for the struct and helper functions.
 | 
			
		||||
 *
 | 
			
		||||
 * The second argument, the precision, expresses how many bits are
 | 
			
		||||
 * used for the fractional part of the fixed-precision values.
 | 
			
		||||
 *
 | 
			
		||||
 * The third argument, the weight reciprocal, determines how the
 | 
			
		||||
 * new values will be weighed vs. the old state, new values will
 | 
			
		||||
 * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note
 | 
			
		||||
 * that this parameter must be a power of two for efficiency.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#define DECLARE_EWMA(name, _factor, _weight)				\
 | 
			
		||||
#define DECLARE_EWMA(name, _precision, _weight_rcp)			\
 | 
			
		||||
	struct ewma_##name {						\
 | 
			
		||||
		unsigned long internal;					\
 | 
			
		||||
	};								\
 | 
			
		||||
	static inline void ewma_##name##_init(struct ewma_##name *e)	\
 | 
			
		||||
	{								\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
 | 
			
		||||
		/*							\
 | 
			
		||||
		 * Even if you want to feed it just 0/1 you should have	\
 | 
			
		||||
		 * some bits for the non-fractional part...		\
 | 
			
		||||
		 */							\
 | 
			
		||||
		BUILD_BUG_ON((_precision) > 30);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
 | 
			
		||||
		e->internal = 0;					\
 | 
			
		||||
	}								\
 | 
			
		||||
	static inline unsigned long					\
 | 
			
		||||
	ewma_##name##_read(struct ewma_##name *e)			\
 | 
			
		||||
	{								\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
 | 
			
		||||
		return e->internal >> ilog2(_factor);			\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
 | 
			
		||||
		BUILD_BUG_ON((_precision) > 30);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
 | 
			
		||||
		return e->internal >> (_precision);			\
 | 
			
		||||
	}								\
 | 
			
		||||
	static inline void ewma_##name##_add(struct ewma_##name *e,	\
 | 
			
		||||
					     unsigned long val)		\
 | 
			
		||||
	{								\
 | 
			
		||||
		unsigned long internal = ACCESS_ONCE(e->internal);	\
 | 
			
		||||
		unsigned long weight = ilog2(_weight);			\
 | 
			
		||||
		unsigned long factor = ilog2(_factor);			\
 | 
			
		||||
		unsigned long weight_rcp = ilog2(_weight_rcp);		\
 | 
			
		||||
		unsigned long precision = _precision;			\
 | 
			
		||||
									\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_factor));		\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight));		\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_factor);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight);			\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
 | 
			
		||||
		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
 | 
			
		||||
		BUILD_BUG_ON((_precision) > 30);			\
 | 
			
		||||
		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
 | 
			
		||||
									\
 | 
			
		||||
		ACCESS_ONCE(e->internal) = internal ?			\
 | 
			
		||||
			(((internal << weight) - internal) +		\
 | 
			
		||||
				(val << factor)) >> weight :		\
 | 
			
		||||
			(val << factor);				\
 | 
			
		||||
			(((internal << weight_rcp) - internal) +	\
 | 
			
		||||
				(val << precision)) >> weight_rcp :	\
 | 
			
		||||
			(val << precision);				\
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#endif /* _LINUX_AVERAGE_H */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -402,7 +402,7 @@ struct batadv_gw_node {
 | 
			
		|||
	struct rcu_head rcu;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
DECLARE_EWMA(throughput, 1024, 8)
 | 
			
		||||
DECLARE_EWMA(throughput, 10, 8)
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * struct batadv_hardif_neigh_node_bat_v - B.A.T.M.A.N. V private neighbor
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -428,7 +428,7 @@ struct ieee80211_sta_tx_tspec {
 | 
			
		|||
	bool downgraded;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
DECLARE_EWMA(beacon_signal, 16, 4)
 | 
			
		||||
DECLARE_EWMA(beacon_signal, 4, 4)
 | 
			
		||||
 | 
			
		||||
struct ieee80211_if_managed {
 | 
			
		||||
	struct timer_list timer;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -372,7 +372,7 @@ struct mesh_sta {
 | 
			
		|||
	unsigned int fail_avg;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
DECLARE_EWMA(signal, 1024, 8)
 | 
			
		||||
DECLARE_EWMA(signal, 10, 8)
 | 
			
		||||
 | 
			
		||||
struct ieee80211_sta_rx_stats {
 | 
			
		||||
	unsigned long packets;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue