lib/ipsec: add support for header construction
PATCH 1/1 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- examples/ipsec-secgw/sa.c | 2 + lib/librte_ipsec/esp_inb.c | 14 ++++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 119 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 25 ++++++++ lib/librte_ipsec/sa.c | 17 ++++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 8 +++ lib/librte_security/rte_security.h | 9 +++ 9 files changed, 191 insertions(+), 9 deletions(-)
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
lib/librte_ipsec/esp_inb.c +11 -3
@@ -377,9 +377,10 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[], {uint32_t adj, i, k, tl;uint32_t hl[num]; +void *inner_h; +const void *outter_h;struct esp_tail espt[num];struct rte_mbuf *ml[num]; -const uint32_t tlen = sa->icv_len +sizeof (espt[0 ]);const uint32_t cofs = sa->ctp.cipher.offset;
@@ -400,9 +401,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], ml[i], espt[i], adj, tl, sa->proto) ==0 ) { + outter_h = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, - tl, sqn + k); + inner_h =tun_process_step2 (mb[i], ml[i], hl[i], adj, + tl, sqn + k); + +if ((sa->type &INB_TUN_HDR_MSK ) !=0 ) +update_inb_tun_l3_hdr (sa, inner_h, outter_h); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len, sa->hdr_l3_off, -sqn_low16 (sqc)); +update_outb_tun_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, mb->pkt_len, + sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +115 -4
147 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +25 -0
@@ -95,6 +95,11 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , +RTE_SATP_LOG2_TTL , +RTE_SATP_LOG2_DF , +RTE_SATP_LOG2_FLABEL ,RTE_SATP_LOG2_NUM };
@@ -123,6 +128,26 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) + +#define RTE_IPSEC_SATP_TTL_MASK (1ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_DISABLE (0ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_ENABLE (1ULL << RTE_SATP_LOG2_TTL) + +#define RTE_IPSEC_SATP_DF_MASK (1ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_DISABLE (0ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_ENABLE (1ULL << RTE_SATP_LOG2_DF) + +#define RTE_IPSEC_SATP_FLABEL_MASK (1ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_DISABLE (0ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_ENABLE (1ULL << RTE_SATP_LOG2_FLABEL) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +17 -0
@@ -220,6 +220,17 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_SQN_RAW ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; + *type = tp;return 0 ; }
@@ -308,6 +319,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define INB_TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +8 -0
@@ -47,6 +47,14 @@ struct ipv4_hdr { (((c) & 0xff) << 8) | \ ((d) & 0xff)) + +/** RFC 3168 */ +#define ECN_MASK (0x03) +#define ECN_CE ECN_MASK + +/** Packet Option Masks */ +#define DSCP_MASK (0xFC) +/** Maximal IPv4 packet length (including a header) */ #define IPV4_MAX_PKT_LEN 65535
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ + + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.13.6
Hi,
Quoted 8 lines
Add support for RFC 4301(5.1.2) to update of Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
Signed-off-by Marko Kovacevic <[email protected]>
Quoted 11 lines
--- examples/ipsec-secgw/sa.c | 2 + lib/librte_ipsec/esp_inb.c | 14 ++++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 119 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 25 ++++++++ lib/librte_ipsec/sa.c | 17 ++++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 8 +++ lib/librte_security/rte_security.h | 9 +++ 9 files changed, 191 insertions(+), 9 deletions(-)
Looks good in general, some generic comments:
- I think it is better to split the patch into few sub-pathces:
One for rte_security, second for rte_net, third - rte_ipsec, forth - examples/ipsec-secgw
- Would be good to add support for other options too (ttl, etc.)
- Would be good to add new test-case for it into examples/ipsec-secgw/test/
Plus few nits in the code below.
Konstantin
Quoted 117 lines
examples/ipsec-secgw/sa.c +2
-0@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;lib/librte_ipsec/esp_inb.c +11
-3@@ -377,9 +377,10 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[], {uint32_t adj, i, k, tl;uint32_t hl[num]; +void *inner_h; +const void *outter_h;struct esp_tail espt[num];struct rte_mbuf *ml[num]; -const uint32_t tlen = sa->icv_len +sizeof (espt[0 ]);const uint32_t cofs = sa->ctp.cipher.offset;@@ -400,9 +401,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], ml[i], espt[i], adj, tl, sa->proto) ==0 ) { + outter_h = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, - tl, sqn + k); + inner_h =tun_process_step2 (mb[i], ml[i], hl[i], adj, + tl, sqn + k); + +if ((sa->type &INB_TUN_HDR_MSK ) !=0 ) +update_inb_tun_l3_hdr (sa, inner_h, outter_h); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);lib/librte_ipsec/esp_outb.c +2
-2@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len, sa->hdr_l3_off, -sqn_low16 (sqc)); +update_outb_tun_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, mb->pkt_len, + sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct esp_hdr *)(ph + sa->hdr_len);lib/librte_ipsec/iph.h +27
-2@@ -11,6 +11,11 @@* used internally by ipsec library. */ +#define IPV6_DSCP_MASK (DSCP_MASK << IPV6_HDR_TC_SHIFT) +#define IPV6_ECN_MASK (ECN_MASK << IPV6_HDR_TC_SHIFT) +#define IPV6_TOS_MASK (IPV6_ECN_MASK | IPV6_DSCP_MASK) +#define IPV6_ECN_CE IPV6_ECN_MASK +/* * Move preceding (L3) headers down to remove ESP header and IV. */ @@ -35,6 +40,26 @@ insert_esph(char *np, char *op, uint32_t hlen) np[i] = op[i]; } +static inline uint8_t +get_ipv6_tos (rte_be32_t vtc_flow) +{ +uint32_t v; + + v =rte_be_to_cpu_32 (vtc_flow); +return v >>IPV6_HDR_TC_SHIFT ; +} + +static inline rte_be32_t +set_ipv6_tos (rte_be32_t vtc_flow,uint32_t tos) +{ +uint32_t v; + + v =rte_cpu_to_be_32 (tos <<IPV6_HDR_TC_SHIFT ); + vtc_flow &= ~rte_cpu_to_be_32 (IPV6_TOS_MASK ); + +return (v | vtc_flow); +} +/* update original ip header fields for transport case */ static inline int update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,@@ -64,20 +89,106 @@ update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,/* update original and new ip header fields for tunnel case */ static inline void -update_tun_l3hdr (const struct rte_ipsec_sa *sa,void *p,uint32_t plen, -uint32_t l2len,rte_be16_t pid) +update_outb_tun_l3hdr (const struct rte_ipsec_sa *sa,void *outh, +const void *inh,uint32_t plen,uint32_t l2len,rte_be16_t pid) {struct ipv4_hdr *v4h;
lib/librte_ipsec/iph.h update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, · line 104
Quoted 10 lines
lib/librte_ipsec/iph.h +4
-1struct ipv6_hdr *v6h; +uint32_t itp, otp; +const struct ipv4_hdr *v4in_h; +const struct ipv6_hdr *v6in_h;if (sa->type &RTE_IPSEC_SATP_MODE_TUNLV4 ) { - v4h = p; + v4h = outh; v4h->packet_id = pid; v4h->total_length =rte_cpu_to_be_16 (plen - l2len);
I think it makes sense to invoke the code below, only when:
((sa->type & INB_TUN_HDR_MSK) != 0)
Same as we doing for onbound.
Also probably worth to put it into a separate inline function.
lib/librte_ipsec/iph.h update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, · line 106
Quoted 2 lines
lib/librte_ipsec/iph.h +2
-0+ +if (sa->proto ==IPPROTO_IPIP ) {
For consistency with the check above, seems a bit better:
if ((sa->type & RTE_IPSEC_SATP_IPV_MASK) == RTE_IPSEC_SATP_IPV4)
Quoted 11 lines
lib/librte_ipsec/iph.h +11
-0+/* ipv4 inner header */ + v4in_h = inh; + + otp = v4h->type_of_service & ~sa->tos_mask; + itp = v4in_h->type_of_service & sa->tos_mask; + v4h->type_of_service = (otp | itp); + }else { +/* ipv6 inner header */ + v6in_h = inh; + + otp = v4h->type_of_service & ~sa->tos_mask;
lib/librte_ipsec/iph.h update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, · line 126
Quoted 10 lines
lib/librte_ipsec/iph.h +6
-1+ itp =get_ipv6_tos (v6in_h->vtc_flow) & sa->tos_mask; + v4h->type_of_service = (otp | itp); + } }else { - v6h = p; + v6h = outh; v6h->payload_len =rte_cpu_to_be_16 (plen - l2len -sizeof (*v6h)); + +if (sa->proto ==IPPROTO_IPIP ) {
Same comment as above here.
Quoted 171 lines
lib/librte_ipsec/iph.h +65
-0+/* ipv4 inner header */ + v4in_h = inh; + + otp =get_ipv6_tos (v6h->vtc_flow) & ~sa->tos_mask; + itp = v4in_h->type_of_service & sa->tos_mask; + v6h->vtc_flow =set_ipv6_tos (v6h->vtc_flow, otp | itp); + }else { +/* ipv6 inner header */ + v6in_h = inh; + + otp =get_ipv6_tos (v6h->vtc_flow) & ~sa->tos_mask; + itp =get_ipv6_tos (v6in_h->vtc_flow) & sa->tos_mask; + v6h->vtc_flow =set_ipv6_tos (v6h->vtc_flow, otp | itp); + } + } +} + +static inline void +update_inb_tun_l3_hdr (const struct rte_ipsec_sa *sa,void *ip_inner, +const void *ip_outter) +{ +struct ipv4_hdr *inner_v4h; +const struct ipv4_hdr *outter_v4h; +struct ipv6_hdr *inner_v6h; +const struct ipv6_hdr *outter_v6h; +uint8_t ecn_v4out, ecn_v4in; +uint32_t ecn_v6out, ecn_v6in; + + inner_v4h = ip_inner; + outter_v4h = ip_outter; + + inner_v6h = ip_inner; + outter_v6h = ip_outter; + +/* <update ecn bits in inner IP header> */ +if (sa->type &RTE_IPSEC_SATP_MODE_TUNLV4 ) { + + ecn_v4out = outter_v4h->type_of_service &ECN_MASK ; + +if ((sa->type &RTE_IPSEC_SATP_IPV_MASK ) ==RTE_IPSEC_SATP_IPV4 ) { + ecn_v4in = inner_v4h->type_of_service &ECN_MASK ; +if (ecn_v4out ==ECN_CE && ecn_v4in !=0 ) + inner_v4h->type_of_service |=ECN_CE ; + }else { + ecn_v6in = inner_v6h->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if (ecn_v4out ==ECN_CE && ecn_v6in !=0 ) + inner_v6h->vtc_flow |= +rte_cpu_to_be_32 (IPV6_ECN_CE ); + } + }else { + ecn_v6out = outter_v6h->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); + +if ((sa->type &RTE_IPSEC_SATP_IPV_MASK ) ==RTE_IPSEC_SATP_IPV6 ) { + ecn_v6in = inner_v6h->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if (ecn_v6out ==IPV6_ECN_CE && ecn_v6in !=0 ) + inner_v6h->vtc_flow |= +rte_cpu_to_be_32 (IPV6_ECN_CE ); + }else { + ecn_v4in = inner_v4h->type_of_service &ECN_MASK ; +if (ecn_v6out ==ECN_CE && ecn_v4in !=0 ) + inner_v4h->type_of_service |=ECN_CE ; + } } }lib/librte_ipsec/rte_ipsec_sa.h +25
-0@@ -95,6 +95,11 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , +RTE_SATP_LOG2_TTL , +RTE_SATP_LOG2_DF , +RTE_SATP_LOG2_FLABEL ,RTE_SATP_LOG2_NUM };@@ -123,6 +128,26 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) + +#define RTE_IPSEC_SATP_TTL_MASK (1ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_DISABLE (0ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_ENABLE (1ULL << RTE_SATP_LOG2_TTL) + +#define RTE_IPSEC_SATP_DF_MASK (1ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_DISABLE (0ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_ENABLE (1ULL << RTE_SATP_LOG2_DF) + +#define RTE_IPSEC_SATP_FLABEL_MASK (1ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_DISABLE (0ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_ENABLE (1ULL << RTE_SATP_LOG2_FLABEL) +/** * get type of given SA * @return lib/librte_ipsec/sa.c +17
-0@@ -220,6 +220,17 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_SQN_RAW ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; + *type = tp;return 0 ; }@@ -308,6 +319,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :lib/librte_ipsec/sa.h +2
-0@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define INB_TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];lib/librte_net/rte_ip.h +0
-0
lib/librte_net/rte_ip.h struct ipv4_hdr { · line 56
Quoted 10 lines
lib/librte_net/rte_ip.h +7
-0@@ -47,6 +47,14 @@ struct ipv4_hdr { (((c) & 0xff) << 8) | \ ((d) & 0xff)) + +/** RFC 3168 */ +#define ECN_MASK (0x03) +#define ECN_CE ECN_MASK + +/** Packet Option Masks */ +#define DSCP_MASK (0xFC)
Might be worth to add some prefix: IP_ECN_...
Or even RTE_IP_ECN_...
Quoted 9 lines
lib/librte_net/rte_ip.h +1
-0+/** Maximal IPv4 packet length (including a header) */ #define IPV4_MAX_PKT_LEN 65535lib/librte_security/rte_security.h +0
-0
lib/librte_security/rte_security.h struct rte_security_ipsec_sa_options { · line 171
Quoted 9 lines
lib/librte_security/rte_security.h +6
-0@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced))
I think, that comment (possible ECN values) better move into rte_ip.h. And here explain briefly what would be behavior for ipsec implementation for 0/1 values.
Quoted 8 lines
lib/librte_security/rte_security.h +3
-1+*/ + + uint32_t ecn : 1; };/** IPSec security association direction */ --2.13.6
Hi Marko,
Could you please address to the comments from Konstantin? We have an RC1 date coming.
Thanks,
Akhil
Quoted 33 lines
Hi,
Quoted 7 lines
Add support for RFC 4301(5.1.2) to update of Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
Quoted 6 lines
Signed-off-by Marko Kovacevic <[email protected]>--- examples/ipsec-secgw/sa.c | 2 + lib/librte_ipsec/esp_inb.c | 14 ++++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 119 +++++++++++++++++++++++++++++++++++--
Quoted 6 lines
lib/librte_ipsec/rte_ipsec_sa.h | 25 ++++++++ lib/librte_ipsec/sa.c | 17 ++++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 8 +++ lib/librte_security/rte_security.h | 9 +++ 9 files changed, 191 insertions(+), 9 deletions(-)Looks good in general, some generic comments:
- I think it is better to split the patch into few sub-pathces:
One forrte_security, second forrte_net, third -rte_ipsec, forth -
examples/ipsec-secgw
- Would be good to add support for other options too (ttl, etc.)
- Would be good to add new test-case for it into examples/ipsec-secgw/test/Plus few nits in the code below.
Konstantin
v2 cover ipsec: ECN and DSCP header reconstruction.
In reply to Marko KovacevicThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
This patchset depends on the following patchset "[v2,0/4] IPv6 with options support for IPsec transport"
(http://patchwork.dpdk.org/cover/55238/)
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (1):
examples/ipsec-secgw: support header reconstruction
Marko Kovacevic (1):
lib/ipsec: add support for header construction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 14 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 134 +++++- lib/librte_ipsec/rte_ipsec_sa.h | 25 ++ lib/librte_ipsec/sa.c | 17 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 11 + lib/librte_security/rte_security.h | 9 + 12 files changed, 692 insertions(+), 12 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v2 1/2 lib/ipsec: add support for header construction
From: Marko Kovacevic <[email protected]>
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 14 +++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 134 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 25 +++++++ lib/librte_ipsec/sa.c | 17 +++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 11 +++ lib/librte_security/rte_security.h | 9 +++ 8 files changed, 205 insertions(+), 11 deletions(-)
lib/librte_ipsec/esp_inb.c +11 -3
@@ -377,9 +377,10 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[], {uint32_t adj, i, k, tl;uint32_t hl[num]; +void *inner_h; +const void *outter_h;struct esp_tail espt[num];struct rte_mbuf *ml[num]; -const uint32_t tlen = sa->icv_len +sizeof (espt[0 ]);const uint32_t cofs = sa->ctp.cipher.offset;
@@ -400,9 +401,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], ml[i], espt[i], adj, tl, sa->proto) ==0 ) { + outter_h = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, - tl, sqn + k); + inner_h =tun_process_step2 (mb[i], ml[i], hl[i], adj, + tl, sqn + k); + +if ((sa->type &INB_TUN_HDR_MSK ) !=0 ) +update_inb_tun_l3_hdr (sa, inner_h, outter_h); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len, sa->hdr_l3_off, -sqn_low16 (sqc)); +update_outb_tun_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, mb->pkt_len, + sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +128 -6
169 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +25 -0
@@ -95,6 +95,11 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , +RTE_SATP_LOG2_TTL , +RTE_SATP_LOG2_DF , +RTE_SATP_LOG2_FLABEL ,RTE_SATP_LOG2_NUM };
@@ -123,6 +128,26 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) + +#define RTE_IPSEC_SATP_TTL_MASK (1ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_DISABLE (0ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_ENABLE (1ULL << RTE_SATP_LOG2_TTL) + +#define RTE_IPSEC_SATP_DF_MASK (1ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_DISABLE (0ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_ENABLE (1ULL << RTE_SATP_LOG2_DF) + +#define RTE_IPSEC_SATP_FLABEL_MASK (1ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_DISABLE (0ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_ENABLE (1ULL << RTE_SATP_LOG2_FLABEL) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +17 -0
@@ -220,6 +220,17 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_SQN_RAW ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; + *type = tp;return 0 ; }
@@ -310,6 +321,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define INB_TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +11 -0
@@ -46,6 +46,17 @@ struct rte_ipv4_hdr { (((b) & 0xff) << 16) | \ (((c) & 0xff) << 8) | \ ((d) & 0xff)) +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC)/** Maximal IPv4 packet length (including a header) */ #define RTE_IPV4_MAX_PKT_LEN 65535
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
PATCH v2 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ 4 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -88,6 +88,12 @@ New Features * Added multi-queue support to allow one af_xdp vdev with multiple netdev queues +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -61,7 +61,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +477 -0
477 lines not on this page · raw message
Signature · 1 line
2.14.5
v3 cover ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstruction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 16 +- lib/librte_ipsec/esp_outb.c | 3 +- lib/librte_ipsec/iph.h | 148 ++++++- lib/librte_ipsec/rte_ipsec_sa.h | 25 ++ lib/librte_ipsec/sa.c | 17 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 11 + lib/librte_security/rte_security.h | 9 + 12 files changed, 708 insertions(+), 11 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v3 1/2 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 16 +++- lib/librte_ipsec/esp_outb.c | 3 +- lib/librte_ipsec/iph.h | 148 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 25 +++++++ lib/librte_ipsec/sa.c | 17 +++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 11 +++ lib/librte_security/rte_security.h | 9 +++ 8 files changed, 221 insertions(+), 10 deletions(-)
lib/librte_ipsec/esp_inb.c +13 -3
@@ -464,13 +464,15 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const uint32_t cofs = sa->ctp.cipher.offset; +void *inner_h; +const void *outter_h;/* * remove icv, esp trailer and high-order * 32 bits of esn from packet length */ const uint32_t tlen = sa->icv_len +sizeof (espt[0 ]) + sqh_len; -const uint32_t cofs = sa->ctp.cipher.offset;/* * to minimize stalls due to load latency,
@@ -489,9 +491,17 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outter_h = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + + inner_h =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +if ((sa->type &TUN_HDR_MSK ) !=0 ) +update_inb_tun_l3_hdr (sa, inner_h, outter_h); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -1
@@ -152,7 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, + +update_outb_tun_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, mb->pkt_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */
lib/librte_ipsec/iph.h +142 -6
185 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +25 -0
@@ -95,6 +95,11 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , +RTE_SATP_LOG2_TTL , +RTE_SATP_LOG2_DF , +RTE_SATP_LOG2_FLABEL ,RTE_SATP_LOG2_NUM };
@@ -123,6 +128,26 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) + +#define RTE_IPSEC_SATP_TTL_MASK (1ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_DISABLE (0ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_ENABLE (1ULL << RTE_SATP_LOG2_TTL) + +#define RTE_IPSEC_SATP_DF_MASK (1ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_DISABLE (0ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_ENABLE (1ULL << RTE_SATP_LOG2_DF) + +#define RTE_IPSEC_SATP_FLABEL_MASK (1ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_DISABLE (0ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_ENABLE (1ULL << RTE_SATP_LOG2_FLABEL) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +17 -0
@@ -220,6 +220,17 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_SQN_RAW ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; + *type = tp;return 0 ; }
@@ -310,6 +321,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +11 -0
@@ -46,6 +46,17 @@ struct rte_ipv4_hdr { (((b) & 0xff) << 16) | \ (((c) & 0xff) << 8) | \ ((d) & 0xff)) +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC)/** Maximal IPv4 packet length (including a header) */ #define RTE_IPV4_MAX_PKT_LEN 65535
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
Hi Fan,
Quoted 8 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Wednesday, June 26, 2019 4:05 PM
To: [email protected]
Cc: [email protected]; Ananyev, Konstantin <[email protected]>; Zhang, Roy Fan <[email protected]>; Kovacevic, Marko <[email protected]>
Subject: [PATCH v3 1/2] lib/ipsec: add support for header construction
Quoted 6 lines
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field
bits inside ipv4/ipv6 packets for outbound cases
and inbound cases which deals with the update of
the DSCP/ENC bits inside each of the fields.
This series cause all tunnel _esn_ testcases for non-AEAD algorithms (tun_aescbc_sha1_esn, tun_3descbc_sha1_esn, ...) to fail - ping can't go through. Both ipv4 and ipv6.
Could you have a look?
Thanks
Konstantin
Quoted 402 lines
Signed-off-by Marko Kovacevic <[email protected]>Signed-off-by Fan Zhang <[email protected]>--- lib/librte_ipsec/esp_inb.c | 16 +++- lib/librte_ipsec/esp_outb.c | 3 +- lib/librte_ipsec/iph.h | 148 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 25 +++++++ lib/librte_ipsec/sa.c | 17 +++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 11 +++ lib/librte_security/rte_security.h | 9 +++ 8 files changed, 221 insertions(+), 10 deletions(-)lib/librte_ipsec/esp_inb.c +13
-3@@ -464,13 +464,15 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const uint32_t cofs = sa->ctp.cipher.offset; +void *inner_h; +const void *outter_h;/* * remove icv, esp trailer and high-order * 32 bits of esn from packet length */ const uint32_t tlen = sa->icv_len +sizeof (espt[0 ]) + sqh_len; -const uint32_t cofs = sa->ctp.cipher.offset;/* * to minimize stalls due to load latency, @@ -489,9 +491,17 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outter_h = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + + inner_h =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +if ((sa->type &TUN_HDR_MSK ) !=0 ) +update_inb_tun_l3_hdr (sa, inner_h, outter_h); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);lib/librte_ipsec/esp_outb.c +2
-1@@ -152,7 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, + +update_outb_tun_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, mb->pkt_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ lib/librte_ipsec/iph.h +142
-6@@ -5,14 +5,17 @@#ifndef _IPH_H_#define _IPH_H_ -#include <rte_ip.h> -/** * @file iph.h * Contains functions/structures/macros to manipulate IPv4/IPv6 headers * used internally by ipsec library. */ +#define IPV6_DSCP_MASK (RTE_IP_DSCP_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_ECN_MASK (RTE_IP_ECN_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_TOS_MASK (IPV6_ECN_MASK | IPV6_DSCP_MASK) +#define IPV6_ECN_CE IPV6_ECN_MASK +/* * Move preceding (L3) headers down to remove ESP header and IV. */ @@ -37,6 +40,26 @@ insert_esph(char *np, char *op, uint32_t hlen) np[i] = op[i]; } +static inline uint8_t +get_ipv6_tos (rte_be32_t vtc_flow) +{ +uint32_t v; + + v =rte_be_to_cpu_32 (vtc_flow); +return v >>RTE_IPV6_HDR_TC_SHIFT ; +} + +static inline rte_be32_t +set_ipv6_tos (rte_be32_t vtc_flow,uint32_t tos) +{ +uint32_t v; + + v =rte_cpu_to_be_32 (tos <<RTE_IPV6_HDR_TC_SHIFT ); + vtc_flow &= ~rte_cpu_to_be_32 (IPV6_TOS_MASK ); + +return (v | vtc_flow); +} +/* update original ip header fields for transport case */ static inline int update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,@@ -101,23 +124,136 @@ update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, return rc; } +/** +* Update type-of-service/traffic-class field of inbound/outbound tunnel +* packet. +* +* @param ref_h: reference header, for outbound it is inner header, otherwise +* outer header. +* @param update_h: header to be updated tos/tc field, for outbound it is outer +* header, otherwise inner header. +* @param tos_mask: type-of-service mask stored in sa. +* @param is_outh_ipv4: 1 if outer header is ipv4, 0 if it is ipv6. +* @param is_inner_ipv4: 1 if inner header is ipv4, 0 if it is ipv6. +* @param is_inbound: 1 if it is a inbound packet, 0 if it is outbound. +*/ +static inline void +update_tun_tos (const void *ref_h,void *update_h,uint32_t tos_mask, +uint8_t is_outh_ipv4,uint8_t is_inh_ipv4,uint8_t is_inbound) +{ +uint8_t idx = ((is_inbound <<2 ) | (is_outh_ipv4 <<1 ) | is_inh_ipv4); +struct rte_ipv4_hdr *v4out_h; +struct rte_ipv6_hdr *v6out_h; +struct rte_ipv4_hdr *v4in_h; +struct rte_ipv6_hdr *v6in_h; +uint32_t itp, otp; +uint8_t ecn_v4out, ecn_v4in; +uint32_t ecn_v6out, ecn_v6in; + +switch (idx) { +/* outbound */ +case 0 :/*outh ipv6, inh ipv6 */ + v6out_h = update_h; + otp =get_ipv6_tos (v6out_h->vtc_flow) & ~tos_mask; + itp =get_ipv6_tos (((const struct rte_ipv6_hdr *)ref_h)-> + vtc_flow) & tos_mask; + v6out_h->vtc_flow =set_ipv6_tos (v6out_h->vtc_flow, otp | itp); +break ; +case 1 :/*outh ipv6, inh ipv4 */ + v6out_h = update_h; + otp =get_ipv6_tos (v6out_h->vtc_flow) & ~tos_mask; + itp = ((const struct rte_ipv4_hdr *)ref_h)->type_of_service & + tos_mask; + v6out_h->vtc_flow =set_ipv6_tos (v6out_h->vtc_flow, otp | itp); +break ; +case 2 :/*outh ipv4, inh ipv6 */ + v4out_h = update_h; + otp = v4out_h->type_of_service & ~tos_mask; + itp =get_ipv6_tos (((const struct rte_ipv6_hdr *)ref_h)-> + vtc_flow) & tos_mask; + v4out_h->type_of_service = (otp | itp); +break ; +case 3 :/* outh ipv4, inh ipv4 */ + v4out_h = update_h; + otp = v4out_h->type_of_service & ~tos_mask; + itp = ((const struct rte_ipv4_hdr *)ref_h)->type_of_service & + tos_mask; + v4out_h->type_of_service = (otp | itp); +break ; +/* inbound */ +case 4 :/* outh ipv6, inh ipv6 */ + v6in_h = update_h; + ecn_v6out = ((const struct rte_ipv6_hdr *)ref_h)->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); + ecn_v6in = v6in_h->vtc_flow &rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if ((ecn_v6out ==rte_cpu_to_be_32 (IPV6_ECN_CE )) && + (ecn_v6in !=0 )) + v6in_h->vtc_flow |=rte_cpu_to_be_32 (IPV6_ECN_CE ); +break ; +case 5 :/* outh ipv6, inh ipv4 */ + v4in_h = update_h; + ecn_v6out = ((const struct rte_ipv6_hdr *)ref_h)->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); + ecn_v4in = v4in_h->type_of_service &RTE_IP_ECN_MASK ; +if ((ecn_v6out ==rte_cpu_to_be_32 (IPV6_ECN_CE )) && + (ecn_v4in !=0 )) + v4in_h->type_of_service |=RTE_IP_ECN_CE ; +break ; +case 6 :/* outh ipv4, inh ipv6 */ + v6in_h = update_h; + ecn_v4out = ((const struct rte_ipv4_hdr *)ref_h)-> + type_of_service &RTE_IP_ECN_MASK ; + ecn_v6in = v6in_h->vtc_flow &rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if (ecn_v4out ==RTE_IP_ECN_CE && ecn_v6in !=0 ) + v6in_h->vtc_flow |=rte_cpu_to_be_32 (IPV6_ECN_CE ); +break ; +case 7 :/* outh ipv4, inh ipv4 */ + v4in_h = update_h; + ecn_v4out = ((const struct rte_ipv4_hdr *)ref_h)-> + type_of_service &RTE_IP_ECN_MASK ; + ecn_v4in = v4in_h->type_of_service &RTE_IP_ECN_MASK ; +if (ecn_v4out ==RTE_IP_ECN_CE && ecn_v4in !=0 ) + v4in_h->type_of_service |=RTE_IP_ECN_CE ; +break ; + } +} + +/* update original and new ip header fields for tunnel case */ static inline void -update_tun_l3hdr (const struct rte_ipsec_sa *sa,void *p,uint32_t plen, -uint32_t l2len,rte_be16_t pid) +update_outb_tun_l3hdr (const struct rte_ipsec_sa *sa,void *outh, +const void *inh,uint32_t plen,uint32_t l2len,rte_be16_t pid) {struct rte_ipv4_hdr *v4h;struct rte_ipv6_hdr *v6h; +uint8_t is_out_ipv4;if (sa->type &RTE_IPSEC_SATP_MODE_TUNLV4 ) { - v4h = p; + is_out_ipv4 =1 ; + v4h = outh; v4h->packet_id = pid; v4h->total_length =rte_cpu_to_be_16 (plen - l2len); }else { - v6h = p; + is_out_ipv4 =0 ; + v6h = outh; v6h->payload_len =rte_cpu_to_be_16 (plen - l2len -sizeof (*v6h)); } + +if (sa->type &TUN_HDR_MSK ) +update_tun_tos (inh, outh, sa->tos_mask, is_out_ipv4, + ((sa->type &RTE_IPSEC_SATP_IPV_MASK ) == +RTE_IPSEC_SATP_IPV4 ),0 ); +} + +static inline void +update_inb_tun_l3_hdr (const struct rte_ipsec_sa *sa,void *ip_inner, +const void *ip_outter) +{ +update_tun_tos (ip_outter, ip_inner, sa->tos_mask, + ((sa->type &RTE_IPSEC_SATP_MODE_TUNLV4 ) !=0 ), + ((sa->type &RTE_IPSEC_SATP_IPV_MASK ) ==RTE_IPSEC_SATP_IPV4 ), +1 ); }#endif /* _IPH_H_ */ lib/librte_ipsec/rte_ipsec_sa.h +25
-0@@ -95,6 +95,11 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , +RTE_SATP_LOG2_TTL , +RTE_SATP_LOG2_DF , +RTE_SATP_LOG2_FLABEL ,RTE_SATP_LOG2_NUM };@@ -123,6 +128,26 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) + +#define RTE_IPSEC_SATP_TTL_MASK (1ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_DISABLE (0ULL << RTE_SATP_LOG2_TTL) +#define RTE_IPSEC_SATP_TTL_ENABLE (1ULL << RTE_SATP_LOG2_TTL) + +#define RTE_IPSEC_SATP_DF_MASK (1ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_DISABLE (0ULL << RTE_SATP_LOG2_DF) +#define RTE_IPSEC_SATP_DF_ENABLE (1ULL << RTE_SATP_LOG2_DF) + +#define RTE_IPSEC_SATP_FLABEL_MASK (1ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_DISABLE (0ULL << RTE_SATP_LOG2_FLABEL) +#define RTE_IPSEC_SATP_FLABEL_ENABLE (1ULL << RTE_SATP_LOG2_FLABEL) +/** * get type of given SA * @return lib/librte_ipsec/sa.c +17
-0@@ -220,6 +220,17 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_SQN_RAW ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; + *type = tp;return 0 ; }@@ -310,6 +321,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :lib/librte_ipsec/sa.h +2
-0@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];lib/librte_net/rte_ip.h +11
-0@@ -46,6 +46,17 @@ struct rte_ipv4_hdr { (((b) & 0xff) << 16) | \ (((c) & 0xff) << 8) | \ ((d) & 0xff)) +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC)/** Maximal IPv4 packet length (including a header) */ #define RTE_IPV4_MAX_PKT_LEN 65535lib/librte_security/rte_security.h +9
-1@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */ --2.14.5
PATCH v3 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ 4 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -99,6 +99,12 @@ New Features Updated ``librte_telemetry`` to fetch the global metrics from the ``librte_metrics`` library. +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -61,7 +61,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +477 -0
477 lines not on this page · raw message
Signature · 1 line
2.14.5
v4 cover ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
v4:
- Fixed a bug.
- Refrabricated the code a bit.
v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstruction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 139 +++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 + lib/librte_security/rte_security.h | 9 + 12 files changed, 686 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v4 1/2 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 13 +++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 139 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 10 +++ lib/librte_ipsec/sa.c | 18 +++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 ++++ lib/librte_security/rte_security.h | 9 +++ 8 files changed, 199 insertions(+), 8 deletions(-)
lib/librte_ipsec/esp_inb.c +11 -2
@@ -464,6 +464,8 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const void *outh; +void *inh;/* * remove icv, esp trailer and high-order
@@ -489,9 +491,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outh = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + inh =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +/* update inner ip header */ +update_tun_inb_l3hdr (sa, outh, inh); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, - sa->hdr_l3_off,sqn_low16 (sqc)); +update_tun_outb_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, + mb->pkt_len - sqh_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +135 -4
158 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +10 -0
@@ -95,6 +95,8 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , RTE_SATP_LOG2_NUM };
@@ -123,6 +125,14 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +18 -0
@@ -214,6 +214,18 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_ESN_ENABLE ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; + +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; +/* interpret flags */ if (prm->flags &RTE_IPSEC_SAFLAG_SQN_ATOM ) tp |=RTE_IPSEC_SATP_SQN_ATOM ;
@@ -310,6 +322,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +12 -0
@@ -70,6 +70,18 @@ struct rte_ipv4_hdr {#define RTE_IPV4_HDR_OFFSET_UNITS 8 +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC) +/* * IPv4 address types */
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
PATCH v4 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ 4 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -99,6 +99,12 @@ New Features Updated ``librte_telemetry`` to fetch the global metrics from the ``librte_metrics`` library. +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -61,7 +61,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +477 -0
477 lines not on this page · raw message
Signature · 1 line
2.14.5
v5 cover ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
v5:
- Fixed a checkpatch error.
v4:
- Fixed a bug.
- Refrabricated the code a bit.
v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstruction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 139 +++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 + lib/librte_security/rte_security.h | 9 + 12 files changed, 686 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v5 1/2 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 13 +++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 139 +++++++++++++++++++++++++++++++++++-- lib/librte_ipsec/rte_ipsec_sa.h | 10 +++ lib/librte_ipsec/sa.c | 18 +++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 ++++ lib/librte_security/rte_security.h | 9 +++ 8 files changed, 199 insertions(+), 8 deletions(-)
lib/librte_ipsec/esp_inb.c +11 -2
@@ -464,6 +464,8 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const void *outh; +void *inh;/* * remove icv, esp trailer and high-order
@@ -489,9 +491,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outh = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + inh =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +/* update inner ip header */ +update_tun_inb_l3hdr (sa, outh, inh); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, - sa->hdr_l3_off,sqn_low16 (sqc)); +update_tun_outb_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, + mb->pkt_len - sqh_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +135 -4
158 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +10 -0
@@ -95,6 +95,8 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , RTE_SATP_LOG2_NUM };
@@ -123,6 +125,14 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +18 -0
@@ -214,6 +214,18 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_ESN_ENABLE ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; + +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; +/* interpret flags */ if (prm->flags &RTE_IPSEC_SAFLAG_SQN_ATOM ) tp |=RTE_IPSEC_SATP_SQN_ATOM ;
@@ -310,6 +322,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +12 -0
@@ -70,6 +70,18 @@ struct rte_ipv4_hdr {#define RTE_IPV4_HDR_OFFSET_UNITS 8 +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC) +/* * IPv4 address types */
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
Hi Fan,
Quoted 7 lines
From: Zhang, Roy Fan
Sent: Friday, June 28, 2019 2:23 PM
To: [email protected]
Cc: [email protected]; Ananyev, Konstantin <[email protected]>; Zhang, Roy Fan <[email protected]>; Kovacevic, Marko <[email protected]>
Subject: [PATCH v5 1/2] lib/ipsec: add support for header construction
Quoted 5 lines
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field
bits inside ipv4/ipv6 packets for outbound cases
and inbound cases which deals with the update of
the DSCP/ENC bits inside each of the fields.
Two minor nits below.
Apart from that:
Quoted 22 lines
Signed-off-by Marko Kovacevic <[email protected]>Signed-off-by Fan Zhang <[email protected]>---
lib/librte_ipsec/iph.h +8
-0@@ -101,23 +101,154 @@ update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,return rc; } +/* +* The masks for ipv6 header reconstruction (RFC4301) +*/ +#define IPV6_DSCP_MASK (RTE_IP_DSCP_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_ECN_MASK (RTE_IP_ECN_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_TOS_MASK (IPV6_ECN_MASK | IPV6_DSCP_MASK) +#define IPV6_ECN_CE IPV6_ECN_MASK +
lib/librte_ipsec/iph.h update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, · line 121
Quoted 10 lines
lib/librte_ipsec/iph.h +10
-0+/* +* The macros to get and set traffic class (TC) for ipv6 packets +*/ +#define GET_IPV6_TC (vtc_flow) \ + (uint32_t)((rte_be_to_cpu_32(vtc_flow)) >> RTE_IPV6_HDR_TC_SHIFT) + +#define SET_IPV6_TC (vtc_flow, tc) \ + (vtc_flow = rte_cpu_to_be_32(tc << RTE_IPV6_HDR_TC_SHIFT) | \ + (vtc_flow & (~rte_cpu_to_be_32(IPV6_TOS_MASK)))) +
For macros we need all its parameter references to be in ().
i.e. (vtc_flow) = rte_cpu_to_be_32((tc) << ...
Though I think inline function would suit better (as you have in previous patch version).
Quoted 46 lines
lib/librte_ipsec/iph.h +46
-0+/** +* Update type-of-service/traffic-class field of inbound/outbound tunnel +* packet. +* +* @param ref_h: reference header, for outbound it is inner header, otherwise +* outer header. +* @param update_h: header to be updated tos/tc field, for outbound it is outer +* header, otherwise inner header. +* @param tos_mask: type-of-service mask stored in sa. +* @param is_outh_ipv4: 1 if outer header is ipv4, 0 if it is ipv6. +* @param is_inner_ipv4: 1 if inner header is ipv4, 0 if it is ipv6. +* @param is_inbound: 1 if it is a inbound packet, 0 if it is outbound. +*/ +static inline void +update_tun_tos (const void *ref_h,void *update_h,uint32_t tos_mask, +uint8_t is_outh_ipv4,uint8_t is_inh_ipv4,uint8_t is_inbound) +{ +uint8_t idx = ((is_inbound <<2 ) | (is_outh_ipv4 <<1 ) | is_inh_ipv4); +struct rte_ipv4_hdr *v4out_h; +struct rte_ipv6_hdr *v6out_h; +struct rte_ipv4_hdr *v4in_h; +struct rte_ipv6_hdr *v6in_h; +uint32_t itp, otp; +uint8_t ecn_v4out, ecn_v4in; +uint32_t ecn_v6out, ecn_v6in; + +switch (idx) { +/* outbound */ +case 0 :/*outh ipv6, inh ipv6 */ + v6out_h = update_h; + otp =GET_IPV6_TC (v6out_h->vtc_flow) & ~tos_mask; + itp =GET_IPV6_TC (((const struct rte_ipv6_hdr *)ref_h)-> + vtc_flow) & tos_mask; +SET_IPV6_TC (v6out_h->vtc_flow, (otp | itp)); +break ; +case 1 :/*outh ipv6, inh ipv4 */ + v6out_h = update_h; + otp =GET_IPV6_TC (v6out_h->vtc_flow) & ~tos_mask; + itp = ((const struct rte_ipv4_hdr *)ref_h)->type_of_service & + tos_mask; +SET_IPV6_TC (v6out_h->vtc_flow, (otp | itp)); +break ; +case 2 :/*outh ipv4, inh ipv6 */ + v4out_h = update_h; + otp = v4out_h->type_of_service & ~tos_mask; + itp = GET_IPV6_TC(((const struct rte_ipv6_hdr *)ref_h)->
lib/librte_ipsec/iph.h update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen, · line 177
Quoted 10 lines
lib/librte_ipsec/iph.h +10
-0+ vtc_flow) & tos_mask; + v4out_h->type_of_service = (otp | itp); +break ; +case 3 :/* outh ipv4, inh ipv4 */ + v4out_h = update_h; + otp = v4out_h->type_of_service & ~tos_mask; + itp = ((const struct rte_ipv4_hdr *)ref_h)->type_of_service & + tos_mask; + v4out_h->type_of_service = (otp | itp); +break ;
Looking at the function - it might be better to split it into 2 separate functions:
one for inbound, another for outbound.
Then you'll have identical cases (0-3) for both, and that would probably be easier to follow. Again in that case you wouldn't need to:uint8_t idx = ((is_inbound << 2) |...
Quoted 38 lines
lib/librte_ipsec/iph.h +38
-0+/* inbound */ +case 4 :/* outh ipv6, inh ipv6 */ + v6in_h = update_h; + ecn_v6out = ((const struct rte_ipv6_hdr *)ref_h)->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); + ecn_v6in = v6in_h->vtc_flow &rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if ((ecn_v6out ==rte_cpu_to_be_32 (IPV6_ECN_CE )) && + (ecn_v6in !=0 )) + v6in_h->vtc_flow |=rte_cpu_to_be_32 (IPV6_ECN_CE ); +break ; +case 5 :/* outh ipv6, inh ipv4 */ + v4in_h = update_h; + ecn_v6out = ((const struct rte_ipv6_hdr *)ref_h)->vtc_flow & +rte_cpu_to_be_32 (IPV6_ECN_MASK ); + ecn_v4in = v4in_h->type_of_service &RTE_IP_ECN_MASK ; +if ((ecn_v6out ==rte_cpu_to_be_32 (IPV6_ECN_CE )) && + (ecn_v4in !=0 )) + v4in_h->type_of_service |=RTE_IP_ECN_CE ; +break ; +case 6 :/* outh ipv4, inh ipv6 */ + v6in_h = update_h; + ecn_v4out = ((const struct rte_ipv4_hdr *)ref_h)-> + type_of_service &RTE_IP_ECN_MASK ; + ecn_v6in = v6in_h->vtc_flow &rte_cpu_to_be_32 (IPV6_ECN_MASK ); +if (ecn_v4out ==RTE_IP_ECN_CE && ecn_v6in !=0 ) + v6in_h->vtc_flow |=rte_cpu_to_be_32 (IPV6_ECN_CE ); +break ; +case 7 :/* outh ipv4, inh ipv4 */ + v4in_h = update_h; + ecn_v4out = ((const struct rte_ipv4_hdr *)ref_h)-> + type_of_service &RTE_IP_ECN_MASK ; + ecn_v4in = v4in_h->type_of_service &RTE_IP_ECN_MASK ; +if (ecn_v4out ==RTE_IP_ECN_CE && ecn_v4in !=0 ) + v4in_h->type_of_service |=RTE_IP_ECN_CE ; +break ; + } +} +
PATCH v5 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ 4 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -99,6 +99,12 @@ New Features Updated ``librte_telemetry`` to fetch the global metrics from the ``librte_metrics`` library. +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -61,7 +61,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +477 -0
477 lines not on this page · raw message
Signature · 1 line
2.14.5
Re: [dpdk-dev] [PATCH v5 2/2] examples/ipsec-secgw: support header reconstruction
Quoted 9 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Friday, June 28, 2019 2:23 PM
To: [email protected]
Cc: [email protected]; Ananyev, Konstantin <[email protected]>; Zhang, Roy Fan <[email protected]>
Subject: [PATCH v5 2/2] examples/ipsec-secgw: support header reconstruction
Quoted 6 lines
This patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
Signed-off-by Fan Zhang <[email protected]>---
Quoted 1 line
2.14.5
v6 cover ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
v6:
- update_tun_tos function split for inbound/outbound.
- get/set ipv6 tc change from macro back to inline functions.
v5:
- Fixed a checkpatch error.
v4:
- Fixed a bug.
- Refrabricated the code a bit.
v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstruction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 168 +++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 + lib/librte_security/rte_security.h | 9 + 12 files changed, 715 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v6 1/2 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field
bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 13 ++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 168 ++++++++++++++++++++++++++++++++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 +++ lib/librte_ipsec/sa.c | 18 ++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 +++ lib/librte_security/rte_security.h | 9 ++ 8 files changed, 228 insertions(+), 8 deletions(-)
lib/librte_ipsec/esp_inb.c +11 -2
@@ -464,6 +464,8 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const void *outh; +void *inh;/* * remove icv, esp trailer and high-order
@@ -489,9 +491,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outh = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + inh =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +/* update inner ip header */ +update_tun_inb_l3hdr (sa, outh, inh); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, - sa->hdr_l3_off,sqn_low16 (sqc)); +update_tun_outb_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, + mb->pkt_len - sqh_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +164 -4
187 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +10 -0
@@ -95,6 +95,8 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , RTE_SATP_LOG2_NUM };
@@ -123,6 +125,14 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +18 -0
@@ -214,6 +214,18 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_ESN_ENABLE ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; + +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; +/* interpret flags */ if (prm->flags &RTE_IPSEC_SAFLAG_SQN_ATOM ) tp |=RTE_IPSEC_SATP_SQN_ATOM ;
@@ -310,6 +322,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IP_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IP_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +12 -0
@@ -70,6 +70,18 @@ struct rte_ipv4_hdr {#define RTE_IPV4_HDR_OFFSET_UNITS 8 +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced)) +*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC) +/* * IPv4 address types */
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
Quoted 11 lines · Fan Zhang
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field
bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.Signed-off-by Marko Kovacevic <[email protected]>Signed-off-by Fan Zhang <[email protected]>Tested-by Konstantin Ananyev <[email protected]>---
[...]
Quoted 28 lines
lib/librte_ipsec/esp_outb.c +2
-2@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, - sa->hdr_l3_off,sqn_low16 (sqc)); +update_tun_outb_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, + mb->pkt_len - sqh_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);lib/librte_ipsec/iph.h +7
-0@@ -101,23 +101,183 @@ update_trs_l3hdr(const struct rte_ipsec_sa *sa, void *p, uint32_t plen,return rc; } +/* +* The masks for ipv6 header reconstruction (RFC4301) +*/ +#define IPV6_DSCP_MASK (RTE_IP_DSCP_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_ECN_MASK (RTE_IP_ECN_MASK << RTE_IPV6_HDR_TC_SHIFT) +#define IPV6_TOS_MASK (IPV6_ECN_MASK | IPV6_DSCP_MASK) +#define IPV6_ECN_CE IPV6_ECN_MASK
[...]
Quoted 11 lines
lib/librte_net/rte_ip.h +5
-0@@ -70,6 +70,18 @@ struct rte_ipv4_hdr {#define RTE_IPV4_HDR_OFFSET_UNITS 8 +/** +* RFC 3168 Explicit Congestion Notification (ECN) +* * ECT(1) (ECN-Capable Transport(1)) +* * ECT(0) (ECN-Capable Transport(0)) +* * ECT(CE)(CE (Congestion Experienced))
lib/librte_net/rte_ip.h struct rte_ipv4_hdr { · line 87
Quoted 10 lines
lib/librte_net/rte_ip.h +7
-0+*/ +#define RTE_IP_ECN_MASK (0x03) +#define RTE_IP_ECN_CE RTE_IP_ECN_MASK + +/** Packet Option Masks */ +#define RTE_IP_DSCP_MASK (0xFC) +/* * IPv4 address types */
Just a quick comment: these flags are also being added in librte_net by this patch:
https://mails.dpdk.org/archives/dev/2019-June/135444.html
Thanks,
Olivier
PATCH v6 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ 4 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -99,6 +99,12 @@ New Features Updated ``librte_telemetry`` to fetch the global metrics from the ``librte_metrics`` library. +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -991,6 +991,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (ss->flags ==TRANSPORT ) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (ss->flags ==IP4_TUNNEL ) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -61,7 +61,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +477 -0
477 lines not on this page · raw message
Signature · 1 line
2.14.5
Re: [dpdk-dev] [PATCH v6 0/2] ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangHi Fan,
This patchset need a rebase. As today we need to close the subtrees for RC1, this patchset will go in RC2.
Thanks,
Akhil
Quoted 48 lines
This patchset adds the ECN and DSCP tunnel mode header reconstruction support for
rte_ipseclibrary. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.v6:
-update_tun_tosfunction split for inbound/outbound.
- get/set ipv6 tc change from macro back to inline functions.v5:
- Fixed a checkpatch error.v4:
- Fixed a bug.
- Refrabricated the code a bit.v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstructiondoc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 477 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 168 +++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 12 + lib/librte_security/rte_security.h | 9 + 12 files changed, 715 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-
secgw/test/tun_null_header_reconstruct.py--
2.14.5
v7 cover ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangThis patchset adds the ECN and DSCP tunnel mode header reconstruction support for rte_ipsec library. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.
v7:
- rebased on top of latest dpdk-next-crypto.
v6:
- update_tun_tos function split for inbound/outbound.
- get/set ipv6 tc change from macro back to inline functions.
v5:
- Fixed a checkpatch error.
v4:
- Fixed a bug.
- Refrabricated the code a bit.
v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.
v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.
Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstruction
doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 479 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 164 ++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 2 + lib/librte_security/rte_security.h | 9 + 12 files changed, 703 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
Signature · 1 line
2.14.5
PATCH v7 1/2 lib/ipsec: add support for header construction
Add support for RFC 4301(5.1.2) to update of
Type of service field and Traffic class field
bits inside ipv4/ipv6 packets for outbound cases and inbound cases which deals with the update of the DSCP/ENC bits inside each of the fields.
--- lib/librte_ipsec/esp_inb.c | 13 ++- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 164 ++++++++++++++++++++++++++++++++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 +++ lib/librte_ipsec/sa.c | 18 ++++ lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 2 + lib/librte_security/rte_security.h | 9 ++ 8 files changed, 214 insertions(+), 8 deletions(-)
lib/librte_ipsec/esp_inb.c +11 -2
@@ -464,6 +464,8 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],uint32_t hl[num], to[num];struct esp_tail espt[num];struct rte_mbuf *ml[num]; +const void *outh; +void *inh;/* * remove icv, esp trailer and high-order
@@ -489,9 +491,16 @@ tun_process(const struct rte_ipsec_sa *sa, struct rte_mbuf *mb[],if (tun_process_check (mb[i], &ml[i], &to[i], espt[i], adj, tl, sa->proto) ==0 ) { + outh = rte_pktmbuf_mtod_offset(mb[i], uint8_t *, + mb[i]->l2_len); +/* modify packet's layout */ -tun_process_step2 (mb[i], ml[i], hl[i], adj, to[i], - tl, sqn + k); + inh =tun_process_step2 (mb[i], ml[i], hl[i], adj, + to[i], tl, sqn + k); + +/* update inner ip header */ +update_tun_inb_l3hdr (sa, outh, inh); +/* update mbuf's metadata */ tun_process_step3 (mb[i], sa->tx_offload.msk, sa->tx_offload.val);
lib/librte_ipsec/esp_outb.c +2 -2
@@ -152,8 +152,8 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,rte_memcpy (ph, sa->hdr, sa->hdr_len);/* update original and new ip header fields */ -update_tun_l3hdr (sa, ph + sa->hdr_l3_off, mb->pkt_len - sqh_len, - sa->hdr_l3_off,sqn_low16 (sqc)); +update_tun_outb_l3hdr (sa, ph + sa->hdr_l3_off, ph + hlen, + mb->pkt_len - sqh_len, sa->hdr_l3_off,sqn_low16 (sqc));/* update spi, seqn and iv */ esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
lib/librte_ipsec/iph.h +160 -4
183 lines not on this page · raw message
lib/librte_ipsec/rte_ipsec_sa.h +10 -0
@@ -95,6 +95,8 @@ enum {RTE_SATP_LOG2_MODE ,RTE_SATP_LOG2_SQN =RTE_SATP_LOG2_MODE +2 ,RTE_SATP_LOG2_ESN , +RTE_SATP_LOG2_ECN , +RTE_SATP_LOG2_DSCP , RTE_SATP_LOG2_NUM };
@@ -123,6 +125,14 @@ enum {#define RTE_IPSEC_SATP_ESN_DISABLE (0ULL << RTE_SATP_LOG2_ESN)#define RTE_IPSEC_SATP_ESN_ENABLE (1ULL << RTE_SATP_LOG2_ESN) +#define RTE_IPSEC_SATP_ECN_MASK (1ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_DISABLE (0ULL << RTE_SATP_LOG2_ECN) +#define RTE_IPSEC_SATP_ECN_ENABLE (1ULL << RTE_SATP_LOG2_ECN) + +#define RTE_IPSEC_SATP_DSCP_MASK (1ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_DISABLE (0ULL << RTE_SATP_LOG2_DSCP) +#define RTE_IPSEC_SATP_DSCP_ENABLE (1ULL << RTE_SATP_LOG2_DSCP) +/** * get type of given SA * @return
lib/librte_ipsec/sa.c +18 -0
@@ -214,6 +214,18 @@ fill_sa_type(const struct rte_ipsec_sa_prm *prm, uint64_t *type)else tp |=RTE_IPSEC_SATP_ESN_ENABLE ; +/* check for ECN flag */ +if (prm->ipsec_xform.options.ecn ==0 ) + tp |=RTE_IPSEC_SATP_ECN_DISABLE ; +else + tp |=RTE_IPSEC_SATP_ECN_ENABLE ; + +/* check for DSCP flag */ +if (prm->ipsec_xform.options.copy_dscp ==0 ) + tp |=RTE_IPSEC_SATP_DSCP_DISABLE ; +else + tp |=RTE_IPSEC_SATP_DSCP_ENABLE ; +/* interpret flags */ if (prm->flags &RTE_IPSEC_SAFLAG_SQN_ATOM ) tp |=RTE_IPSEC_SATP_SQN_ATOM ;
@@ -310,6 +322,12 @@ esp_sa_init(struct rte_ipsec_sa *sa, const struct rte_ipsec_sa_prm *prm,static const uint64_t msk =RTE_IPSEC_SATP_DIR_MASK |RTE_IPSEC_SATP_MODE_MASK ; +if (prm->ipsec_xform.options.ecn) + sa->tos_mask |=RTE_IPV4_HDR_ECN_MASK ; + +if (prm->ipsec_xform.options.copy_dscp) + sa->tos_mask |=RTE_IPV4_HDR_DSCP_MASK ; +if (cxf->aead !=NULL ) {switch (cxf->aead->algo) {case RTE_CRYPTO_AEAD_AES_GCM :
lib/librte_ipsec/sa.h +2 -0
@@ -10,6 +10,7 @@#define IPSEC_MAX_HDR_SIZE 64#define IPSEC_MAX_IV_SIZE 16#define IPSEC_MAX_IV_QWORD (IPSEC_MAX_IV_SIZE / sizeof(uint64_t)) +#define TUN_HDR_MSK (RTE_IPSEC_SATP_ECN_MASK | RTE_IPSEC_SATP_DSCP_MASK)/* padding alignment for different algorithms */ enum {
@@ -103,6 +104,7 @@ struct rte_ipsec_sa {uint8_t iv_ofs;/* offset for algo-specific IV inside crypto op */ uint8_t iv_len;uint8_t pad_align; +uint8_t tos_mask;/* template for tunnel header */ uint8_t hdr[IPSEC_MAX_HDR_SIZE ];
lib/librte_net/rte_ip.h +2 -0
@@ -61,6 +61,7 @@ struct rte_ipv4_hdr {/* Type of Service fields */ #define RTE_IPV4_HDR_DSCP_MASK (0xfc)#define RTE_IPV4_HDR_ECN_MASK (0x03) +#define RTE_IPV4_HDR_ECN_CE RTE_IPV4_HDR_ECN_MASK/* Fragment Offset * Flags. */ #define RTE_IPV4_HDR_DF_SHIFT 14
@@ -362,6 +363,7 @@ struct rte_ipv6_hdr {#define RTE_IPV6_HDR_TC_MASK (0xff << RTE_IPV6_HDR_TC_SHIFT)#define RTE_IPV6_HDR_DSCP_MASK (0xfc << RTE_IPV6_HDR_TC_SHIFT)#define RTE_IPV6_HDR_ECN_MASK (0x03 << RTE_IPV6_HDR_TC_SHIFT) +#define RTE_IPV6_HDR_ECN_CE RTE_IPV6_HDR_ECN_MASK/** * Process the pseudo-header checksum of an IPv6 header.
lib/librte_security/rte_security.h +9 -0
@@ -163,6 +163,15 @@ struct rte_security_ipsec_sa_options {* * 0: Inner packet is not modified. */ uint32_t dec_ttl : 1; + +/**< Explicit Congestion Notification (ECN) +* +* * 1: In tunnel mode, enable outer header ECN Field copied from +* inner header in tunnel encapsulation, or inner header ECN +* field construction in decapsulation. +* * 0: Inner/outer header are not modified. +*/ + uint32_t ecn : 1; };/** IPSec security association direction */
Signature · 1 line
2.14.5
PATCH v7 2/2 examples/ipsec-secgw: support header reconstruction
In reply to Fan ZhangThis patch updates the ipsec-secgw application to support header reconstruction. In addition a series of tests have been added to prove the implementation's correctness.
--- doc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 479 +++++++++++++++++++++ 4 files changed, 489 insertions(+), 1 deletion(-) create mode 100755 examples/ipsec-secgw/test/tun_null_header_reconstruct.py
doc/guides/rel_notes/release_19_08.rst +6 -0
@@ -128,6 +128,12 @@ New Features Added telemetry mode to l3fwd-power application to report application level busyness, empty and full polls of rte_eth_rx_burst(). +* **Updated IPSec library Header Reconstruction.** + + Updated the IPSec library with ECN and DSCP field header reconstruction + feature followed by RFC4301. The IPSec-secgw sample application is also + updated to support this feature by default. + Removed Items -------------
examples/ipsec-secgw/sa.c +2 -0
@@ -1063,6 +1063,8 @@ fill_ipsec_sa_prm(struct rte_ipsec_sa_prm *prm, const struct ipsec_sa *ss, prm->ipsec_xform.mode = (IS_TRANSPORT (ss->flags)) ?RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT :RTE_SECURITY_IPSEC_SA_MODE_TUNNEL ; + prm->ipsec_xform.options.ecn =1 ; + prm->ipsec_xform.options.copy_dscp =1 ;if (IS_IP4_TUNNEL (ss->flags)) { prm->ipsec_xform.tunnel.type =RTE_SECURITY_IPSEC_TUNNEL_IPV4 ;
examples/ipsec-secgw/test/run_test.sh +2 -1
@@ -64,7 +64,8 @@ trs_3descbc_sha1_old \ trs_3descbc_sha1_esn \ trs_3descbc_sha1_esn_atom" -PKT_TESTS="trs_ipv6opts" +PKT_TESTS="trs_ipv6opts \ +tun_null_header_reconstruct" DIR=$(dirname $0)
examples/ipsec-secgw/test/tun_null_header_reconstruct.py new file +479 -0
479 lines not on this page · raw message
Signature · 1 line
2.14.5
Akhil Goyal
AppliedRe: [dpdk-dev] [PATCH v7 0/2] ipsec: ECN and DSCP header reconstruction
In reply to Fan ZhangQuoted 48 lines
This patchset adds the ECN and DSCP tunnel mode header reconstruction support for
rte_ipseclibrary. The ipsec-secgw sample application is updated with the feature's enabling and a python3 script for testing the correctness of the implementation.v7:
- rebased on top of latest dpdk-next-crypto.v6:
-update_tun_tosfunction split for inbound/outbound.
- get/set ipv6 tc change from macro back to inline functions.v5:
- Fixed a checkpatch error.v4:
- Fixed a bug.
- Refrabricated the code a bit.v3:
- Rebased on top of latest dpdk-next-crypto.
- Updated the library with individual header reconstruction function.v2:
- Fixed a few bugs.
- Updated according to Konstantin's comments.
- Added python script for testing.Fan Zhang (2):
lib/ipsec: add support for header construction examples/ipsec-secgw: support header reconstructiondoc/guides/rel_notes/release_19_08.rst | 6 + examples/ipsec-secgw/sa.c | 2 + examples/ipsec-secgw/test/run_test.sh | 3 +- .../test/tun_null_header_reconstruct.py | 479 +++++++++++++++++++++ lib/librte_ipsec/esp_inb.c | 13 +- lib/librte_ipsec/esp_outb.c | 4 +- lib/librte_ipsec/iph.h | 164 ++++++- lib/librte_ipsec/rte_ipsec_sa.h | 10 + lib/librte_ipsec/sa.c | 18 + lib/librte_ipsec/sa.h | 2 + lib/librte_net/rte_ip.h | 2 + lib/librte_security/rte_security.h | 9 + 12 files changed, 703 insertions(+), 9 deletions(-) create mode 100755 examples/ipsec-
Quoted 4 lines
secgw/test/tun_null_header_reconstruct.py--
2.14.5
Applied to dpdk-next-crypto
Thanks.