Skip to contentSkip to conversation

ipsec: fix NAT-T length calculation

PATCH Superseded Xiao Liang 5 participants 16 messages Apr 18, 2023 – Jul 11, 2023

lore
Share & tools
lore

Xiao Liang

author
#0 lore raw

PATCH 1/1 ipsec: fix NAT-T length calculation

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
 lib/ipsec/esp_outb.c | 2 +-
 lib/ipsec/sa.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
 			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
 		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));
 	}
 
 	/* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)
 
 	/* update l2_len and l3_len fields for outbound mbuf */
 	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
 	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
 }
Signature · 1 line
2.40.0
#1 lore raw

Hi Konstantin,
Can you review this patch?

Quoted 41 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
 lib/ipsec/esp_outb.c | 2 +-
 lib/ipsec/sa.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
 		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
 			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
 		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));
 	}
 
lib/ipsec/esp_outb.c +0 -0
 	/* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
 	/* update l2_len and l3_len fields for outbound mbuf */
 	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
 	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);

}
--
2.40.0

#2 lore raw

Hi Akhil,

Quoted 15 lines

Hi Konstantin,
Can you review this patch?

Quoted 11 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
 lib/ipsec/esp_outb.c | 2 +-
 lib/ipsec/sa.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 11 lines

lib/ipsec/esp_outb.c outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, · line 202

Quoted 11 lines
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
 		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
 			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
 		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));

To be honest, it is not clear to me why we shouldn't take into account sa->hdr_l3_off
any more.
Probably the author can explain.
Also would like author of NAT-T support to chime in.
Radu, any comments on that patch?
Thanks
Konstantin

Quoted 19 lines
Quoted 19 lines
lib/ipsec/esp_outb.c +0 -0
 	}
 
lib/ipsec/esp_outb.c +0 -0
 	/* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
 	/* update l2_len and l3_len fields for outbound mbuf */
 	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
 	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);

}
--
2.40.0

#3 lore raw
Quoted 16 lines · Konstantin Ananyev

Hi Akhil,

Quoted 14 lines

Hi Konstantin,
Can you review this patch?

Quoted 11 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
  lib/ipsec/esp_outb.c | 2 +-
  lib/ipsec/sa.c       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 16 lines
Quoted 11 lines

lib/ipsec/esp_outb.c outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, · line 202

Quoted 11 lines
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
  		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
  			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
  		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));

To be honest, it is not clear to me why we shouldn't take into account sa->hdr_l3_off
any more.
Probably the author can explain.
Also would like author of NAT-T support to chime in.
Radu, any comments on that patch?

I agree, hdr_l3_off should not be ignored. Also sa->hdr_len already includes the size of UDP header, see line 366 in esp_outb_tun_init in sa.c (or the line above this change, where the udph pointer is computed assuming this)

Quoted 22 lines

Thanks
Konstantin

Quoted 19 lines
Quoted 19 lines
lib/ipsec/esp_outb.c +0 -0
  	}
 

/* update original and new ip header fields */

lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
  	/* update l2_len and l3_len fields for outbound mbuf */
  	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
  	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);

}
--
2.40.0

author
#4 lore raw

Well, let me explain.

Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
lib/ipsec/esp_outb.c +0 -0
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
            struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
                    (ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
Quoted 8 lines
Quoted 3 lines

lib/ipsec/esp_outb.c outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, · line 201

Quoted 3 lines
lib/ipsec/esp_outb.c +1 -1
            udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-                           sa->hdr_l3_off - sa->hdr_len);
+                           sa->hdr_len + sizeof(struct rte_udp_hdr));

To be honest, it is not clear to me why we shouldn't take into account sa->hdr_l3_off
any more.
Probably the author can explain.
Also would like author of NAT-T support to chime in.
Radu, any comments on that patch?

Quoted 4 lines

I agree, hdr_l3_off should not be ignored. Also sa->hdr_len already includes the size of UDP header, see line 366 in esp_outb_tun_init in sa.c (or the line above this change, where the udph pointer is computed assuming this)

A few lines above, there is:

    ph = rte_pktmbuf_prepend(mb, hlen - l2len);

The L2 header is already pulled from the packet, then the packet length has nothing to do with hdr_l3_off from this point, so use encap header length instead.
You are right sa->hdr_len already includes the size of UDP header, and that's why it should be added back here.

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
lib/ipsec/esp_outb.c +0 -0
    }
 
    /* update original and new ip header fields */
