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

Commit 94b982b2 authored by Mallikarjuna R Chilakala's avatar Mallikarjuna R Chilakala Committed by David S. Miller
Browse files

ixgbe: Modify 82599 HWRSC statistics counters 



Divide 82599 HWRSC counters into aggregated and flushed to count number of
packets getting coalesced per TCP connection.

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 713d0394

drivers/net/ixgbe/ixgbe.h

+3 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct ixgbe_ring { 
	struct ixgbe_queue_stats stats;

	unsigned long reinit_state;

	u64 rsc_count;			/* stat for coalesced packets */

	u64 rsc_flush;			/* stats for flushed packets */



	unsigned int size;		/* length in bytes */

	dma_addr_t dma;			/* phys. address of descriptor ring */
@@ -375,7 +376,8 @@ struct ixgbe_adapter { 
#ifdef IXGBE_FCOE

	struct ixgbe_fcoe fcoe;

#endif /* IXGBE_FCOE */

	u64 rsc_count;

	u64 rsc_total_count;

	u64 rsc_total_flush;

	u32 wol;

	u16 eeprom_version;

};

drivers/net/ixgbe/ixgbe_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = { 
	{"rx_over_errors", IXGBE_NETDEV_STAT(stats.rx_over_errors)},

	{"rx_crc_errors", IXGBE_NETDEV_STAT(stats.rx_crc_errors)},

	{"rx_frame_errors", IXGBE_NETDEV_STAT(stats.rx_frame_errors)},

	{"hw_rsc_count", IXGBE_STAT(rsc_count)},

	{"hw_rsc_aggregated", IXGBE_STAT(rsc_total_count)},

	{"hw_rsc_flushed", IXGBE_STAT(rsc_total_flush)},

	{"fdir_match", IXGBE_STAT(stats.fdirmatch)},

	{"fdir_miss", IXGBE_STAT(stats.fdirmiss)},

	{"rx_fifo_errors", IXGBE_NETDEV_STAT(stats.rx_fifo_errors)},

drivers/net/ixgbe/ixgbe_main.c

+19 −6
Original line number Diff line number Diff line
@@ -729,12 +729,14 @@ static inline u32 ixgbe_get_rsc_count(union ixgbe_adv_rx_desc *rx_desc) 
/**

 * ixgbe_transform_rsc_queue - change rsc queue into a full packet

 * @skb: pointer to the last skb in the rsc queue

 * @count: pointer to number of packets coalesced in this context

 *

 * This function changes a queue full of hw rsc buffers into a completed

 * packet.  It uses the ->prev pointers to find the first packet and then

 * turns it into the frag list owner.

 **/

static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb)

static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb,

                                                        u64 *count)

{

	unsigned int frag_list_size = 0;
@@ -743,6 +745,7 @@ static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb) 
		frag_list_size += skb->len;

		skb->prev = NULL;

		skb = prev;

		*count += 1;

	}



	skb_shinfo(skb)->frag_list = skb->next;
@@ -845,14 +848,20 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
			u32 nextp = (staterr & IXGBE_RXDADV_NEXTP_MASK) >>

				     IXGBE_RXDADV_NEXTP_SHIFT;

			next_buffer = &rx_ring->rx_buffer_info[nextp];

			rx_ring->rsc_count += (rsc_count - 1);

		} else {

			next_buffer = &rx_ring->rx_buffer_info[i];

		}



		if (staterr & IXGBE_RXD_STAT_EOP) {

			if (skb->prev)

				skb = ixgbe_transform_rsc_queue(skb);

				skb = ixgbe_transform_rsc_queue(skb, &(rx_ring->rsc_count));

			if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {

				if (rx_ring->flags & IXGBE_RING_RX_PS_ENABLED)

					rx_ring->rsc_count += skb_shinfo(skb)->nr_frags;

				else

					rx_ring->rsc_count++;

				rx_ring->rsc_flush++;

			}

			rx_ring->stats.packets++;

			rx_ring->stats.bytes += skb->len;

		} else {
@@ -4474,14 +4483,18 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) 
	u64 total_mpc = 0;

	u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;



	if (hw->mac.type == ixgbe_mac_82599EB) {

	if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {

		u64 rsc_count = 0;

		u64 rsc_flush = 0;

		for (i = 0; i < 16; i++)

			adapter->hw_rx_no_dma_resources +=

			                     IXGBE_READ_REG(hw, IXGBE_QPRDC(i));

		for (i = 0; i < adapter->num_rx_queues; i++)

		for (i = 0; i < adapter->num_rx_queues; i++) {

			rsc_count += adapter->rx_ring[i].rsc_count;

		adapter->rsc_count = rsc_count;

			rsc_flush += adapter->rx_ring[i].rsc_flush;

		}

		adapter->rsc_total_count = rsc_count;

		adapter->rsc_total_flush = rsc_flush;

	}



	adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);