When the stack sets xmit_more, mlx4_en_xmit() skips the doorbell and relies on a later call in the same batch to write it. Nothing records that a doorbell is owed, so a path that ends the batch without writing the doorbell leaves the WQEs posted before it unannounced to HW. Add ring->doorbell_pending, set when the doorbell is deferred and cleared whenever a doorbell or a BlueFlame write is issued, so such a path can flush the deferred doorbell. Place the flag in the cache line dirtied by mlx4_en_xmit(), next to prod. That line has no room left, so move tx_dropped, which is only written when an skb is dropped, to the end of the struct among the fields not used in the fast path. Signed-off-by: Joe Damato Reviewed-by: Daniel Machon --- v2: - doorbell_pending moved to the area of the struct marked as cache line used and dirtied in mlx4_en_xmit. In exchange, tx_dropped is moved among fields not written in the fast path. It is only written for drops and is read for stats. - Update the commit message. drivers/net/ethernet/mellanox/mlx4/en_tx.c | 9 +++++++-- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 97f27e005810..123071a47bed 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -194,6 +194,7 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv, ring->prod = 0; ring->cons = 0xffffffff; ring->last_nr_txbb = 1; + ring->doorbell_pending = false; memset(ring->tx_info, 0, ring->size * sizeof(struct mlx4_en_tx_info)); memset(ring->buf, 0, ring->buf_size); ring->free_tx_desc = mlx4_en_free_tx_desc; @@ -757,6 +758,7 @@ void mlx4_en_xmit_doorbell(struct mlx4_en_tx_ring *ring) iowrite32be( #endif (__force u32)ring->doorbell_qpn, ring->doorbell_address); + ring->doorbell_pending = false; } static void mlx4_en_tx_write_desc(struct mlx4_en_tx_ring *ring, @@ -784,16 +786,19 @@ static void mlx4_en_tx_write_desc(struct mlx4_en_tx_ring *ring, wmb(); ring->bf.offset ^= ring->bf.buf_size; + ring->doorbell_pending = false; } else { /* Ensure new descriptor hits memory * before setting ownership of this descriptor to HW */ dma_wmb(); tx_desc->ctrl.owner_opcode = op_own; - if (send_doorbell) + if (send_doorbell) { mlx4_en_xmit_doorbell(ring); - else + } else { ring->xmit_more++; + ring->doorbell_pending = true; + } } } diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index aab97694f86b..c28d5213cccd 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -274,7 +274,7 @@ struct mlx4_en_tx_ring { /* cache line used and dirtied in mlx4_en_xmit() */ u32 prod ____cacheline_aligned_in_smp; - unsigned int tx_dropped; + bool doorbell_pending; unsigned long bytes; unsigned long packets; unsigned long tx_csum; @@ -311,6 +311,7 @@ struct mlx4_en_tx_ring { enum mlx4_qp_state sp_qp_state; u16 sp_stride; u16 sp_cqn; /* index of port CQ associated with this ring */ + unsigned int tx_dropped; } ____cacheline_aligned_in_smp; struct mlx4_en_rx_desc { -- 2.53.1-Meta