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

Commit 2a35efe5 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbevf: add counters for Rx page allocations 



We already had placehloders for failed page and buffer allocations.
Added alloc_rx_page and made sure the stats are properly updated and
exposed in ethtool.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 35074d69

drivers/net/ethernet/intel/ixgbevf/ethtool.c

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ static struct ixgbe_stats ixgbevf_gstrings_stats[] = { 
	IXGBEVF_STAT("tx_timeout_count", tx_timeout_count),

	IXGBEVF_NETDEV_STAT(multicast),

	IXGBEVF_STAT("rx_csum_offload_errors", hw_csum_rx_error),

	IXGBEVF_STAT("alloc_rx_page", alloc_rx_page),

	IXGBEVF_STAT("alloc_rx_page_failed", alloc_rx_page_failed),

	IXGBEVF_STAT("alloc_rx_buff_failed", alloc_rx_buff_failed),

};



#define IXGBEVF_QUEUE_STATS_LEN ( \

drivers/net/ethernet/intel/ixgbevf/ixgbevf.h

+4 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct ixgbevf_tx_queue_stats { 
struct ixgbevf_rx_queue_stats {

	u64 alloc_rx_page_failed;

	u64 alloc_rx_buff_failed;

	u64 alloc_rx_page;

	u64 csum_err;

};
@@ -295,8 +296,9 @@ struct ixgbevf_adapter { 
	u64 hw_csum_rx_error;

	u64 hw_rx_no_dma_resources;

	int num_msix_vectors;

	u32 alloc_rx_page_failed;

	u32 alloc_rx_buff_failed;

	u64 alloc_rx_page_failed;

	u64 alloc_rx_buff_failed;

	u64 alloc_rx_page;



	struct msix_entry *msix_entries;

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+18 −5
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static bool ixgbevf_alloc_mapped_page(struct ixgbevf_ring *rx_ring, 
	if (dma_mapping_error(rx_ring->dev, dma)) {

		__free_page(page);



		rx_ring->rx_stats.alloc_rx_buff_failed++;

		rx_ring->rx_stats.alloc_rx_page_failed++;

		return false;

	}
@@ -612,6 +612,7 @@ static bool ixgbevf_alloc_mapped_page(struct ixgbevf_ring *rx_ring, 
	bi->page = page;

	bi->page_offset = 0;

	bi->pagecnt_bias = 1;

	rx_ring->rx_stats.alloc_rx_page++;



	return true;

}
@@ -963,8 +964,10 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
		skb = ixgbevf_fetch_rx_buffer(rx_ring, rx_desc, skb);



		/* exit if we failed to retrieve a buffer */

		if (!skb)

		if (!skb) {

			rx_ring->rx_stats.alloc_rx_buff_failed++;

			break;

		}



		cleaned_count++;
@@ -2749,6 +2752,8 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter) 
void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	u64 alloc_rx_page_failed = 0, alloc_rx_buff_failed = 0;

	u64 alloc_rx_page = 0, hw_csum_rx_error = 0;

	int i;



	if (test_bit(__IXGBEVF_DOWN, &adapter->state) ||
@@ -2769,10 +2774,18 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter) 
				adapter->stats.vfmprc);



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

		adapter->hw_csum_rx_error +=

			adapter->rx_ring[i]->hw_csum_rx_error;

		adapter->rx_ring[i]->hw_csum_rx_error = 0;

		struct ixgbevf_ring *rx_ring = adapter->rx_ring[i];



		hw_csum_rx_error += rx_ring->rx_stats.csum_err;

		alloc_rx_page_failed += rx_ring->rx_stats.alloc_rx_page_failed;

		alloc_rx_buff_failed += rx_ring->rx_stats.alloc_rx_buff_failed;

		alloc_rx_page += rx_ring->rx_stats.alloc_rx_page;

	}



	adapter->hw_csum_rx_error = hw_csum_rx_error;

	adapter->alloc_rx_page_failed = alloc_rx_page_failed;

	adapter->alloc_rx_buff_failed = alloc_rx_buff_failed;

	adapter->alloc_rx_page = alloc_rx_page;

}



/**