Skip to content

Commit 287f0f5

Browse files
vdadhanimukesh-savaliya
authored andcommitted
FROMLIST: serial: qcom_geni: fix kfifo underflow when flush precedes DMA completion IRQ
When uart_flush_buffer() runs before the DMA completion IRQ is delivered, the following race can occur (all steps serialized by uart_port_lock): 1. DMA starts: tx_remaining = N, kfifo contains N bytes 2. DMA completes in hardware; IRQ is pending but not yet delivered 3. uart_flush_buffer() acquires the port lock and calls kfifo_reset(), making kfifo_len() = 0 while tx_remaining remains N 4. uart_flush_buffer() releases the port lock 5. DMA IRQ fires; handle_tx_dma() acquires the port lock and calls uart_xmit_advance(uport, tx_remaining) on an empty kfifo uart_xmit_advance() increments kfifo->out by tx_remaining. Since kfifo_reset() already set both in and out to 0, out wraps past in, causing kfifo_len() to return UART_XMIT_SIZE - tx_remaining. The next start_tx_dma() call then submits a DMA transfer of stale buffer data. Fix this by snapshotting kfifo_len() at the start of handle_tx_dma() and skipping uart_xmit_advance() when fifo_len < tx_remaining, which indicates the kfifo was reset by a preceding flush. Link: https://patch.msgid.link/20260506-serial-dma-stale-tx-buf-v1-1-e3ccb360d719@oss.qualcomm.com Fixes: 2aaa43c ("tty: serial: qcom-geni-serial: add support for serial engine DMA") Cc: stable@vger.kernel.org Signed-off-by: Viken Dadhaniya <viken.dadhaniya@oss.qualcomm.com>
1 parent 6fe71bf commit 287f0f5

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

drivers/tty/serial/qcom_geni_serial.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,8 +1031,20 @@ static void qcom_geni_serial_handle_tx_dma(struct uart_port *uport)
10311031
{
10321032
struct qcom_geni_serial_port *port = to_dev_port(uport);
10331033
struct tty_port *tport = &uport->state->port;
1034+
unsigned int fifo_len = kfifo_len(&tport->xmit_fifo);
1035+
1036+
/*
1037+
* Only advance the kfifo if it still contains the bytes that were
1038+
* transferred. uart_flush_buffer() may have run before this IRQ
1039+
* fired: it calls kfifo_reset() under the port lock, making
1040+
* fifo_len = 0 while tx_remaining remains non-zero. Calling
1041+
* uart_xmit_advance() in that case would underflow kfifo->out past
1042+
* kfifo->in, making kfifo_len() wrap to UART_XMIT_SIZE - tx_remaining
1043+
* and triggering a spurious large DMA transfer of stale data.
1044+
*/
1045+
if (fifo_len >= port->tx_remaining)
1046+
uart_xmit_advance(uport, port->tx_remaining);
10341047

1035-
uart_xmit_advance(uport, port->tx_remaining);
10361048
geni_se_tx_dma_unprep(&port->se, port->tx_dma_addr, port->tx_remaining);
10371049
port->tx_dma_addr = 0;
10381050
port->tx_remaining = 0;

0 commit comments

Comments
 (0)