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

Commit 6059c905 authored by Eugene Crosser's avatar Eugene Crosser Committed by David S. Miller
Browse files

qeth: introduce linearization fail count to stats 



When skb data touches too many pages, skb_linearize() is called
opportunistically in the hope that less pages will be required
for a big linear buffer than for multiple fragments. This patch
intoduces a separate counter in ethtool statistics structure
representing _failed_ linearization attempts.

Signed-off-by: default avatarEugene Crosser <Eugene.Crosser@ru.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: default avatarLakhvich Dmitriy <ldmitriy@ru.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2601e4ed

drivers/s390/net/qeth_core.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ struct qeth_perf_stats { 
	unsigned int sg_alloc_page_rx;

	unsigned int tx_csum;

	unsigned int tx_lin;

	unsigned int tx_linfail;

};



/* Routing stuff */

drivers/s390/net/qeth_core_main.c

+4 −2
Original line number Diff line number Diff line
@@ -5801,6 +5801,7 @@ static struct { 
	{"tx do_QDIO count"},

	{"tx csum"},

	{"tx lin"},

	{"tx linfail"},

	{"cq handler count"},

	{"cq handler time"}

};
@@ -5861,8 +5862,9 @@ void qeth_core_get_ethtool_stats(struct net_device *dev, 
	data[32] = card->perf_stats.outbound_do_qdio_cnt;

	data[33] = card->perf_stats.tx_csum;

	data[34] = card->perf_stats.tx_lin;

	data[35] = card->perf_stats.cq_cnt;

	data[36] = card->perf_stats.cq_time;

	data[35] = card->perf_stats.tx_linfail;

	data[36] = card->perf_stats.cq_cnt;

	data[37] = card->perf_stats.cq_time;

}

EXPORT_SYMBOL_GPL(qeth_core_get_ethtool_stats);

drivers/s390/net/qeth_l2_main.c

+9 −3
Original line number Diff line number Diff line
@@ -898,11 +898,17 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	 */

	if ((card->info.type != QETH_CARD_TYPE_IQD) &&

	    !qeth_get_elements_no(card, new_skb, 0)) {

		if (skb_linearize(new_skb))

			goto tx_drop;

		if (card->options.performance_stats)

		int lin_rc = skb_linearize(new_skb);



		if (card->options.performance_stats) {

			if (lin_rc)

				card->perf_stats.tx_linfail++;

			else

				card->perf_stats.tx_lin++;

		}

		if (lin_rc)

			goto tx_drop;

	}



	if (card->info.type == QETH_CARD_TYPE_OSN)

		hdr = (struct qeth_hdr *)skb->data;

drivers/s390/net/qeth_l3_main.c

+9 −3
Original line number Diff line number Diff line
@@ -2918,11 +2918,17 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if ((card->info.type != QETH_CARD_TYPE_IQD) &&

	    ((use_tso && !qeth_l3_get_elements_no_tso(card, new_skb, 1)) ||

	     (!use_tso && !qeth_get_elements_no(card, new_skb, 0)))) {

		if (skb_linearize(new_skb))

			goto tx_drop;

		if (card->options.performance_stats)

		int lin_rc = skb_linearize(new_skb);



		if (card->options.performance_stats) {

			if (lin_rc)

				card->perf_stats.tx_linfail++;

			else

				card->perf_stats.tx_lin++;

		}

		if (lin_rc)

			goto tx_drop;

	}



	if (use_tso) {

		hdr = (struct qeth_hdr *)skb_push(new_skb,