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

Commit 84b6714e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ewma' 



Johannes Berg says:

====================
average: convert users to inline implementation

Since there's very little benefit of the out-of-line implementation
(a single byte of .text in one driver as far as I've seen), convert
all drivers to the inline implementation, saving memory, and remove
the out-of-line implementation.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0f8f27de f4e774f5

drivers/net/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ config VETH 
config VIRTIO_NET

	tristate "Virtio network driver"

	depends on VIRTIO

	select AVERAGE

	---help---

	  This is the virtual network driver for virtio.  It can be used with

	  lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.

drivers/net/virtio_net.c

+11 −11
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ module_param(gso, bool, 0444); 
#define GOOD_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)

#define GOOD_COPY_LEN	128



/* Weight used for the RX packet size EWMA. The average packet size is used to

 * determine the packet buffer size when refilling RX rings. As the entire RX

 * ring may be refilled at once, the weight is chosen so that the EWMA will be

 * insensitive to short-term, transient changes in packet size.

/* RX packet size EWMA. The average packet size is used to determine the packet

 * buffer size when refilling RX rings. As the entire RX ring may be refilled

 * at once, the weight is chosen so that the EWMA will be insensitive to short-

 * term, transient changes in packet size.

 */

#define RECEIVE_AVG_WEIGHT 64

DECLARE_EWMA(pkt_len, 1, 64)



/* Minimum alignment for mergeable packet buffers. */

#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
@@ -85,7 +85,7 @@ struct receive_queue { 
	struct page *pages;



	/* Average packet length for mergeable receive buffers. */

	struct ewma mrg_avg_pkt_len;

	struct ewma_pkt_len mrg_avg_pkt_len;



	/* Page frag for packet buffer allocation. */

	struct page_frag alloc_frag;
@@ -407,7 +407,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, 
		}

	}



	ewma_add(&rq->mrg_avg_pkt_len, head_skb->len);

	ewma_pkt_len_add(&rq->mrg_avg_pkt_len, head_skb->len);

	return head_skb;



err_skb:
@@ -600,12 +600,12 @@ static int add_recvbuf_big(struct virtnet_info *vi, struct receive_queue *rq, 
	return err;

}



static unsigned int get_mergeable_buf_len(struct ewma *avg_pkt_len)

static unsigned int get_mergeable_buf_len(struct ewma_pkt_len *avg_pkt_len)

{

	const size_t hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);

	unsigned int len;



	len = hdr_len + clamp_t(unsigned int, ewma_read(avg_pkt_len),

	len = hdr_len + clamp_t(unsigned int, ewma_pkt_len_read(avg_pkt_len),

			GOOD_PACKET_LEN, PAGE_SIZE - hdr_len);

	return ALIGN(len, MERGEABLE_BUFFER_ALIGN);

}
@@ -1615,7 +1615,7 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) 
		napi_hash_add(&vi->rq[i].napi);



		sg_init_table(vi->rq[i].sg, ARRAY_SIZE(vi->rq[i].sg));

		ewma_init(&vi->rq[i].mrg_avg_pkt_len, 1, RECEIVE_AVG_WEIGHT);

		ewma_pkt_len_init(&vi->rq[i].mrg_avg_pkt_len);

		sg_init_table(vi->sq[i].sg, ARRAY_SIZE(vi->sq[i].sg));

	}
@@ -1658,7 +1658,7 @@ static ssize_t mergeable_rx_buffer_size_show(struct netdev_rx_queue *queue, 
{

	struct virtnet_info *vi = netdev_priv(queue->dev);

	unsigned int queue_index = get_netdev_rx_queue_index(queue);

	struct ewma *avg;

	struct ewma_pkt_len *avg;



	BUG_ON(queue_index >= vi->max_queue_pairs);

	avg = &vi->rq[queue_index].mrg_avg_pkt_len;

drivers/net/wireless/ath/ath5k/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ config ATH5K 
	select MAC80211_LEDS

	select LEDS_CLASS

	select NEW_LEDS

	select AVERAGE

	select ATH5K_AHB if ATH25

	select ATH5K_PCI if !ATH25

	---help---

drivers/net/wireless/ath/ath5k/ani.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void 
ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as,

			 bool ofdm_trigger)

{

	int rssi = ewma_read(&ah->ah_beacon_rssi_avg);

	int rssi = ewma_beacon_rssi_read(&ah->ah_beacon_rssi_avg);



	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "raise immunity (%s)",

		ofdm_trigger ? "ODFM" : "CCK");
@@ -309,7 +309,7 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as, 
static void

ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as)

{

	int rssi = ewma_read(&ah->ah_beacon_rssi_avg);

	int rssi = ewma_beacon_rssi_read(&ah->ah_beacon_rssi_avg);



	ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "lower immunity");

drivers/net/wireless/ath/ath5k/ath5k.h

+3 −1
Original line number Diff line number Diff line
@@ -1252,6 +1252,8 @@ 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)



/* Driver state associated with an instance of a device */

struct ath5k_hw {

	struct ath_common       common;
@@ -1432,7 +1434,7 @@ struct ath5k_hw { 
	struct ath5k_nfcal_hist ah_nfcal_hist;



	/* average beacon RSSI in our BSS (used by ANI) */

	struct ewma		ah_beacon_rssi_avg;

	struct ewma_beacon_rssi	ah_beacon_rssi_avg;



	/* noise floor from last periodic calibration */

	s32			ah_noise_floor;