On Thu, Jul 11, 2019 at 02:45:32PM +0100, Phil Elwell wrote:
> pl011_tx_chars takes a "from_irq" parameter to reduce the number of
> register accesses. When from_irq is true the function assumes that the
> FIFO is half empty and writes up to half a FIFO's worth of bytes
> without polling the FIFO status register, the reasoning being that
> the function is being called as a result of the TX interrupt being
> raised. This logic would work were it not for the fact that
> pl011_rx_chars, called from pl011_int before pl011_tx_chars, releases
> the spinlock before calling tty_flip_buffer_push.
>
> A user thread writing to the UART claims the spinlock and ultimately
> calls pl011_tx_chars with from_irq set to false. This reverts to the
> older logic that polls the FIFO status register before sending every
> byte. If this happen on an SMP system during the section of the IRQ
> handler where the spinlock has been released, then by the time the TX
> interrupt handler is called, the FIFO may already be full, and any
> further writes are likely to be lost.
>
> The fix involves adding a per-port flag that is true iff running from
> within the interrupt handler and the spinlock has not yet been released.
> This flag is then used as the value for the from_irq parameter of
> pl011_tx_chars, causing polling to be used in the unsafe case.
Releasing the lock in pl011_int() before calling pl011_tx_chars()
wouldn't the source of this issue, though it may make it easier to hit:
there would anyway be a window between the interrupt being asserted and
the initial spin_lock_irqsave() in pl011_int(), during which the TX
FIFO could be topped up by another cpu.
So, assuming you've diagnosed the problem correctly, I'm not sure this
patch really fixes it.
What's the failure scenario exactly? Are you using DMA?
If chars are being lost and falling back to polled TXFF per char fixes
it, then that does suggest a TX FIFO overflow somewhere.
Looking at the code, I'm slightly amazed we don't hit this more often.
It looks like if we have stuttering output that is sufficient to fill
the TX FIFO to the interrupt trigger threshold sometimes, but
uap->port.state->xmit stays empty, then we can probably get pl011_int()
and pl011_start_tx_pio() fighting with each other, as you suggest.
One option would be to track who can write the TX FIFO, either the
irq handler, or regular task context, and make them mutually exclusive.
We already have a flag for that in the form of the TXIM interrupt mask
bit. So, fixing this might be as simple as [1]. Can you give it a
try?
If is works, I can work it up into a proper patch.
Cheers
---Dave
>
> Fixes: 1e84d22322ce ("serial/amba-pl011: Refactor and simplify TX FIFO handling")
>
> Signed-off-by: Phil Elwell <phil@xxxxxxxxxxxxxxx>
> ---
> drivers/tty/serial/amba-pl011.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index 5921a33..70c1dc9 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -270,6 +270,7 @@ struct uart_amba_port {
> unsigned int old_cr; /* state during shutdown */
> unsigned int fixed_baud; /* vendor-set fixed baud rate */
> char type[12];
> + bool irq_locked; /* in irq, unreleased lock */
> #ifdef CONFIG_DMA_ENGINE
> /* DMA stuff */
> bool using_tx_dma;
> @@ -814,6 +815,7 @@ __acquires(&uap->port.lock)
> return;
>
> /* Avoid deadlock with the DMA engine callback */
> + uap->irq_locked = 0;
> spin_unlock(&uap->port.lock);
> dmaengine_terminate_all(uap->dmatx.chan);
> spin_lock(&uap->port.lock);
> @@ -941,6 +943,7 @@ static void pl011_dma_rx_chars(struct uart_amba_port *uap,
> fifotaken = pl011_fifo_to_tty(uap);
> }
>
> + uap->irq_locked = 0;
> spin_unlock(&uap->port.lock);
> dev_vdbg(uap->port.dev,
> "Took %d chars from DMA buffer and %d chars from the FIFO\n",
> @@ -1349,6 +1352,7 @@ __acquires(&uap->port.lock)
> {
> pl011_fifo_to_tty(uap);
>
> + uap->irq_locked = 0;
> spin_unlock(&uap->port.lock);
> tty_flip_buffer_push(&uap->port.state->port);
> /*
> @@ -1483,6 +1487,7 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
> int handled = 0;
>
> spin_lock_irqsave(&uap->port.lock, flags);
> + uap->irq_locked = 1;
> status = pl011_read(uap, REG_RIS) & uap->im;
> if (status) {
> do {
> @@ -1502,7 +1507,7 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
> UART011_CTSMIS|UART011_RIMIS))
> pl011_modem_status(uap);
> if (status & UART011_TXIS)
> - pl011_tx_chars(uap, true);
> + pl011_tx_chars(uap, uap->irq_locked);
>
> if (pass_counter-- == 0)
> break;
> --
> 2.7.4
>
[1] Untested, alternative "fix"
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 89ade21..1902071 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1307,6 +1307,13 @@ static bool pl011_tx_chars(struct uart_amba_port *uap, bool from_irq);
/* Start TX with programmed I/O only (no DMA) */
static void pl011_start_tx_pio(struct uart_amba_port *uap)
{
+ /*
+ * Avoid FIFO overfills if the TX IRQ is active:
+ * pl011_int() will comsume chars waiting in the xmit queue anyway.
+ */
+ if (uap->im & UART011_TXIM)
+ return;
+
if (pl011_tx_chars(uap, false)) {
uap->im |= UART011_TXIM;
pl011_write(uap->im, uap, REG_IMSC);
