From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f100.google.com (mail-vs1-f100.google.com [209.85.217.100]) (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 CBD09425CC4 for ; Mon, 29 Jun 2026 18:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.100 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782759038; cv=none; b=j02+pmCK43ZRXPIr8uMOf10zg+0yxgdQ+0hvMl+n9EX7fu5P3X7/Goayo2mLYXziCxcGjzmqt4EQZrX6I1fHFYkberUEr5fbvPNr9MVPAyAS6mTt1WHu5xBnZzIrvKltSSvMJTn2xZ9W8ozdNXH9l+bX9gPb7L+gBBRUWgsz1us= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782759038; c=relaxed/simple; bh=qzQQxtl+x0gGFJDVeUnlThQ86M4F9lv+bWxPgxbWpNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K0gp0mCuQJTQjIz8QyeQlCZ0tzdUFMff2roeUs06awewpHlDBd60UM9QV1zx9ZT+brClg7hENoHHbsGRJWEXNB0Fr0boIsa436Y65lkGKQalfN4Jd0KJFFn+OmRXuCUDHUI7JQ7vh4OXKe8LJ7qROG/a2Dx77e5fD+sDdYLGW0g= 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=PjksqbNS; arc=none smtp.client-ip=209.85.217.100 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="PjksqbNS" Received: by mail-vs1-f100.google.com with SMTP id ada2fe7eead31-73503bd83b0so1954992137.0 for ; Mon, 29 Jun 2026 11:50:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782759036; x=1783363836; 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=p52iDEo1Bp3ry7Gy19jMGwGCElBboHcrC3e56THkuWw=; b=r437gyKMKkjhawzCXeexbk1336Ur/AhQJ3tXLJ53Y1CR5UgVvFwvJxXN8G7zKGMr7d Qp90mGrC5wW+9YKgq74gbieX7VXtVEgylo6rjTDZak3QwvQIsFQxaAUMM0qZnN0x8oI6 qWKPDI21inuPUQDdwlX2M3qaIi8MkqzhciLrFI7qXeuYrz1KVsuf7rtdXB7T1JmvxvOt TC0G5sNb23czo6umMe3lts0zBtFT4q79HeaZxVFYIeFqF7s2NfS/mY0bslkpwWEZSVbf QN5b72H6KvfIfG4vS7xlBZhOob04iCBNKwzdoK5536t9t7NRm/4CnxdXvsUPxxgVoUud 3BoQ== X-Gm-Message-State: AOJu0YwnGjmumYhrwElGQ9Nl2b5x2OBhsFfvV2EAX9WinV7ar22fldbl JXExThn06WBdEXvri+tu+h+qHXd8wQqSWs80Hpxort3862e5oaa5dj2yUfzEqNoOjgOZYmXJ3jn zyUmy1BCxGun00vi2rep92dJs4Kv9RfERggXhCpME1AQKs0q9R0IWRGXe3HRAbSYcgdmXM261uw +xznmaCNzu2HEiOA8hLsZWd91ZiQpspO0DGYEkSKlzFDHqDTGJxytZtARLsGahzZ0rqZEsRuVZT EczPJzLdp0= X-Gm-Gg: AfdE7cnokblAkEAHv8VwswB+zfJulX5tTJ0ZV5Fo0T14whupuT4qiVEoaVt5RedcYkB 5rfzccNKPeoCbXwpnvg1BpmiWqSnee45jJORnxqpgq3qKuDwIktcQtu6MrKsXdx0izk6LKPU+Gr IzUH/ZhjsBwsEJ405Gohe0Ol7Mj5EB+lH2guGiTX+D09pSrLp2KQvS3G/QdYE3t+0KvfBvaaw29 pC6GCEAbV9tCGxpjaNrTO2XXbHyYy7CLegRoPMvgB7wY5R1xaNtVhVPKywcKzxnJDyGzYp1KxDV 3RsRpqQLWK5Jwr8H6oM4Jr6o+Q/wcB62cO9+TKXzVqCOKj91y9q77uQ9sMHTPKMLaO9w/gh2psU Og4My6x9e9hHlwIi9HCIxbLLhrZh2fgqA54j4f9KGB3B6aJG+W1nyZJUA2PFwd0FdvjXe9Tvf7x Z+V89/Q9mDrW64tXAUhyDx7a/MHIRSuWSh38AXPv4HFG+DCA== X-Received: by 2002:a05:6102:c51:b0:632:29a5:2b28 with SMTP id ada2fe7eead31-73a365eae22mr675927137.6.1782759035694; Mon, 29 Jun 2026 11:50:35 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-25.dlp.protect.broadcom.com. [144.49.247.25]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-737aad87ea5sm548593137.10.2026.06.29.11.50.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2026 11:50:35 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51bf25c2c8bso39820151cf.3 for ; Mon, 29 Jun 2026 11:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1782759034; x=1783363834; 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=p52iDEo1Bp3ry7Gy19jMGwGCElBboHcrC3e56THkuWw=; b=PjksqbNSH/nWodENSoShkesSptUoCwXCtrlIJa7iPgJ+s4ys6DFqUBQOAV002pMyhp ttmp1fjiM+SMBeaLd/VLfPoBNlY1rlC4MMj6kjEuQMIgPNOlSru1hJbKet2mqnVlXHHx 61PKCNnGBTI24Zy2M3dh0rU6fInnNPrn/TWUI= X-Received: by 2002:a05:622a:588a:b0:51c:f04:4aa9 with SMTP id d75a77b69052e-51c10796ca4mr8535561cf.32.1782759034145; Mon, 29 Jun 2026 11:50:34 -0700 (PDT) X-Received: by 2002:a05:622a:588a:b0:51c:f04:4aa9 with SMTP id d75a77b69052e-51c10796ca4mr8534931cf.32.1782759033446; Mon, 29 Jun 2026 11:50:33 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51c109ffbb3sm2176341cf.23.2026.06.29.11.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 11:50:32 -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 Subject: [PATCH net-next v4 15/15] bnxt_en: Add kTLS retransmission support Date: Mon, 29 Jun 2026 11:49:21 -0700 Message-ID: <20260629184921.3496727-16-michael.chan@broadcom.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260629184921.3496727-1-michael.chan@broadcom.com> References: <20260629184921.3496727-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 If TCP retransmits a TLS packet that requires encryption by the NIC, the TCP sequence number will go backwards and the hardware will require some assistance from the driver. The driver needs to retrieve the TLS record that covers the byte sequence of the retransmitted packet. If the retransmitted packet does not include the tag, the hardware can simply encrypt the packet using the informtaion in the TLS record. The driver provides the TLS record information for the retransmitted packet in the presync TX BD. The presync TX BD introduced in the last patch is treated very much like a TX push BD with inline data. The only exception is that no SKB will be stored for the presync TX BD. Retransmission that includes the TLS tag will be handled in future patches. Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- v3: Unwind the TX ring properly if the TLS packet cannot be sent. Improve the OOO TLS counters. Fix endianness of the record sequence number. Check valid return address from skb_frag_address_safe(). v2: https://lore.kernel.org/netdev/20260512212105.3488258-16-michael.chan@broadcom.com/ --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 14 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 + .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 + .../net/ethernet/broadcom/bnxt/bnxt_ktls.c | 152 +++++++++++++++++- .../net/ethernet/broadcom/bnxt/bnxt_ktls.h | 2 + 5 files changed, 167 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index ad6c8644e09c..baca7ee318fb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -482,9 +482,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) unsigned int length, pad = 0; u32 len, free_size, vlan_tag_flags, cfa_action, flags; struct bnxt_ktls_offload_ctx_tx *kctx_tx = NULL; + u16 prod, start_prod, last_frag, txts_prod; struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; struct pci_dev *pdev = bp->pdev; - u16 prod, last_frag, txts_prod; struct bnxt_tx_ring_info *txr; struct bnxt_sw_tx_bd *tx_buf; __le32 lflags = 0; @@ -500,7 +500,6 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) txq = netdev_get_tx_queue(dev, i); txr = &bp->tx_ring[bp->tx_ring_map[i]]; - prod = txr->tx_prod; #if (MAX_SKB_FRAGS > TX_MAX_FRAGS) if (skb_shinfo(skb)->nr_frags > TX_MAX_FRAGS) { @@ -529,12 +528,14 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_BUSY; } + start_prod = txr->tx_prod; 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; } + prod = txr->tx_prod; length = skb->len; len = skb_headlen(skb); last_frag = skb_shinfo(skb)->nr_frags; @@ -817,9 +818,16 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) /* set SKB to err so PTP worker will clean up */ ptp->txts_req[txts_prod].tx_skb = ERR_PTR(-EIO); } + txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].skb = NULL; + /* Unwind any kTLS presync BDs */ + if (unlikely(txr->tx_prod != start_prod)) { + tx_buf = &txr->tx_buf_ring[RING_TX(bp, start_prod)]; + tx_buf->is_push = 0; + tx_buf->inline_data_bds = 0; + WRITE_ONCE(txr->tx_prod, start_prod); + } if (txr->kick_pending) bnxt_txr_db_kick(bp, txr, txr->tx_prod); - txr->tx_buf_ring[RING_TX(bp, txr->tx_prod)].skb = NULL; dev_core_stats_tx_dropped_inc(dev); return NETDEV_TX_OK; } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 1a34e334bc18..19ffbb2cc6b1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1192,6 +1192,10 @@ struct bnxt_cmn_sw_stats { enum bnxt_ktls_data_counters { BNXT_KTLS_TX_PKTS = 0, BNXT_KTLS_TX_BYTES, + BNXT_KTLS_TX_OOO_PKTS, + BNXT_KTLS_TX_OOO_FALLBACK_NO_SYNC, + BNXT_KTLS_TX_OOO_FALLBACK_NO_SPACE, + BNXT_KTLS_TX_OOO_FALLBACK_NO_HDR, BNXT_KTLS_MAX_DATA_COUNTERS, }; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 47c02baa723b..96083caa834c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -359,6 +359,10 @@ static const char *const bnxt_ring_drv_stats_arr[] = { static const char *const bnxt_ktls_data_stats[] = { [BNXT_KTLS_TX_PKTS] = "tx_tls_encrypted_packets", [BNXT_KTLS_TX_BYTES] = "tx_tls_encrypted_bytes", + [BNXT_KTLS_TX_OOO_PKTS] = "tx_tls_ooo_packets", + [BNXT_KTLS_TX_OOO_FALLBACK_NO_SYNC] = "tx_tls_ooo_fallback_no_sync", + [BNXT_KTLS_TX_OOO_FALLBACK_NO_SPACE] = "tx_tls_ooo_fallback_no_space", + [BNXT_KTLS_TX_OOO_FALLBACK_NO_HDR] = "tx_tls_ooo_fallback_no_hdr", }; /* kTLS control plane counter strings indexed by enum bnxt_ktls_ctrl_counters */ diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c index 5683624ac19f..b47075f2b379 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.c @@ -339,7 +339,8 @@ int bnxt_ktls_init(struct bnxt *bp) return 0; } -static void bnxt_ktls_inc_tx_stats(struct bnxt_tx_ring_info *txr, u32 bytes) +static void bnxt_ktls_inc_tx_stats(struct bnxt_tx_ring_info *txr, u32 bytes, + bool ooo) { struct bnxt_tls_sw_stats *ring_stats = txr->tls_stats; @@ -347,6 +348,128 @@ static void bnxt_ktls_inc_tx_stats(struct bnxt_tx_ring_info *txr, u32 bytes) return; ring_stats->counters[BNXT_KTLS_TX_PKTS]++; ring_stats->counters[BNXT_KTLS_TX_BYTES] += bytes; + if (ooo) + ring_stats->counters[BNXT_KTLS_TX_OOO_PKTS]++; +} + +static void bnxt_ktls_pre_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + u32 kid, struct crypto_prefix_cmd *pre_cmd) +{ + struct bnxt_sw_tx_bd *tx_buf; + struct tx_bd_presync *psbd; + u32 bd_space, space; + u8 *pcmd; + u16 prod; + + prod = txr->tx_prod; + tx_buf = &txr->tx_buf_ring[RING_TX(bp, prod)]; + + psbd = (void *)&txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + psbd->tx_bd_len_flags_type = CRYPTO_PRESYNC_BD_CMD; + psbd->tx_bd_kid = cpu_to_le32(BNXT_KID_HW(kid)); + psbd->tx_bd_opaque = + SET_TX_OPAQUE(bp, txr, prod, CRYPTO_PREFIX_CMD_BDS + 1); + + prod = NEXT_TX(prod); + pcmd = (void *)&txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + bd_space = TX_DESC_CNT - TX_IDX(prod); + space = bd_space * sizeof(struct tx_bd); + if (space >= CRYPTO_PREFIX_CMD_SIZE) { + memcpy(pcmd, pre_cmd, CRYPTO_PREFIX_CMD_SIZE); + prod += CRYPTO_PREFIX_CMD_BDS; + } else { + memcpy(pcmd, pre_cmd, space); + prod += bd_space; + pcmd = (void *)&txr->tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)]; + memcpy(pcmd, (u8 *)pre_cmd + space, + CRYPTO_PREFIX_CMD_SIZE - space); + prod += CRYPTO_PREFIX_CMD_BDS - bd_space; + } + txr->tx_prod = prod; + tx_buf->is_push = 1; + /* Minus 1 since the header psbd is a single entry short BD */ + tx_buf->inline_data_bds = CRYPTO_PREFIX_CMD_BDS - 1; +} + +static int bnxt_ktls_tx_ooo(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + struct sk_buff *skb, u32 payload_len, u32 seq, + struct tls_context *tls_ctx) +{ + struct bnxt_tls_sw_stats *ring_stats = txr->tls_stats; + struct tls_offload_context_tx *tx_tls_ctx; + struct bnxt_ktls_offload_ctx_tx *kctx_tx; + u32 hdr_tcp_seq, end_seq, total_bds; + struct crypto_prefix_cmd pcmd = {}; + struct tls_record_info *record; + unsigned long flags; + bool fwd = false; + __le64 le_rec_sn; + u64 rec_sn; + u8 *hdr; + int rc; + + tx_tls_ctx = tls_offload_ctx_tx(tls_ctx); + kctx_tx = bnxt_get_ktls_ctx_tx(tls_ctx); + end_seq = seq + skb->len - skb_tcp_all_headers(skb); + if (unlikely(after(seq, kctx_tx->tcp_seq_no) || + after(end_seq, kctx_tx->tcp_seq_no))) { + fwd = true; + pcmd.flags = CRYPTO_PREFIX_CMD_FLAGS_UPDATE_IN_ORDER_VAR_LE; + } + + spin_lock_irqsave(&tx_tls_ctx->lock, flags); + record = tls_get_record(tx_tls_ctx, seq, &rec_sn); + if (!record || !record->num_frags) { + rc = -EPROTO; + ring_stats->counters[BNXT_KTLS_TX_OOO_FALLBACK_NO_SYNC]++; + goto unlock_exit; + } + hdr_tcp_seq = tls_record_start_seq(record); + hdr = skb_frag_address_safe(&record->frags[0]); + + total_bds = CRYPTO_PRESYNC_BDS + skb_shinfo(skb)->nr_frags + 2; + if (bnxt_tx_avail(bp, txr) < total_bds) { + rc = -ENOSPC; + ring_stats->counters[BNXT_KTLS_TX_OOO_FALLBACK_NO_SPACE]++; + goto unlock_exit; + } + + if (before(record->end_seq - tls_ctx->prot_info.tag_size, + seq + payload_len)) { + /* retransmission includes tag bytes */ + rc = -EOPNOTSUPP; + goto unlock_exit; + } + pcmd.header_tcp_seq_num = cpu_to_le32(hdr_tcp_seq); + pcmd.start_tcp_seq_num = cpu_to_le32(seq); + pcmd.end_tcp_seq_num = cpu_to_le32(seq + payload_len - 1); + if (tls_ctx->prot_info.version == TLS_1_2_VERSION) { + u32 nonce_bytes = tls_ctx->prot_info.iv_size; + u32 retrans_off = seq - hdr_tcp_seq; + + if (!hdr) { + rc = -ENOBUFS; + ring_stats->counters[BNXT_KTLS_TX_OOO_FALLBACK_NO_HDR]++; + goto unlock_exit; + } + if (retrans_off > 5 && retrans_off < 5 + nonce_bytes) + nonce_bytes = retrans_off - 5; + memcpy(pcmd.explicit_nonce, hdr + 5, nonce_bytes); + } + le_rec_sn = cpu_to_le64(rec_sn); + memcpy(&pcmd.record_seq_num[0], &le_rec_sn, sizeof(le_rec_sn)); + + rc = 0; + bnxt_ktls_pre_xmit(bp, txr, kctx_tx->kid, &pcmd); + + if (fwd) { + kctx_tx->next_tcp_seq_no = end_seq; + kctx_tx->pending_fwd = 1; + } + +unlock_exit: + spin_unlock_irqrestore(&tx_tls_ctx->lock, flags); + return rc; } struct sk_buff *bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, @@ -357,6 +480,7 @@ struct sk_buff *bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, struct bnxt_ktls_offload_ctx_tx *kctx_tx; struct tls_context *tls_ctx; u32 seq, payload_len; + int rc; if (!IS_ENABLED(CONFIG_TLS_DEVICE) || !ktls || !tls_is_skb_tx_device_offloaded(skb)) @@ -375,14 +499,25 @@ struct sk_buff *bnxt_ktls_xmit(struct bnxt *bp, struct bnxt_tx_ring_info *txr, */ kctx_tx->next_tcp_seq_no = seq + payload_len; kctx_tx->pending_bytes = payload_len; + kctx_tx->pending_ooo = 0; + kctx_tx->pending_fwd = 1; *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; + kctx_tx->pending_fwd = 0; + rc = bnxt_ktls_tx_ooo(bp, txr, skb, payload_len, seq, tls_ctx); + if (rc) + return tls_encrypt_skb(skb); + + kctx_tx->pending_bytes = payload_len; + kctx_tx->pending_ooo = 1; + *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)); + return skb; } return skb; } @@ -392,8 +527,13 @@ void bnxt_ktls_xmit_commit(struct bnxt_tx_ring_info *txr, { 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); + if (kctx_tx->pending_fwd) + kctx_tx->tcp_seq_no = kctx_tx->next_tcp_seq_no; + bnxt_ktls_inc_tx_stats(txr, kctx_tx->pending_bytes, + kctx_tx->pending_ooo); + kctx_tx->pending_bytes = 0; + kctx_tx->pending_fwd = 0; + kctx_tx->pending_ooo = 0; } int bnxt_ktls_alloc_tx_ring_stats(struct bnxt *bp, struct bnxt_tx_ring_info *txr) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h index 1c935e0d413d..40b94bbf5a38 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ktls.h @@ -43,6 +43,8 @@ struct bnxt_ktls_offload_ctx_tx { u32 next_tcp_seq_no;/* staged tcp seq no */ u32 kid; u32 pending_bytes; /* staged payload bytes */ + u32 pending_fwd:1; + u32 pending_ooo:1; }; struct bnxt_ktls_tx_driver_state { -- 2.51.0