lib/ipsec/sa.c +0 -0
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
lib/ipsec/sa.c +1 -1
    /* update l2_len and l3_len fields for outbound mbuf */
    sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-           sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+           prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
    esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
  }

Again sa->hdr_len includes UDP header, which is not part of L3, so use the original prm->tun.hdr_len.

Thanks,
Xiao Liang

author
#5 lore raw
In reply to Radu Nicolau
|<-           mb->pkt_len - sqh_len                   ->|
|<-            sa->hdr_len            ->|
|<- sa->hdr_l3_off ->|            |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
|<-      prm->tun.hdr_len       ->|
|<-            sa->hdr_len            ->|

The figure above shows how

    udph->dgram_len = mb->pkt_len - sqh_len - sa->hdr_len +
sizeof(struct rte_udp_hdr);
and
    l3_len = prm->tun.hdr_len - sa->hdr_l3_off;

Correct me if anything wrong.

Thanks,
Xiao Liang

Quoted 61 lines · Radu Nicolau
Quoted 16 lines · Konstantin Ananyev

Hi Akhil,

Quoted 14 lines

Hi Konstantin,
Can you review this patch?

Quoted 11 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
  lib/ipsec/esp_outb.c | 2 +-
  lib/ipsec/sa.c       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 16 lines
Quoted 11 lines

lib/ipsec/esp_outb.c outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, · line 202

Quoted 11 lines
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
            struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
                    (ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
            udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-                           sa->hdr_l3_off - sa->hdr_len);
+                           sa->hdr_len + sizeof(struct rte_udp_hdr));

To be honest, it is not clear to me why we shouldn't take into account sa->hdr_l3_off
any more.
Probably the author can explain.
Also would like author of NAT-T support to chime in.
Radu, any comments on that patch?

I agree, hdr_l3_off should not be ignored. Also sa->hdr_len already includes the size of UDP header, see line 366 in esp_outb_tun_init in sa.c (or the line above this change, where the udph pointer is computed assuming this)

Quoted 22 lines

Thanks
Konstantin

Quoted 19 lines
Quoted 19 lines
lib/ipsec/esp_outb.c +0 -0
    }
 
    /* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
    /* update l2_len and l3_len fields for outbound mbuf */
    sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-           sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+           prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
    esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);

}
--
2.40.0

#6 lore raw
Quoted 11 lines · Xiao Liang
|<-           mb->pkt_len - sqh_len                   ->|
|<-            sa->hdr_len            ->|
|<- sa->hdr_l3_off ->|            |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
|<-      prm->tun.hdr_len       ->|
|<-            sa->hdr_len            ->|

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

Quoted 76 lines

The figure above shows how

     udph->dgram_len = mb->pkt_len - sqh_len - sa->hdr_len +
sizeof(struct rte_udp_hdr);
and
     l3_len = prm->tun.hdr_len - sa->hdr_l3_off;

Correct me if anything wrong.

Thanks,
Xiao Liang

Quoted 60 lines · Radu Nicolau
Quoted 16 lines · Konstantin Ananyev

Hi Akhil,

Quoted 14 lines

Hi Konstantin,
Can you review this patch?

Quoted 11 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
   lib/ipsec/esp_outb.c | 2 +-
   lib/ipsec/sa.c       | 2 +-
   2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 16 lines
Quoted 11 lines

lib/ipsec/esp_outb.c outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, · line 202

Quoted 11 lines
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa,
 rte_be64_t sqc,
             struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
                     (ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
             udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-                           sa->hdr_l3_off - sa->hdr_len);
+                           sa->hdr_len + sizeof(struct rte_udp_hdr));

To be honest, it is not clear to me why we shouldn't take into account sa->hdr_l3_off
any more.
Probably the author can explain.
Also would like author of NAT-T support to chime in.
Radu, any comments on that patch?

I agree, hdr_l3_off should not be ignored. Also sa->hdr_len already includes the size of UDP header, see line 366 in esp_outb_tun_init in sa.c (or the line above this change, where the udph pointer is computed assuming this)

Quoted 22 lines

Thanks
Konstantin

Quoted 19 lines
Quoted 19 lines
lib/ipsec/esp_outb.c +0 -0
     }
 
     /* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct
 rte_ipsec_sa_prm *prm)
 
     /* update l2_len and l3_len fields for outbound mbuf */
     sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-           sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+           prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
     esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
   }

