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

Commit 104b4859 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: be drop monitor friendly 



As part of the TX completion path, qeth_release_skbs() frees the completed
skbs with __skb_queue_purge(). This ends in kfree_skb(), reporting every
completed skb as dropped.
On the other hand when dropping an skb in .ndo_start_xmit, we end up
calling consume_skb()... where we should be using kfree_skb() so that
drop monitors get notified.

Switch the drop/consume logic around, and also don't accumulate dropped
packets in the tx_errors statistics.

Fixes: dc149e37 ("s390/qeth: replace open-coded skb_queue_walk()")
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7221b727

drivers/s390/net/qeth_core_main.c

+4 −1
Original line number Diff line number Diff line
@@ -1150,13 +1150,16 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *q, 


static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf)

{

	struct sk_buff *skb;



	/* release may never happen from within CQ tasklet scope */

	WARN_ON_ONCE(atomic_read(&buf->state) == QETH_QDIO_BUF_IN_CQ);



	if (atomic_read(&buf->state) == QETH_QDIO_BUF_PENDING)

		qeth_notify_skbs(buf->q, buf, TX_NOTIFY_GENERALERROR);



	__skb_queue_purge(&buf->skb_list);

	while ((skb = __skb_dequeue(&buf->skb_list)) != NULL)

		consume_skb(skb);

}



static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,

drivers/s390/net/qeth_l2_main.c

+1 −2
Original line number Diff line number Diff line
@@ -629,8 +629,7 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, 
	} /* else fall through */



	QETH_TXQ_STAT_INC(queue, tx_dropped);

	QETH_TXQ_STAT_INC(queue, tx_errors);

	dev_kfree_skb_any(skb);

	kfree_skb(skb);

	netif_wake_queue(dev);

	return NETDEV_TX_OK;

}

drivers/s390/net/qeth_l3_main.c

+1 −2
Original line number Diff line number Diff line
@@ -2096,8 +2096,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, 


tx_drop:

	QETH_TXQ_STAT_INC(queue, tx_dropped);

	QETH_TXQ_STAT_INC(queue, tx_errors);

	dev_kfree_skb_any(skb);

	kfree_skb(skb);

	netif_wake_queue(dev);

	return NETDEV_TX_OK;

}