From: Markus Schneider-Pargmann <msp@baylibre.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>,
Chandrasekar Ramakrishnan <rcsekar@samsung.com>,
Wolfgang Grandegger <wg@grandegger.com>
Cc: Vincent MAILHOL <mailhol.vincent@wanadoo.fr>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Markus Schneider-Pargmann <msp@baylibre.com>
Subject: [PATCH 17/18] can: m_can: Implement BQL
Date: Wed, 21 Dec 2022 16:25:36 +0100 [thread overview]
Message-ID: <20221221152537.751564-18-msp@baylibre.com> (raw)
In-Reply-To: <20221221152537.751564-1-msp@baylibre.com>
Implement byte queue limiting in preparation for the use of xmit_more().
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
drivers/net/can/m_can/m_can.c | 43 ++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 11 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 076fa60317c2..719a7dfe154a 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -443,6 +443,8 @@ static void m_can_clean(struct net_device *net)
for (int i = 0; i != cdev->can.echo_skb_max; ++i)
can_free_echo_skb(cdev->net, i, NULL);
+ netdev_reset_queue(cdev->net);
+
spin_lock(&cdev->tx_handling_spinlock);
cdev->tx_fifo_in_flight = 0;
spin_unlock(&cdev->tx_handling_spinlock);
@@ -988,23 +990,25 @@ static int m_can_poll(struct napi_struct *napi, int quota)
* echo. timestamp is used for peripherals to ensure correct ordering
* by rx-offload, and is ignored for non-peripherals.
*/
-static void m_can_tx_update_stats(struct m_can_classdev *cdev,
- unsigned int msg_mark,
- u32 timestamp)
+static unsigned int m_can_tx_update_stats(struct m_can_classdev *cdev,
+ unsigned int msg_mark, u32 timestamp)
{
struct net_device *dev = cdev->net;
struct net_device_stats *stats = &dev->stats;
+ unsigned int frame_len;
if (cdev->is_peripheral)
stats->tx_bytes +=
can_rx_offload_get_echo_skb(&cdev->offload,
msg_mark,
timestamp,
- NULL);
+ &frame_len);
else
- stats->tx_bytes += can_get_echo_skb(dev, msg_mark, NULL);
+ stats->tx_bytes += can_get_echo_skb(dev, msg_mark, &frame_len);
stats->tx_packets++;
+
+ return frame_len;
}
static int m_can_echo_tx_event(struct net_device *dev)
@@ -1017,6 +1021,7 @@ static int m_can_echo_tx_event(struct net_device *dev)
int err = 0;
unsigned int msg_mark;
int processed = 0;
+ int processed_frame_len = 0;
struct m_can_classdev *cdev = netdev_priv(dev);
@@ -1045,10 +1050,14 @@ static int m_can_echo_tx_event(struct net_device *dev)
fgi = (++fgi >= cdev->mcfg[MRAM_TXE].num ? 0 : fgi);
/* update stats */
- m_can_tx_update_stats(cdev, msg_mark, timestamp);
+ processed_frame_len += m_can_tx_update_stats(cdev, msg_mark,
+ timestamp);
+
++processed;
}
+ netdev_completed_queue(cdev->net, processed, processed_frame_len);
+
if (ack_fgi != -1)
m_can_write(cdev, M_CAN_TXEFA, FIELD_PREP(TXEFA_EFAI_MASK,
ack_fgi));
@@ -1148,10 +1157,12 @@ static irqreturn_t m_can_isr(int irq, void *dev_id)
if (ir & IR_TC) {
/* Transmission Complete Interrupt*/
u32 timestamp = 0;
+ unsigned int frame_len;
if (cdev->is_peripheral)
timestamp = m_can_get_timestamp(cdev);
- m_can_tx_update_stats(cdev, 0, timestamp);
+ frame_len = m_can_tx_update_stats(cdev, 0, timestamp);
+ netdev_completed_queue(cdev->net, 1, frame_len);
netif_wake_queue(dev);
}
} else {
@@ -1667,6 +1678,7 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev,
u32 cccr, fdflags;
int err;
int putidx;
+ unsigned int frame_len = can_skb_get_frame_len(skb);
/* Generate ID field for TX buffer Element */
/* Common to all supported M_CAN versions */
@@ -1712,7 +1724,7 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev,
}
m_can_write(cdev, M_CAN_TXBTIE, 0x1);
- can_put_echo_skb(skb, dev, 0, 0);
+ can_put_echo_skb(skb, dev, 0, frame_len);
m_can_write(cdev, M_CAN_TXBAR, 0x1);
/* End of xmit function for version 3.0.x */
@@ -1750,7 +1762,7 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev,
/* Push loopback echo.
* Will be looped back on TX interrupt based on message marker
*/
- can_put_echo_skb(skb, dev, putidx, 0);
+ can_put_echo_skb(skb, dev, putidx, frame_len);
/* Enable TX FIFO element to start transfer */
m_can_write(cdev, M_CAN_TXBAR, (1 << putidx));
@@ -1833,14 +1845,23 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{
struct m_can_classdev *cdev = netdev_priv(dev);
+ netdev_tx_t ret;
+ unsigned int frame_len;
if (can_dev_dropped_skb(dev, skb))
return NETDEV_TX_OK;
+ frame_len = can_skb_get_frame_len(skb);
+
if (cdev->is_peripheral)
- return m_can_start_peripheral_xmit(cdev, skb);
+ ret = m_can_start_peripheral_xmit(cdev, skb);
else
- return m_can_start_fast_xmit(cdev, skb);
+ ret = m_can_start_fast_xmit(cdev, skb);
+
+ if (ret == NETDEV_TX_OK)
+ netdev_sent_queue(dev, frame_len);
+
+ return ret;
}
static int m_can_open(struct net_device *dev)
--
2.38.1
next prev parent reply other threads:[~2022-12-21 15:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 15:25 [PATCH 00/18] can: m_can: Optimizations for m_can/tcan part 2 Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 01/18] can: tcan4x5x: Remove reserved register 0x814 from writable table Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 02/18] can: tcan4x5x: Check size of mram configuration Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 03/18] can: m_can: Remove repeated check for is_peripheral Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 04/18] can: m_can: Always acknowledge all interrupts Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 05/18] can: m_can: Remove double interrupt enable Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 06/18] can: m_can: Disable unused interrupts Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 07/18] can: m_can: Keep interrupts enabled during peripheral read Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 08/18] can: m_can: Write transmit header and data in one transaction Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 09/18] can: m_can: Implement receive coalescing Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 10/18] can: m_can: Implement transmit coalescing Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 11/18] can: m_can: Add rx coalescing ethtool support Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 12/18] can: m_can: Add tx " Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 13/18] can: m_can: Cache tx putidx Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 14/18] can: m_can: Use the workqueue as queue Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 15/18] can: m_can: Introduce a tx_fifo_in_flight counter Markus Schneider-Pargmann
2022-12-21 15:25 ` [PATCH 16/18] can: m_can: Use tx_fifo_in_flight for netif_queue control Markus Schneider-Pargmann
2022-12-21 15:25 ` Markus Schneider-Pargmann [this message]
2022-12-21 15:25 ` [PATCH 18/18] can: m_can: Implement transmit submission coalescing Markus Schneider-Pargmann
2023-01-09 13:55 ` [PATCH 00/18] can: m_can: Optimizations for m_can/tcan part 2 Markus Schneider-Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221221152537.751564-18-msp@baylibre.com \
--to=msp@baylibre.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=rcsekar@samsung.com \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).