From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 222643939A2 for ; Sun, 14 Jun 2026 07:25:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.99 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781421942; cv=none; b=OE3V+ruVwzrlB93+YsO9drVrf+KXrJNhQQe6om9pEpXbFwdoxQkWzugQikT/qh7Y6mB1jU3e5V5N+Ohg+lYjMoH+3/pJMlwpyLVWnGh3EW1HRvomfmkwvPT390O9c6B4EG6UDlgs86W60yBLMMdBLtdAYIs4LZn8lWqqJb6uPjg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781421942; c=relaxed/simple; bh=OO6z3fy0usOgERpNhx6XgSFitfrhONwSGLfDx7huLvg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OSsNxWt/kEXhF7N5/iat9hSs9pXEMyO3VjBF4nQbxsHwRtN7hvnLHQhSKwqXIylrW9oDBoCU0jigFUgbJ1OUSiFXyUndvL30XY/fwCn58NzD1cVVw8ffS5IXKCcTYGd74vhhML5jT3UGcsmLclmNP5kbhpI+eaeJiGR4Sl+D+ms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=OjyvgZUl; arc=none smtp.client-ip=209.85.216.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="OjyvgZUl" Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-36b8d414666so1417946a91.3 for ; Sun, 14 Jun 2026 00:25:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781421939; x=1782026739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oJc53CHmBNr7u6LdSssGt4eWYkQu3EOftVekG28f80A=; b=nXGUg1VxbSP55dlzYdeTBKpWepOVmw5qFAoAYZ85Vmn6EtlFlbXrmoMIK6O3j0A/1W z92SXvPIMoAtCwrCrlx+H+eayfPGYfyJOJSiSrvE8mhPU439DlRTOrCEC7EHBd3ZTw90 neJll2oa+Xgqpl3Xj+1HFrGYlYaQIg399wc/6+WqAmJW5jibufrf2uEiSlGD3xJQyx85 c5WQYtqIcEapY4CIvFSs0Vt3gVYFqAlMpudCkpYXGrLcqHbzEMdFyGoyu7+HC9wPK9BO +wOiTuoQw4l136Gq2LMIyLWu4iEBF9jeTbcAnccHNe59lVffgp+SU4PrlAItDgIEvNJS dgVQ== X-Gm-Message-State: AOJu0YxkAL/c+btZGhKza2+BT2K2ydH0Bn2zOhXKQ3lfSBJKnuN+ML2c GMpMswhx5hwHx7Hs33RHzfE7MQGFSnbRcFMizYsIowkplyRs7p/hTu7bAPmGj+m/1+oNFquuns1 DJxMNduk0aPoD9ezZ9oiVLofpk/VcYSD/3cwC0+ykcagv/Irhs5f6VjM6GZRpMJ6gVxtKvqzUwv SafIayYTqWTVeFdzxaej5mf+OcePXsZaRKDToYtZ6d0XssHlr2zWOS2AyIPTHwCbOEOxzM6PT56 nx6YIek4LY= X-Gm-Gg: Acq92OG3f2VWpqu6f8zqyrGnfyluzEA9fcOlwllnVcCt0E9amB8ss+2XRagIv4SZ7Sh NG3w0uwpN7EeHL4u2u6/z1RgJB3BxfBLBkCMk1IORG4iMsT80W7ADr4cA5EtUef6PQGf8nbb6/N P7O1H/HSdXS2mOmm4OSH+Ok8O/YAvvpalTfhFz6Nl+qJEuBknSYC+ue0Q2BTJ1qO/yTjRIOVXAr gbxX+/S5LoVOoXQeDUN219a+++vGqB1gTEyLU/MkDmT5hfQcasZcPXDXayYfkO4gk5leSLzjUeI 3aVyE/BWxYI0lTlChJLKmylAhmSuYFBArkuPDLl1lM5rSFv4FW4c1Ex8eih+2PB4cu+TKp9Xd/o JquANdUXHreDLSJ6wT8KosQQuLnPRdgXcD3eHhmmN0b5R5KYuhEzx0HR7ZxhB8xQfhJBZlt8MOr SNdnP6Q2tEI//CvlHxBenZ6gr/m7+8D3Vy0l6zfR5M2RqNByM2b+jOoGdrWO4= X-Received: by 2002:a17:90b:4b87:b0:369:c5f4:9681 with SMTP id 98e67ed59e1d1-37a041b0151mr10991409a91.22.1781421939315; Sun, 14 Jun 2026 00:25:39 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-117.dlp.protect.broadcom.com. [144.49.247.117]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-37a20cc6388sm632833a91.4.2026.06.14.00.25.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jun 2026 00:25:39 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-30761ab3483so1619116eec.0 for ; Sun, 14 Jun 2026 00:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1781421936; x=1782026736; 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; bh=oJc53CHmBNr7u6LdSssGt4eWYkQu3EOftVekG28f80A=; b=OjyvgZUlr6qfuRCfiE/NctON1yh6I6BZ5RUNsVLSGVHQ1oHLjK7HAyg0yCZdl6lpjY D5yT/tvfMLZj6vCKOmrBKH+Xh7QOcLvzDvunu8XzthDWwaBQBU5Dcvg0ebfRtPlbSq+K 8E+mDPrdcav6aTqYRmeV7RYoh2xxiJlOBw9AY= X-Received: by 2002:a05:7300:cd93:b0:2ef:9961:27fa with SMTP id 5a478bee46e88-30820054c98mr4342306eec.18.1781421936368; Sun, 14 Jun 2026 00:25:36 -0700 (PDT) X-Received: by 2002:a05:7300:cd93:b0:2ef:9961:27fa with SMTP id 5a478bee46e88-30820054c98mr4342300eec.18.1781421935648; Sun, 14 Jun 2026 00:25:35 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081ea43bc7sm10043280eec.22.2026.06.14.00.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 00:25:35 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Ajit Khaparde Subject: [PATCH net-next v3 13/15] bnxt_en: Implement kTLS TX normal path Date: Sun, 14 Jun 2026 00:24:05 -0700 Message-ID: <20260614072407.2761092-14-michael.chan@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260614072407.2761092-1-michael.chan@broadcom.com> References: <20260614072407.2761092-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Offload TLS encryption of TX packets to the hardware if the TCP sequence number is the expected one. Fall back to software encryption otherwise. Implement all the TLS TX logic to check the TCP sequence number and set up the BD in the new function bnxt_ktls_xmit(). The stored TCP sequence number is only updated when BD is in the ring and guaranteed to be transmitted. Basic kTLS statistics reporting for ethtool -S is also added. Because there can be multiple TX rings (if there are MQPRIO TCs) sharing the same bnxt_cp_ring_info containing the bnxt_sw_stats, we need to store the kTLS software TX stats in bnxt_tx_ring_info instead. The next patches will add support for the exception path with out-of-order TCP sequence number. Reviewed-by: Ajit Khaparde Reviewed-by: Pavan Chebbi Signed-off-by: Michael Chan --- v3: Use per TX ring TLS stats structures. Defer tcp sequence and stats update until the BD is on the ring. Increment the drop counter if kTLS drops the packet. v2: https://lore.kernel.org/netdev/20260512212105.3488258-14-michael.chan@broadcom.com/ --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 41 +++++++- .../net/ethernet/broadcom/bnxt/bnxt_crypto.c | 1 + .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 46 +++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 2 +- .../net/ethernet/broadcom/bnxt/bnxt_ktls.c | 93 +++++++++++++++++++ .../net/ethernet/broadcom/bnxt/bnxt_ktls.h | 61 ++++++++++++ 7 files changed, 259 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 8478589b8b99..3560ee5525fd 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -481,6 +481,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) dma_addr_t mapping; unsigned int length, pad = 0; u32 len, free_size, vlan_tag_flags, cfa_action, flags; + struct bnxt_ktls_offload_ctx_tx *kctx_tx = NULL; struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; struct pci_dev *pdev = bp->pdev; u16 prod, last_frag, txts_prod; @@ -488,6 +489,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) struct bnxt_sw_tx_bd *tx_buf; __le32 lflags = 0; skb_frag_t *frag; + u32 kid = 0; i = skb_get_queue_mapping(skb); if (unlikely(i >= bp->tx_nr_rings)) { @@ -527,6 +529,12 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_BUSY; } + skb = bnxt_ktls_xmit(bp, txr, skb, &lflags, &kid, &kctx_tx); + if (unlikely(!skb)) { + dev_core_stats_tx_dropped_inc(dev); + return NETDEV_TX_OK; + } + length = skb->len; len = skb_headlen(skb); last_frag = skb_shinfo(skb)->nr_frags; @@ -675,7 +683,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) prod = NEXT_TX(prod); txbd1 = bnxt_init_ext_bd(bp, txr, prod, lflags, vlan_tag_flags, - cfa_action); + cfa_action, kid); if (skb_is_gso(skb)) { bool udp_gso = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4); @@ -696,9 +704,10 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) txbd1->tx_bd_hsize_lflags |= cpu_to_le32(TX_BD_FLAGS_LSO | TX_BD_FLAGS_T_IPID | - (hdr_len << (TX_BD_HSIZE_SHIFT - 1))); + ((hdr_len >> 1) << TX_BD_HSIZE_SHIFT)); length = skb_shinfo(skb)->gso_size; - txbd1->tx_bd_mss = cpu_to_le32(length); + txbd1->tx_bd_kid_mss = cpu_to_le32(BNXT_TX_KID_HI(kid) | + (length & TX_BD_MSS)); length += hdr_len; } else if (skb->ip_summed == CHECKSUM_PARTIAL) { txbd1->tx_bd_hsize_lflags |= @@ -751,6 +760,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) prod = NEXT_TX(prod); WRITE_ONCE(txr->tx_prod, prod); + /* Commit the kTLS state now that the BD is in the ring. */ + bnxt_ktls_xmit_commit(txr, kctx_tx); + if (!netdev_xmit_more() || netif_xmit_stopped(txq)) { bnxt_txr_db_kick(bp, txr, prod); } else { @@ -4079,6 +4091,8 @@ static void bnxt_free_tx_rings(struct bnxt *bp) bnxt_free_tx_inline_buf(txr, pdev); + bnxt_ktls_free_tx_ring_stats(txr); + ring = &txr->tx_ring_struct; bnxt_free_ring(bp, &ring->ring_mem); @@ -4154,6 +4168,9 @@ static int bnxt_alloc_tx_rings(struct bnxt *bp) qidx = bp->tc_to_qidx[j]; ring->queue_id = bp->q_info[qidx].queue_id; spin_lock_init(&txr->tx_lock); + rc = bnxt_ktls_alloc_tx_ring_stats(bp, txr); + if (rc) + return rc; if (i < bp->tx_nr_rings_xdp) continue; if (BNXT_RING_TO_TC_OFF(bp, i) == (bp->tx_nr_rings_per_tc - 1)) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 0ca0345a0e11..4ca36b99c4a3 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -101,10 +101,18 @@ struct tx_bd_ext { #define TX_BD_FLAGS_LSO (1 << 5) #define TX_BD_FLAGS_IPID_FMT (1 << 6) #define TX_BD_FLAGS_T_IPID (1 << 7) + #define TX_BD_FLAGS_CRYPTO_EN (1 << 15) #define TX_BD_HSIZE (0xff << 16) #define TX_BD_HSIZE_SHIFT 16 - - __le32 tx_bd_mss; + #define TX_BD_KID_LO (0x7f << 25) + #define TX_BD_KID_LO_MASK 0x7f + #define TX_BD_KID_LO_SHIFT 25 + + __le32 tx_bd_kid_mss; + #define TX_BD_MSS 0x7fff + #define TX_BD_KID_HI (0x1ffff << 15) + #define TX_BD_KID_HI_MASK 0xffff80 + #define TX_BD_KID_HI_SHIFT 8 __le32 tx_bd_cfa_action; #define TX_BD_CFA_ACTION (0xffff << 16) #define TX_BD_CFA_ACTION_SHIFT 16 @@ -122,6 +130,16 @@ struct tx_bd_ext { }; #define BNXT_TX_PTP_IS_SET(lflags) ((lflags) & cpu_to_le32(TX_BD_FLAGS_STAMP)) +#define BNXT_TX_KID_LO(kid) (((kid) & TX_BD_KID_LO_MASK) << TX_BD_KID_LO_SHIFT) +#define BNXT_TX_KID_HI(kid) (((kid) & TX_BD_KID_HI_MASK) << TX_BD_KID_HI_SHIFT) + +struct tx_bd_presync { + __le32 tx_bd_len_flags_type; + #define TX_BD_TYPE_PRESYNC_TX_BD (0x09 << 0) + u32 tx_bd_opaque; + __le32 tx_bd_kid; + u32 tx_bd_unused; +}; struct rx_bd { __le32 rx_bd_len_flags_type; @@ -1024,6 +1042,9 @@ struct bnxt_tx_ring_info { struct bnxt_ring_struct tx_ring_struct; /* Synchronize simultaneous xdp_xmit on same ring or for MPC ring */ spinlock_t tx_lock; + + /* Per-TX-ring kTLS counters; allocated only when kTLS is enabled. */ + struct bnxt_tls_sw_stats *tls_stats; }; #define BNXT_LEGACY_COAL_CMPL_PARAMS \ @@ -1165,6 +1186,18 @@ struct bnxt_cmn_sw_stats { u64 missed_irqs; }; +/* Data plane kTLS counters */ +enum bnxt_ktls_data_counters { + BNXT_KTLS_TX_PKTS = 0, + BNXT_KTLS_TX_BYTES, + + BNXT_KTLS_MAX_DATA_COUNTERS, +}; + +struct bnxt_tls_sw_stats { + u64 counters[BNXT_KTLS_MAX_DATA_COUNTERS]; +}; + struct bnxt_sw_stats { struct bnxt_rx_sw_stats rx; struct bnxt_tx_sw_stats tx; @@ -2879,14 +2912,14 @@ static inline u32 bnxt_tx_avail(struct bnxt *bp, static inline struct tx_bd_ext * bnxt_init_ext_bd(struct bnxt *bp, struct bnxt_tx_ring_info *txr, u16 prod, __le32 lflags, u32 vlan_tag_flags, - u32 cfa_action) + u32 cfa_action, u32 kid) { struct tx_bd_ext *txbd1; txbd1 = (struct tx_bd_ext *) &txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; txbd1->tx_bd_hsize_lflags = lflags; - txbd1->tx_bd_mss = 0; + txbd1->tx_bd_kid_mss = cpu_to_le32(BNXT_TX_KID_HI(kid)); txbd1->tx_bd_cfa_meta = cpu_to_le32(vlan_tag_flags); txbd1->tx_bd_cfa_action = cpu_to_le32(cfa_action << TX_BD_CFA_ACTION_SHIFT); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_crypto.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_crypto.c index b82fd40d5de1..881c50ca2dcb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_crypto.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_crypto.c @@ -570,6 +570,7 @@ int bnxt_crypto_init(struct bnxt *bp) if (rc) return rc; + bnxt_ktls_init(bp); return 0; } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index c60c04c34fad..9b2bc38236d7 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -38,6 +38,7 @@ #include "bnxt_fw_hdr.h" /* Firmware hdr constant and structure defs */ #include "bnxt_coredump.h" #include "bnxt_mpc.h" +#include "bnxt_ktls.h" #define BNXT_NVM_ERR_MSG(dev, extack, msg) \ do { \ @@ -354,6 +355,26 @@ static const char *const bnxt_ring_drv_stats_arr[] = { "total_missed_irqs", }; +/* kTLS data plane counter strings indexed by enum bnxt_ktls_data_counters */ +static const char *const bnxt_ktls_data_stats[] = { + [BNXT_KTLS_TX_PKTS] = "tx_tls_encrypted_packets", + [BNXT_KTLS_TX_BYTES] = "tx_tls_encrypted_bytes", +}; + +/* kTLS control plane counter strings indexed by enum bnxt_ktls_ctrl_counters */ +static const char *const bnxt_ktls_ctrl_stats[] = { + [BNXT_KTLS_TX_ADD] = "tx_tls_ctx", + [BNXT_KTLS_TX_DEL] = "tx_tls_del", + [BNXT_KTLS_ERR_NO_MEM] = "tls_err_no_mem", + [BNXT_KTLS_ERR_NO_CAP] = "tls_err_no_cap", + [BNXT_KTLS_ERR_KEY_CTX_ALLOC] = "tls_err_key_ctx_alloc", + [BNXT_KTLS_ERR_CRYPTO_CMD] = "tls_err_crypto_cmd", + [BNXT_KTLS_ERR_DEVICE_BUSY] = "tls_err_device_busy", + [BNXT_KTLS_ERR_INVALID_CIPHER] = "tls_err_invalid_cipher", + [BNXT_KTLS_ERR_STATE_NOT_OPEN] = "tls_err_state_not_open", + [BNXT_KTLS_ERR_RETRY_EXCEEDED] = "tls_err_retry_exceeded", +}; + #define NUM_RING_RX_SW_STATS ARRAY_SIZE(bnxt_rx_sw_stats_str) #define NUM_RING_CMN_SW_STATS ARRAY_SIZE(bnxt_cmn_sw_stats_str) #define NUM_RING_RX_HW_STATS ARRAY_SIZE(bnxt_ring_rx_stats_str) @@ -536,12 +557,21 @@ static int bnxt_get_num_ring_stats(struct bnxt *bp) cmn * bp->cp_nr_rings; } +static int bnxt_get_num_ktls_stats(struct bnxt *bp) +{ + if (!bp->ktls_info) + return 0; + return ARRAY_SIZE(bnxt_ktls_ctrl_stats) + + ARRAY_SIZE(bnxt_ktls_data_stats); +} + static int bnxt_get_num_stats(struct bnxt *bp) { int num_stats = bnxt_get_num_ring_stats(bp); int len; num_stats += BNXT_NUM_RING_DRV_STATS; + num_stats += bnxt_get_num_ktls_stats(bp); if (bp->flags & BNXT_FLAG_PORT_STATS) num_stats += BNXT_NUM_PORT_STATS; @@ -653,6 +683,16 @@ static void bnxt_get_ethtool_stats(struct net_device *dev, for (i = 0; i < BNXT_NUM_RING_DRV_STATS; i++, j++, curr++, prev++) buf[j] = *curr + *prev; + if (bp->ktls_info) { + struct bnxt_tls_info *ktls = bp->ktls_info; + struct bnxt_tls_sw_stats tls_stats = {}; + + bnxt_get_ring_tls_stats(bp, &tls_stats); + for (i = 0; i < ARRAY_SIZE(bnxt_ktls_data_stats); i++, j++) + buf[j] = tls_stats.counters[i]; + for (i = 0; i < ARRAY_SIZE(bnxt_ktls_ctrl_stats); i++, j++) + buf[j] = atomic64_read(&ktls->counters[i]); + } if (bp->flags & BNXT_FLAG_PORT_STATS) { u64 *port_stats = bp->port_stats.sw_stats; @@ -763,6 +803,12 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf) for (i = 0; i < BNXT_NUM_RING_DRV_STATS; i++) ethtool_puts(&buf, bnxt_ring_drv_stats_arr[i]); + if (bp->ktls_info) { + for (i = 0; i < ARRAY_SIZE(bnxt_ktls_data_stats); i++) + ethtool_puts(&buf, bnxt_ktls_data_stats[i]); + for (i = 0; i < ARRAY_SIZE(bnxt_ktls_ctrl_stats); i++) + ethtool_puts(&buf, bnxt_ktls_ctrl_stats[i]); + } if (bp->flags & BNXT_FLAG_PORT_STATS) for (i = 0; i < BNXT_NUM_PORT_STATS; i++) { str = bnxt_port_stats_arr[i].string; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c index f317f60414e8..b4c37a6c9f0f 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c @@ -168,7 +168,7 @@ netdev_tx_t bnxt_sw_udp_gso_xmit(struct bnxt *bp, prod = NEXT_TX(prod); bnxt_init_ext_bd(bp, txr, prod, csum, - vlan_tag_flags, cfa_action); + vlan_tag_flags, cfa_action, 0); /* set dma_unmap_len on the LAST BD touching each * region. Since completions are in-order, the last segment diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c index 9f6bdfb2e9e0..298fb08e7b9b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright (c) 2026 Broadcom Inc. */ +#include #include #include @@ -337,3 +338,95 @@ int bnxt_ktls_init(struct bnxt *bp) dev->features |= NETIF_F_HW_TLS_TX; return 0; } + +static void bnxt_ktls_inc_tx_stats(struct bnxt_tx_ring_info *txr, u32 bytes) +{ + struct bnxt_tls_sw_stats *ring_stats = txr->tls_stats; + + if (!ring_stats) + return; + ring_stats->counters[BNXT_KTLS_TX_PKTS]++; + ring_stats->counters[BNXT_KTLS_TX_BYTES] += bytes; +} + +struct sk_buff *bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + struct sk_buff *skb, __le32 *lflags, u32 *kid, + struct bnxt_ktls_offload_ctx_tx **kctx_tx_p) +{ + struct bnxt_tls_info *ktls = bp->ktls_info; + struct bnxt_ktls_offload_ctx_tx *kctx_tx; + struct tls_context *tls_ctx; + u32 seq, payload_len; + + if (!IS_ENABLED(CONFIG_TLS_DEVICE) || !ktls || + !tls_is_skb_tx_device_offloaded(skb)) + return skb; + + seq = ntohl(tcp_hdr(skb)->seq); + tls_ctx = tls_get_ctx(skb->sk); + kctx_tx = bnxt_get_ktls_ctx_tx(tls_ctx); + payload_len = skb->len - skb_tcp_all_headers(skb); + if (!payload_len) + return skb; + if (kctx_tx->tcp_seq_no == seq) { + /* Stage the advance only. tcp_seq_no and the counters are + * committed by bnxt_ktls_xmit_commit() once the BD reaches the + * ring. + */ + kctx_tx->next_tcp_seq_no = seq + payload_len; + kctx_tx->pending_bytes = payload_len; + *kid = BNXT_KID_HW(kctx_tx->kid); + *kctx_tx_p = kctx_tx; + *lflags |= cpu_to_le32(TX_BD_FLAGS_CRYPTO_EN | + BNXT_TX_KID_LO(*kid)); + } else { + skb = tls_encrypt_skb(skb); + if (!skb) + return NULL; + } + return skb; +} + +void bnxt_ktls_xmit_commit(struct bnxt_tx_ring_info *txr, + struct bnxt_ktls_offload_ctx_tx *kctx_tx) +{ + if (!kctx_tx) + return; + kctx_tx->tcp_seq_no = kctx_tx->next_tcp_seq_no; + bnxt_ktls_inc_tx_stats(txr, kctx_tx->pending_bytes); +} + +int bnxt_ktls_alloc_tx_ring_stats(struct bnxt *bp, struct bnxt_tx_ring_info *txr) +{ + struct bnxt_tls_sw_stats *ring_stats; + + if (!bp->ktls_info) + return 0; + ring_stats = kzalloc_obj(*ring_stats); + if (!ring_stats) + return -ENOMEM; + txr->tls_stats = ring_stats; + return 0; +} + +void bnxt_ktls_free_tx_ring_stats(struct bnxt_tx_ring_info *txr) +{ + kfree(txr->tls_stats); + txr->tls_stats = NULL; +} + +void bnxt_get_ring_tls_stats(struct bnxt *bp, struct bnxt_tls_sw_stats *stats) +{ + struct bnxt_tls_sw_stats *ring_stats; + int i, j; + + if (!bp->ktls_info || !bp->tx_ring) + return; + for (i = 0; i < bp->tx_nr_rings; i++) { + ring_stats = bp->tx_ring[i].tls_stats; + if (!ring_stats) + continue; + for (j = 0; j < BNXT_KTLS_MAX_DATA_COUNTERS; j++) + stats->counters[j] += ring_stats->counters[j]; + } +} diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h index 5a4f39f15e80..1c935e0d413d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h @@ -4,6 +4,7 @@ #ifndef BNXT_KTLS_H #define BNXT_KTLS_H +#include #include /* Control plane counters */ @@ -78,6 +79,28 @@ struct ce_add_cmd { u8 addl_iv[8]; }; +struct crypto_prefix_cmd { + __le32 flags; + #define CRYPTO_PREFIX_CMD_FLAGS_UPDATE_IN_ORDER_VAR 0x1UL + #define CRYPTO_PREFIX_CMD_FLAGS_FULL_REPLAY_RETRAN 0x2UL + __le32 header_tcp_seq_num; + __le32 start_tcp_seq_num; + __le32 end_tcp_seq_num; + u8 explicit_nonce[8]; + u8 record_seq_num[8]; +}; + +#define CRYPTO_PREFIX_CMD_FLAGS_UPDATE_IN_ORDER_VAR_LE \ + cpu_to_le32(CRYPTO_PREFIX_CMD_FLAGS_UPDATE_IN_ORDER_VAR) + +#define CRYPTO_PREFIX_CMD_SIZE ((u32)sizeof(struct crypto_prefix_cmd)) +#define CRYPTO_PREFIX_CMD_BDS (CRYPTO_PREFIX_CMD_SIZE / sizeof(struct tx_bd)) +#define CRYPTO_PRESYNC_BDS (CRYPTO_PREFIX_CMD_BDS + 1) + +#define CRYPTO_PRESYNC_BD_CMD \ + (cpu_to_le32((CRYPTO_PREFIX_CMD_SIZE << TX_BD_LEN_SHIFT) | \ + TX_BD_CNT(CRYPTO_PRESYNC_BDS) | TX_BD_TYPE_PRESYNC_TX_BD)) + static inline bool bnxt_ktls_busy(struct bnxt *bp) { return bp->ktls_info && atomic_read(&bp->ktls_info->pending) > 0; @@ -94,6 +117,15 @@ static inline void bnxt_ktls_wake(struct bnxt *bp) int bnxt_alloc_ktls_info(struct bnxt *bp); void bnxt_free_ktls_info(struct bnxt *bp); int bnxt_ktls_init(struct bnxt *bp); +struct sk_buff *bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + struct sk_buff *skb, __le32 *lflags, u32 *kid, + struct bnxt_ktls_offload_ctx_tx **kctx_tx_p); +void bnxt_ktls_xmit_commit(struct bnxt_tx_ring_info *txr, + struct bnxt_ktls_offload_ctx_tx *kctx_tx); +int bnxt_ktls_alloc_tx_ring_stats(struct bnxt *bp, + struct bnxt_tx_ring_info *txr); +void bnxt_ktls_free_tx_ring_stats(struct bnxt_tx_ring_info *txr); +void bnxt_get_ring_tls_stats(struct bnxt *bp, struct bnxt_tls_sw_stats *stats); #else static inline int bnxt_alloc_ktls_info(struct bnxt *bp) { @@ -108,5 +140,34 @@ static inline int bnxt_ktls_init(struct bnxt *bp) { return -EOPNOTSUPP; } + +static inline struct sk_buff * +bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + struct sk_buff *skb, __le32 *lflags, u32 *kid, + struct bnxt_ktls_offload_ctx_tx **kctx_tx_p) +{ + return skb; +} + +static inline void +bnxt_ktls_xmit_commit(struct bnxt_tx_ring_info *txr, + struct bnxt_ktls_offload_ctx_tx *kctx_tx) +{ +} + +static inline int bnxt_ktls_alloc_tx_ring_stats(struct bnxt *bp, + struct bnxt_tx_ring_info *txr) +{ + return 0; +} + +static inline void bnxt_ktls_free_tx_ring_stats(struct bnxt_tx_ring_info *txr) +{ +} + +static inline void bnxt_get_ring_tls_stats(struct bnxt *bp, + struct bnxt_tls_sw_stats *stats) +{ +} #endif /* CONFIG_BNXT_TLS */ #endif /* BNXT_KTLS_H */ -- 2.51.0