All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rohit Maheshwari <rohitm@chelsio.com>
To: kuba@kernel.org, netdev@vger.kernel.org, davem@davemloft.net
Cc: secdev@chelsio.com, Rohit Maheshwari <rohitm@chelsio.com>
Subject: [net v6 08/12] ch_ktls: packet handling prior to start marker
Date: Mon,  9 Nov 2020 16:21:38 +0530	[thread overview]
Message-ID: <20201109105142.15398-9-rohitm@chelsio.com> (raw)
In-Reply-To: <20201109105142.15398-1-rohitm@chelsio.com>

There could be a case where ACK for tls exchanges prior to start
marker is missed out, and by the time tls is offloaded. This pkt
should not be discarded and handled carefully. It could be
plaintext alone or plaintext + finish as well.

Fixes: 5a4b9fe7fece ("cxgb4/chcr: complete record tx handling")
Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com>
---
 .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
index 026c66599d1e..bbda71b7f98b 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
@@ -1909,11 +1909,6 @@ static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev)
 			goto out;
 		}
 
-		if (unlikely(tls_record_is_start_marker(record))) {
-			spin_unlock_irqrestore(&tx_ctx->base.lock, flags);
-			atomic64_inc(&port_stats->ktls_tx_skip_no_sync_data);
-			goto out;
-		}
 		tls_end_offset = record->end_seq - tcp_seq;
 
 		pr_debug("seq 0x%x, end_seq 0x%x prev_seq 0x%x, datalen 0x%x\n",
@@ -1938,6 +1933,39 @@ static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev)
 				goto out;
 			}
 		}
+
+		if (unlikely(tls_record_is_start_marker(record))) {
+			atomic64_inc(&port_stats->ktls_tx_skip_no_sync_data);
+			/* If tls_end_offset < data_len, means there is some
+			 * data after start marker, which needs encryption, send
+			 * plaintext first and take skb refcount. else send out
+			 * complete pkt as plaintext.
+			 */
+			if (tls_end_offset < data_len)
+				skb_get(skb);
+			else
+				tls_end_offset = data_len;
+
+			ret = chcr_ktls_tx_plaintxt(tx_info, skb, tcp_seq, mss,
+						    (!th->fin && th->psh), q,
+						    tx_info->port_id, NULL,
+						    tls_end_offset, skb_offset,
+						    0);
+
+			spin_unlock_irqrestore(&tx_ctx->base.lock, flags);
+			if (ret) {
+				/* free the refcount taken earlier */
+				if (tls_end_offset < data_len)
+					dev_kfree_skb_any(skb);
+				goto out;
+			}
+
+			data_len -= tls_end_offset;
+			tcp_seq = record->end_seq;
+			skb_offset += tls_end_offset;
+			continue;
+		}
+
 		/* increase page reference count of the record, so that there
 		 * won't be any chance of page free in middle if in case stack
 		 * receives ACK and try to delete the record.
-- 
2.18.1


  parent reply	other threads:[~2020-11-09 10:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-09 10:51 [net v6 00/12] cxgb4/ch_ktls: Fixes in nic tls code Rohit Maheshwari
2020-11-09 10:51 ` [net v6 01/12] cxgb4/ch_ktls: decrypted bit is not enough Rohit Maheshwari
2020-11-09 10:51 ` [net v6 02/12] ch_ktls: Correction in finding correct length Rohit Maheshwari
2020-11-09 10:51 ` [net v6 03/12] ch_ktls: Update cheksum information Rohit Maheshwari
2020-11-09 10:51 ` [net v6 04/12] cxgb4/ch_ktls: creating skbs causes panic Rohit Maheshwari
2020-11-09 10:51 ` [net v6 05/12] ch_ktls: Correction in trimmed_len calculation Rohit Maheshwari
2020-11-09 10:51 ` [net v6 06/12] ch_ktls: missing handling of header alone Rohit Maheshwari
2020-11-09 10:51 ` [net v6 07/12] ch_ktls: Correction in middle record handling Rohit Maheshwari
2020-11-09 10:51 ` Rohit Maheshwari [this message]
2020-11-09 10:51 ` [net v6 09/12] ch_ktls: don't free skb before sending FIN Rohit Maheshwari
2020-11-09 10:51 ` [net v6 10/12] ch_ktls/cxgb4: handle partial tag alone SKBs Rohit Maheshwari
2020-11-09 10:51 ` [net v6 11/12] ch_ktls: tcb update fails sometimes Rohit Maheshwari
2020-11-09 10:51 ` [net v6 12/12] ch_ktls: stop the txq if reaches threshold Rohit Maheshwari
2020-11-12  0:37 ` [net v6 00/12] cxgb4/ch_ktls: Fixes in nic tls code Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201109105142.15398-9-rohitm@chelsio.com \
    --to=rohitm@chelsio.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=secdev@chelsio.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.