From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794930853; b=qoaNGeYpX1aGY/P8ia9iE5FL9/Zl5V5/QwJryJmbEWT+Yvt/0wNhTqjTHw92frW5bwp9 RiGGkrWs9m5ku8xgjsSluvW3m1p6qDEIMdVGpvEIij4U85DeTXgdg/dPdjp9g9GBxrW+m AFImXNXbQAzc6AXsdgFIeIMw8o1h7vheS5yzrt7AIGFShn99uNjAqmb4rqCKctSLbLZst /ZOxgvW9XTPCerQrLRChgq9eQL273sLEUm2QQlzmiVMdYMTeFNSwcjOzY81vf/q3GTGoY aay2tyqfVr5bwrfQJ1uMqNSCOVngLQFsMLDfRtcxEYSjo5l/HeiY8NuOOvOkkfKyV1A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794930853; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=by2bd5gLHMPxECvhXlWBaNJseiE+z9NdjwcyfDzXx68=; b=0CmjK3Ijq+tofIQMRa7MhRZmJdhThlaX9wYuya/9dHyorezqKQuGHpkaPiofAcJMbV3T 870PXt3SR7rvbe1vVKikiqPCbcqaZpgC8mSYGprmp6tlhBlzFgtpAdNYH6TGPOcOIgtFM jbSv/egyGRdJMnBn4alBkyQMml64M3r2JjqtFP2boDWYZFmjkRzNO+NXXccdUc75z8LdP WY2W+Ah+2iRV+IlKUdh2qvQ00MIWUxb4XzDk+sqibApcZDdRNdcQ3788tgql8rG77aOHu 6SmaVGIHrX8CGzcjGrorZ8AspzcN86WFzKtUGpAJS1XN3mHsHXcgQzNGd30bBjVrT8Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=dama.to; spf=none smtp.mailfrom=dama.to; dkim=pass header.d=dama-to.20260707.gappssmtp.com header.i=@dama-to.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=aH7dMZSL; arc=none smtp.remote-ip=209.85.210.182 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92FD9606A890 for ; Tue, 17 Nov 2026 15:54:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 92FD9606A890 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=dama.to Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=dama.to Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dama-to.20260707.gappssmtp.com header.i=@dama-to.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=aH7dMZSL Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8b5e5e64494so2993847b3a.1 for ; Tue, 17 Nov 2026 07:54:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dama-to.20260707.gappssmtp.com; s=20260707; t=1794930853; x=1795535653; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=by2bd5gLHMPxECvhXlWBaNJseiE+z9NdjwcyfDzXx68=; b=aH7dMZSL5w52kf0WReb1/Kc6Ph/cSU3o+/Lzwkz2mKvdaCWW8I+BNyAxLL0TPCfgND SQPRuZ80nY1CKuey4aggKHEDeYYiLBFsSu6YIPmWTVFIlL0cV8RkTpiXKGL4Kk/xIUha czFlJa9T48Iprbftjw/nlQ1k+sXID82VxI9hq3LSJmnqmJcmJnmR7eONA8ykZqPxIVir yrpQBlT06aES5ho63aUV/Lhy0mSEevZ2rSbomdjVmi0Jz7A1nh7CrHtdBCyQxq9UUNDd Ws7VHkzuTuvBN+uLEpVDBfew9KPbniazcwrlC4rhSCRJMIVbljTofihZ8mgiPqsr8xwk 3DdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794930853; x=1795535653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=by2bd5gLHMPxECvhXlWBaNJseiE+z9NdjwcyfDzXx68=; b=njTdxBwQHssKNp+yH6wZLt6o73Vd4PB6aTu7wHwTClekJ5qo9FK3DRtQNgpzs/9HFP wl9XWRe3N2nIw4/Jr2dAGUL2XHHZwAwySRhmSmiw/JSOGkL0LBfKA4lS+Y4uR1ziQLwQ 142aXvwVvagvADw7LF7cwTYKNZibJVOsmrYCbxZ90+5mnS7+4bYEOT4fDxxJnfeWbA09 27yu446Y0pFJCrjBoqbOM0P/KBV1eDn73sbgJZQnnPBZ0RskogxiD7rulUm5gN8nF7Wh 7iV5G57QXlCh3gNwGZkwJTsn7k7+n9Y6hVeoedrurVxRZ3m/YZ56AZ9CD1H/heEDtXO4 K+fA== X-Gm-Message-State: APuU4Z85e3jy4VMTdpgnABY5YaqTU+DZS2pHAkSL2px31obhr1ZcTOvu zOcQ4/uUQIo2S/y0Ar9tARiWCMelcIB+ZgiOSbaWjUlNN8Xd+Yyni2j2P2H02pqOomcqQU5gm7F b0vFw X-Gm-Gg: AYBFou0IiKo6IOFFbQjkEX3h3pPNQLAyZCjudsSykdsx25j8BZ3rDXx/4QCs8uAcXGr dCeYrLD7vfszUuj+mwL49AaNyvruca8mcO1lQT+yz7TQwLYzeuz4AFA98rrmmYG7WbzxwaIeBIV Zqcy9DfAQiK2zvRDfxS4bCBvGnoN4Dilj6OTAVTgG3e+6QMESoBDddr+mzGuCYyOua6+gUrEgn+ ws9/ZjgeFTebio50F28CoBCgcJLs6YkY2xRaZvjPJqnu2mEbobbSHWG2ljrqq4LY2o2Aj3MmrJ0 gA6l7/BSDkkX677xsfvP6OUKWbvRRT94ITmjP3jvIm+09AHqF//uGFZdJRo8ZvIcRCuoFFjsvrM m0XZTXPQEecIfTjdCIOSPIm6O6SYFm/R6w4WmkODaNtMgbx1CQ9xvVxpFp0dDiPZ1hKUjhvDT3g JdLKPgK6dGyYYiz7kfkpUzk6eAHwZVO4zGGVP1tCZyLmjHMqrknUtngJxVDkgftmg/ieQWNL7mv QV4AN6OAg4BuRox+CybZdffr4mDUOJDvZsU8vAoqhCMIn/QpBJM/e4FCRDUhI3FmjFilTal3YNS NW3oOZvFfQdOeMUNsMe4IWXijPMypTpb+TIYI3Ptk0k= X-Received: by 2002:a05:6a00:8d5:b0:892:fc00:6e74 with SMTP id d2e1a72fcca58-8beb7d195femr12866795b3a.27.1794930852949; Tue, 17 Nov 2026 07:54:12 -0800 (PST) Received: from localhost ([2a03:2880:2ff:40::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8bed20548fbsm5781813b3a.37.2026.11.17.07.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 07:54:11 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org, Tariq Toukan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: edumazet@google.com, horms@kernel.org, linux-kernel@vger.kernel.org, daniel.machon@microchip.com, Joe Damato , linux-rdma@vger.kernel.org Subject: [PATCH net-next v2 4/5] net/mlx4: track whether a TX doorbell is pending Date: Tue, 17 Nov 2026 07:53:49 -0800 Message-ID: <20261117155353.2250540-5-joe@dama.to> X-Mailer: git-send-email 2.53.1 In-Reply-To: <20261117155353.2250540-1-joe@dama.to> References: <20261117155353.2250540-1-joe@dama.to> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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