#include "otx2_common.h"
#include "otx2_ethdev_sec.h"
+#include "otx2_ipsec_anti_replay.h"
#include "otx2_ipsec_fp.h"
/* Default mark value used when none is provided. */
/* Inline IPsec offsets */
-#define INLINE_INB_RPTR_HDR 16
/* nix_cqe_hdr_s + nix_rx_parse_s + nix_rx_sg_s + nix_iova_s */
#define INLINE_CPT_RESULT_OFFSET 80
uint64_t rx_tstamp;
rte_iova_t tx_tstamp_iova;
uint64_t *tx_tstamp;
+ uint64_t rx_tstamp_dynflag;
+ int tstamp_dynfield_offset;
uint8_t tx_ready;
uint8_t rx_ready;
} __rte_cache_aligned;
uint64_t value;
};
+static inline rte_mbuf_timestamp_t *
+otx2_timestamp_dynfield(struct rte_mbuf *mbuf,
+ struct otx2_timesync_info *info)
+{
+ return RTE_MBUF_DYNFIELD(mbuf,
+ info->tstamp_dynfield_offset, rte_mbuf_timestamp_t *);
+}
+
static __rte_always_inline void
otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
struct otx2_timesync_info *tstamp, const uint16_t flag,
/* Reading the rx timestamp inserted by CGX, viz at
* starting of the packet data.
*/
- mbuf->timestamp = rte_be_to_cpu_64(*tstamp_ptr);
- /* PKT_RX_IEEE1588_TMST flag needs to be set only in case
+ *otx2_timestamp_dynfield(mbuf, tstamp) =
+ rte_be_to_cpu_64(*tstamp_ptr);
+ /* RTE_MBUF_F_RX_IEEE1588_TMST flag needs to be set only in case
* PTP packets are received.
*/
if (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {
- tstamp->rx_tstamp = mbuf->timestamp;
+ tstamp->rx_tstamp =
+ *otx2_timestamp_dynfield(mbuf, tstamp);
tstamp->rx_ready = 1;
- mbuf->ol_flags |= PKT_RX_IEEE1588_PTP |
- PKT_RX_IEEE1588_TMST | PKT_RX_TIMESTAMP;
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP |
+ RTE_MBUF_F_RX_IEEE1588_TMST |
+ tstamp->rx_tstamp_dynflag;
}
}
}
* 0 to OTX2_FLOW_ACTION_FLAG_DEFAULT - 2
*/
if (likely(match_id)) {
- ol_flags |= PKT_RX_FDIR;
+ ol_flags |= RTE_MBUF_F_RX_FDIR;
if (match_id != OTX2_FLOW_ACTION_FLAG_DEFAULT) {
- ol_flags |= PKT_RX_FDIR_ID;
+ ol_flags |= RTE_MBUF_F_RX_FDIR_ID;
mbuf->hash.fdir.hi = match_id - 1;
}
}
iova_list = (const rte_iova_t *)(iova_list + 1);
}
}
+ mbuf->next = NULL;
}
static __rte_always_inline uint16_t
}
static __rte_always_inline uint64_t
-nix_rx_sec_mbuf_update(const struct nix_cqe_hdr_s *cq, struct rte_mbuf *m,
+nix_rx_sec_mbuf_update(const struct nix_rx_parse_s *rx,
+ const struct nix_cqe_hdr_s *cq, struct rte_mbuf *m,
const void * const lookup_mem)
{
+ uint8_t *l2_ptr, *l3_ptr, *l2_ptr_actual, *l3_ptr_actual;
struct otx2_ipsec_fp_in_sa *sa;
- struct rte_ipv4_hdr *ipv4;
- uint16_t m_len;
+ uint16_t m_len, l2_len, ip_len;
+ struct rte_ipv6_hdr *ip6h;
+ struct rte_ipv4_hdr *iph;
+ uint16_t *ether_type;
uint32_t spi;
- char *data;
+ int i;
if (unlikely(nix_rx_sec_cptres_get(cq) != OTX2_SEC_COMP_GOOD))
- return PKT_RX_SEC_OFFLOAD | PKT_RX_SEC_OFFLOAD_FAILED;
+ return RTE_MBUF_F_RX_SEC_OFFLOAD | RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
/* 20 bits of tag would have the SPI */
spi = cq->tag & 0xFFFFF;
sa = nix_rx_sec_sa_get(lookup_mem, spi, m->port);
- m->udata64 = (uint64_t)sa->userdata;
+ *rte_security_dynfield(m) = sa->udata64;
+
+ l2_ptr = rte_pktmbuf_mtod(m, uint8_t *);
+ l2_len = rx->lcptr - rx->laptr;
+ l3_ptr = RTE_PTR_ADD(l2_ptr, l2_len);
+
+ if (sa->replay_win_sz) {
+ if (cpt_ipsec_ip_antireplay_check(sa, l3_ptr) < 0)
+ return RTE_MBUF_F_RX_SEC_OFFLOAD | RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
+ }
+
+ l2_ptr_actual = RTE_PTR_ADD(l2_ptr,
+ sizeof(struct otx2_ipsec_fp_res_hdr));
+ l3_ptr_actual = RTE_PTR_ADD(l3_ptr,
+ sizeof(struct otx2_ipsec_fp_res_hdr));
- data = rte_pktmbuf_mtod(m, char *);
- memcpy(data + INLINE_INB_RPTR_HDR, data, RTE_ETHER_HDR_LEN);
+ for (i = l2_len - RTE_ETHER_TYPE_LEN - 1; i >= 0; i--)
+ l2_ptr_actual[i] = l2_ptr[i];
- m->data_off += INLINE_INB_RPTR_HDR;
+ m->data_off += sizeof(struct otx2_ipsec_fp_res_hdr);
- ipv4 = (struct rte_ipv4_hdr *)(data + INLINE_INB_RPTR_HDR +
- RTE_ETHER_HDR_LEN);
+ ether_type = RTE_PTR_SUB(l3_ptr_actual, RTE_ETHER_TYPE_LEN);
- m_len = rte_be_to_cpu_16(ipv4->total_length) + RTE_ETHER_HDR_LEN;
+ iph = (struct rte_ipv4_hdr *)l3_ptr_actual;
+ if ((iph->version_ihl >> 4) == 4) {
+ ip_len = rte_be_to_cpu_16(iph->total_length);
+ *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
+ } else {
+ ip6h = (struct rte_ipv6_hdr *)iph;
+ ip_len = rte_be_to_cpu_16(ip6h->payload_len);
+ *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6);
+ }
+ m_len = ip_len + l2_len;
m->data_len = m_len;
m->pkt_len = m_len;
- return PKT_RX_SEC_OFFLOAD;
+ return RTE_MBUF_F_RX_SEC_OFFLOAD;
}
static __rte_always_inline void
if (flag & NIX_RX_OFFLOAD_RSS_F) {
mbuf->hash.rss = tag;
- ol_flags |= PKT_RX_RSS_HASH;
+ ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
}
if (flag & NIX_RX_OFFLOAD_CHECKSUM_F)
if (flag & NIX_RX_OFFLOAD_VLAN_STRIP_F) {
if (rx->vtag0_gone) {
- ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+ ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
mbuf->vlan_tci = rx->vtag0_tci;
}
if (rx->vtag1_gone) {
- ol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;
+ ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;
mbuf->vlan_tci_outer = rx->vtag1_tci;
}
}
if ((flag & NIX_RX_OFFLOAD_SECURITY_F) &&
cq->cqe_type == NIX_XQE_TYPE_RX_IPSECH) {
*(uint64_t *)(&mbuf->rearm_data) = val;
- ol_flags |= nix_rx_sec_mbuf_update(cq, mbuf, lookup_mem);
+ ol_flags |= nix_rx_sec_mbuf_update(rx, cq, mbuf, lookup_mem);
mbuf->ol_flags = ol_flags;
return;
}
*(uint64_t *)(&mbuf->rearm_data) = val;
mbuf->pkt_len = len;
- if (flag & NIX_RX_MULTI_SEG_F)
+ if (flag & NIX_RX_MULTI_SEG_F) {
nix_cqe_xtract_mseg(rx, mbuf, val);
- else
+ } else {
mbuf->data_len = len;
+ mbuf->next = NULL;
+ }
}
#define CKSUM_F NIX_RX_OFFLOAD_CHECKSUM_F
git.droids-corp.org / dpdk.git / blobdiff