--
2.40.0

author
#7 lore raw
Quoted 8 lines

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

|<-           mb->pkt_len - sqh_len                   ->|
|<- sa->hdr_l3_off ->|<- sa->hdr_len ->|
                                  |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
                     |<- sa->hdr_len  ->|

If hdr_len doesn't include L2 length, I would agree that

    dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len +

sizeof(struct rte_udp_hdr)

But then what's the point of

    sa->hdr_len - sa->hdr_l3_off

in lib/ipsec/sa.c?

author
#8 lore raw

The context

    hlen = sa->hdr_len + sa->iv_len + sizeof(*esph);
    ...
    ph = rte_pktmbuf_prepend(mb, hlen - l2len);
    ...
    update_tun_outb_l3hdr(sa, ph + sa->hdr_l3_off, ph + hlen,
        mb->pkt_len - sqh_len, sa->hdr_l3_off, sqn_low16(sqc));

assumes L2 header length included in sa->hdr_len.

Even if hdr_len doesn't include L2, then mb->pkt_len won't either, so UDP datagram length should still be

    mb->pkt_len - sqh_len - sa->hdr_len + sizeof(struct rte_udp_hdr);
Quoted 29 lines · Xiao Liang
Quoted 9 lines

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

|<-           mb->pkt_len - sqh_len                   ->|
|<- sa->hdr_l3_off ->|<- sa->hdr_len ->|
                                  |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
                     |<- sa->hdr_len  ->|

If hdr_len doesn't include L2 length, I would agree that

    dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len +

sizeof(struct rte_udp_hdr)

But then what's the point of

    sa->hdr_len - sa->hdr_l3_off

in lib/ipsec/sa.c?

#9 lore raw
In reply to Xiao Liang
Quoted 19 lines · Xiao Liang
Quoted 8 lines

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

|<-           mb->pkt_len - sqh_len                   ->|
|<- sa->hdr_l3_off ->|<- sa->hdr_len ->|
                                   |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
                      |<- sa->hdr_len  ->|
Quoted 8 lines

If hdr_len doesn't include L2 length, I would agree that

     dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len +

sizeof(struct rte_udp_hdr)

But then what's the point of

     sa->hdr_len - sa->hdr_l3_off

in lib/ipsec/sa.c?

I will defer to Konstantin for a definite answer, that is if sa->hdr_len is supposed to include l2 length / offset or not. If it does, then the change that triggered this discussion is correct and we don't need to account for hdr_l3_off there.

#10 lore raw

07/07/2023 14:26, Radu Nicolau пишет:

Quoted 23 lines · Xiao Liang
Quoted 21 lines
Quoted 8 lines

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

|<-           mb->pkt_len - sqh_len                   ->|
|<- sa->hdr_l3_off ->|<- sa->hdr_len ->|
                                   |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
                      |<- sa->hdr_len  ->|

If hdr_len doesn't include L2 length, I would agree that

Quoted 9 lines
Quoted 6 lines

     dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

But then what's the point of
     sa->hdr_len - sa->hdr_l3_off
in lib/ipsec/sa.c?

I will defer to Konstantin for a definite answer, that is if sa->hdr_len is supposed to include l2 length / offset or not. If it does, then the change that triggered this discussion is correct and we don't need to account for hdr_l3_off there.

Ok, have to revive my memories here.
So, actually hdr_len stands for all tunell headers users want to add. It consits of optional l2_len (could be zero) plus outer ip len, plus in that case udp hdr len.
hdr_l3_off is an offset withih hdr_len where outer ip header starts. So yep, initial patch looks ok to me, I just acked it. Sorry for being a bit sloppy at reviewing it.

Acked-by
#11 lore raw
Quoted 35 lines · Konstantin Ananyev

07/07/2023 14:26, Radu Nicolau пишет:

Quoted 23 lines · Xiao Liang
Quoted 21 lines
Quoted 8 lines

sa->hdr_len and prm->tun.hdr_len don't include L2 length so both should start in the diagram at the end of the ETH header.

So the right way to compute datagram length is

dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

|<-           mb->pkt_len - sqh_len ->|
|<- sa->hdr_l3_off ->|<- sa->hdr_len ->|
                                   |<- udph->dgram_len ->|
+--------------------+------------+-----+-----+---------+-----+
|         ETH        |     IP     | UDP | ESP | payload | sqh |
+--------------------+------------+-----+-----+---------+-----+
|<- sa->hdr_l3_off ->|<- l3_len ->|
                      |<- sa->hdr_len  ->|

