Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1719633 > unrolled thread
| Started by | Florian Fainelli <f.fainelli@gmail.com> |
|---|---|
| First post | 2017-08-25 01:10 +0200 |
| Last post | 2017-08-25 04:00 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH net-next] net: mv643xx_eth: Be drop monitor friendly Florian Fainelli <f.fainelli@gmail.com> - 2017-08-25 01:10 +0200
Re: [PATCH net-next] net: mv643xx_eth: Be drop monitor friendly David Miller <davem@davemloft.net> - 2017-08-25 03:30 +0200
Re: [PATCH net-next] net: mv643xx_eth: Be drop monitor friendly David Miller <davem@davemloft.net> - 2017-08-25 04:00 +0200
| From | Florian Fainelli <f.fainelli@gmail.com> |
|---|---|
| Date | 2017-08-25 01:10 +0200 |
| Subject | [PATCH net-next] net: mv643xx_eth: Be drop monitor friendly |
| Message-ID | <ui9qa-4Bp-3@gated-at.bofh.it> |
txq_reclaim() does the normal transmit queue reclamation and
rxq_deinit() does the RX ring cleanup, none of these are packet drops,
so use dev_consume_skb() for both locations.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 9c94ea9b2b80..7655616bffef 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1123,7 +1123,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force)
struct sk_buff *skb = __skb_dequeue(&txq->tx_skb);
if (!WARN_ON(!skb))
- dev_kfree_skb(skb);
+ dev_consume_skb(skb);
}
if (cmd_sts & ERROR_SUMMARY) {
@@ -2026,7 +2026,7 @@ static void rxq_deinit(struct rx_queue *rxq)
for (i = 0; i < rxq->rx_ring_size; i++) {
if (rxq->rx_skb[i]) {
- dev_kfree_skb(rxq->rx_skb[i]);
+ dev_consume_skb(rxq->rx_skb[i]);
rxq->rx_desc_count--;
}
}
--
2.9.3
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-08-25 03:30 +0200 |
| Message-ID | <uibBD-5Ur-5@gated-at.bofh.it> |
| In reply to | #1719633 |
From: Florian Fainelli <f.fainelli@gmail.com> Date: Thu, 24 Aug 2017 16:04:25 -0700 > txq_reclaim() does the normal transmit queue reclamation and > rxq_deinit() does the RX ring cleanup, none of these are packet drops, > so use dev_consume_skb() for both locations. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied.
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-08-25 04:00 +0200 |
| Message-ID | <uic4F-63E-3@gated-at.bofh.it> |
| In reply to | #1719699 |
From: David Miller <davem@davemloft.net>
Date: Thu, 24 Aug 2017 18:27:56 -0700 (PDT)
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Thu, 24 Aug 2017 16:04:25 -0700
>
>> txq_reclaim() does the normal transmit queue reclamation and
>> rxq_deinit() does the RX ring cleanup, none of these are packet drops,
>> so use dev_consume_skb() for both locations.
>>
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Applied.
-ENOCOMPILE?
drivers/net/ethernet/marvell/mv643xx_eth.c: In function ‘txq_reclaim’:
drivers/net/ethernet/marvell/mv643xx_eth.c:1124:5: error: implicit declaration of function ‘dev_consume_skb’; did you mean ‘dev_consume_skb_any’? [-Werror=implicit-function-declaration]
dev_consume_skb(skb);
^~~~~~~~~~~~~~~
dev_consume_skb_any
Reverted.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web