net/tls: use version from prot
authorJakub Kicinski <jakub.kicinski@netronome.com>
Mon, 3 Jun 2019 22:17:03 +0000 (15:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Jun 2019 21:33:50 +0000 (14:33 -0700)
ctx->prot holds the same information as per-direction contexts.
Almost all code gets TLS version from this structure, convert
the last two stragglers, this way we can improve the cache
utilization by moving the per-direction data into cold cache lines.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tls/tls_device.c

index bb9d229832cc21f5794b776ffac5c42c00ffc8d9..8ffc8f95f55f674c6aeeb2bc857e7eacf405cbcd 100644 (file)
@@ -252,7 +252,7 @@ static int tls_push_record(struct sock *sk,
                         skb_frag_address(frag),
                         record->len - prot->prepend_size,
                         record_type,
-                        ctx->crypto_send.info.version);
+                        prot->version);
 
        /* HW doesn't care about the data in the tag, because it fills it. */
        dummy_tag_frag.page = skb_frag_page(frag);
@@ -264,7 +264,7 @@ static int tls_push_record(struct sock *sk,
        list_add_tail(&record->list, &offload_ctx->records_list);
        spin_unlock_irq(&offload_ctx->lock);
        offload_ctx->open_record = NULL;
-       tls_advance_record_sn(sk, &ctx->tx, ctx->crypto_send.info.version);
+       tls_advance_record_sn(sk, &ctx->tx, prot->version);
 
        for (i = 0; i < record->num_frags; i++) {
                frag = &record->frags[i];