If hdr_len doesn't include L2 length, I would agree that

Quoted 9 lines
Quoted 6 lines

     dgram_len = mb->pkt_len - sqh_len - sa->hdr_l3_off - sa->hdr_len + sizeof(struct rte_udp_hdr)

But then what's the point of
     sa->hdr_len - sa->hdr_l3_off
in lib/ipsec/sa.c?

I will defer to Konstantin for a definite answer, that is if sa->hdr_len is supposed to include l2 length / offset or not. If it does, then the change that triggered this discussion is correct and we don't need to account for hdr_l3_off there.

Quoted 7 lines

Ok, have to revive my memories here.
So, actually hdr_len stands for all tunell headers users want to add. It consits of optional l2_len (could be zero) plus outer ip len, plus in that case udp hdr len.
hdr_l3_off is an offset withih hdr_len where outer ip header starts. So yep, initial patch looks ok to me, I just acked it. Sorry for being a bit sloppy at reviewing it.

This fix should also be CC'ed to [email protected]

Acked-by on v1 1/1
#12 lore raw
In reply to Xiao Liang

18/04/2023 09:46, Xiao Liang пишет:

Quoted 29 lines

UDP header length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
  lib/ipsec/esp_outb.c | 2 +-
  lib/ipsec/sa.c       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
  		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
  			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
  		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));
  	}
 
  	/* update original and new ip header fields */
lib/ipsec/sa.c +0 -0
index 59a547637d..2297bd6d72 100644

lib/ipsec/sa.c esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm) · line 377

Quoted 8 lines
lib/ipsec/sa.c +1 -1
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)
 
  	/* update l2_len and l3_len fields for outbound mbuf */
  	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
  	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
  }

Thanks for explanation and for the fix.
One thing that still bothers me with UDP encap support:
we still don't have a test-case for it in examples/ipsec-secgw/test.

author
#13 lore raw

PATCH v2 1/1 ipsec: fix NAT-T header length calculation

In reply to Xiao Liang

UDP header and L2 header (if any) length is included in sa->hdr_len. Take care of that in L3 header and pakcet length caculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
 lib/ipsec/esp_outb.c | 2 +-
 lib/ipsec/sa.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
 			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
 		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));
 	}
 
 	/* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)
 
 	/* update l2_len and l3_len fields for outbound mbuf */
 	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
 	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
 }
Signature · 1 line
2.41.0
author
#14 lore raw

PATCH v2 1/1 ipsec: fix NAT-T header length calculation

In reply to Xiao Liang

UDP header and L2 header (if any) length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")
---
 lib/ipsec/esp_outb.c | 2 +-
 lib/ipsec/sa.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
lib/ipsec/esp_outb.c +1 -1
index 9cbd9202f6..ec87b1dce2 100644
@@ -198,7 +198,7 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 		struct rte_udp_hdr *udph = (struct rte_udp_hdr *)
 			(ph + sa->hdr_len - sizeof(struct rte_udp_hdr));
 		udph->dgram_len = rte_cpu_to_be_16(mb->pkt_len - sqh_len -
-				sa->hdr_l3_off - sa->hdr_len);
+				sa->hdr_len + sizeof(struct rte_udp_hdr));
 	}
 
 	/* update original and new ip header fields */
lib/ipsec/sa.c +1 -1
index 59a547637d..2297bd6d72 100644
@@ -371,7 +371,7 @@ esp_outb_tun_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm)
 
 	/* update l2_len and l3_len fields for outbound mbuf */
 	sa->tx_offload.val = rte_mbuf_tx_offload(sa->hdr_l3_off,
-		sa->hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
+		prm->tun.hdr_len - sa->hdr_l3_off, 0, 0, 0, 0, 0);
 
 	esp_outb_init(sa, sa->hdr_len, prm->ipsec_xform.esn.value);
 }
Signature · 1 line
2.41.0
Applied
#15 lore raw

RE: [EXT] [PATCH v2] ipsec: fix NAT-T header length calculation

Quoted 9 lines

UDP header and L2 header (if any) length is included in sa->hdr_len. Take care of that in L3 header and pakcet length calculation.

Fixes 01eef5907fc3 ("ipsec: support NAT-T")

You should supersede the previous versions in patchworks while sending the next version.

Applied to dpdk-next-crypto
Thanks