#include <rte_esp.h>
#include <rte_tcp.h>
#include <rte_udp.h>
+#include <rte_vxlan.h>
#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>
struct lb_data {
uint32_t out[RTE_TABLE_ACTION_LB_TABLE_SIZE];
-} __attribute__((__packed__));
+} __rte_packed;
static int
lb_apply(struct lb_data *data,
struct mtr_trtcm_data {
struct rte_meter_trtcm trtcm;
- uint64_t stats[e_RTE_METER_COLORS];
-} __attribute__((__packed__));
+ uint64_t stats[RTE_COLORS];
+} __rte_packed;
#define MTR_TRTCM_DATA_METER_PROFILE_ID_GET(data) \
- (((data)->stats[e_RTE_METER_GREEN] & 0xF8LLU) >> 3)
+ (((data)->stats[RTE_COLOR_GREEN] & 0xF8LLU) >> 3)
static void
mtr_trtcm_data_meter_profile_id_set(struct mtr_trtcm_data *data,
uint32_t profile_id)
{
- data->stats[e_RTE_METER_GREEN] &= ~0xF8LLU;
- data->stats[e_RTE_METER_GREEN] |= (profile_id % 32) << 3;
+ data->stats[RTE_COLOR_GREEN] &= ~0xF8LLU;
+ data->stats[RTE_COLOR_GREEN] |= (profile_id % 32) << 3;
}
#define MTR_TRTCM_DATA_POLICER_ACTION_DROP_GET(data, color)\
(((data)->stats[(color)] & 4LLU) >> 2)
#define MTR_TRTCM_DATA_POLICER_ACTION_COLOR_GET(data, color)\
- ((enum rte_meter_color)((data)->stats[(color)] & 3LLU))
+ ((enum rte_color)((data)->stats[(color)] & 3LLU))
static void
mtr_trtcm_data_policer_action_set(struct mtr_trtcm_data *data,
- enum rte_meter_color color,
+ enum rte_color color,
enum rte_table_action_policer action)
{
if (action == RTE_TABLE_ACTION_POLICER_DROP) {
static uint64_t
mtr_trtcm_data_stats_get(struct mtr_trtcm_data *data,
- enum rte_meter_color color)
+ enum rte_color color)
{
return data->stats[color] >> 8;
}
static void
mtr_trtcm_data_stats_reset(struct mtr_trtcm_data *data,
- enum rte_meter_color color)
+ enum rte_color color)
{
data->stats[color] &= 0xFFLU;
}
}
struct dscp_table_entry_data {
- enum rte_meter_color color;
+ enum rte_color color;
uint16_t tc;
uint16_t tc_queue;
};
/* Policer actions */
mtr_trtcm_data_policer_action_set(data_tc,
- e_RTE_METER_GREEN,
- p_tc->policer[e_RTE_METER_GREEN]);
+ RTE_COLOR_GREEN,
+ p_tc->policer[RTE_COLOR_GREEN]);
mtr_trtcm_data_policer_action_set(data_tc,
- e_RTE_METER_YELLOW,
- p_tc->policer[e_RTE_METER_YELLOW]);
+ RTE_COLOR_YELLOW,
+ p_tc->policer[RTE_COLOR_YELLOW]);
mtr_trtcm_data_policer_action_set(data_tc,
- e_RTE_METER_RED,
- p_tc->policer[e_RTE_METER_RED]);
+ RTE_COLOR_RED,
+ p_tc->policer[RTE_COLOR_RED]);
}
return 0;
{
uint64_t drop_mask;
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
- enum rte_meter_color color_in, color_meter, color_policer;
+ enum rte_color color_in, color_meter, color_policer;
uint32_t tc, mp_id;
tc = dscp_entry->tc;
struct tm_data {
uint32_t queue_id;
uint32_t reserved;
-} __attribute__((__packed__));
+} __rte_packed;
static int
tm_apply_check(struct rte_table_action_tm_params *p,
{
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
uint32_t queue_id = data->queue_id |
- (dscp_entry->tc << 2) |
dscp_entry->tc_queue;
rte_mbuf_sched_set(mbuf, queue_id, dscp_entry->tc,
(uint8_t)dscp_entry->color);
}
struct encap_ether_data {
- struct ether_hdr ether;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+};
#define VLAN(pcp, dei, vid) \
((uint16_t)((((uint64_t)(pcp)) & 0x7LLU) << 13) | \
(((uint64_t)(vid)) & 0xFFFLLU)) \
struct encap_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
+};
struct encap_qinq_data {
- struct ether_hdr ether;
- struct vlan_hdr svlan;
- struct vlan_hdr cvlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr svlan;
+ struct rte_vlan_hdr cvlan;
+};
#define ETHER_TYPE_MPLS_UNICAST 0x8847
(((uint64_t)(ttl)) & 0xFFLLU)))
struct encap_mpls_data {
- struct ether_hdr ether;
+ struct rte_ether_hdr ether;
uint32_t mpls[RTE_TABLE_ACTION_MPLS_LABELS_MAX];
uint32_t mpls_count;
-} __attribute__((__packed__));
-
-#define ETHER_TYPE_PPPOE_SESSION 0x8864
+} __rte_packed __rte_aligned(2);
#define PPP_PROTOCOL_IP 0x0021
uint16_t session_id;
uint16_t length;
uint16_t protocol;
-} __attribute__((__packed__));
+};
struct encap_pppoe_data {
- struct ether_hdr ether;
+ struct rte_ether_hdr ether;
struct pppoe_ppp_hdr pppoe_ppp;
-} __attribute__((__packed__));
+};
#define IP_PROTO_UDP 17
struct encap_vxlan_ipv4_data {
- struct ether_hdr ether;
- struct ipv4_hdr ipv4;
- struct udp_hdr udp;
- struct vxlan_hdr vxlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_ipv4_hdr ipv4;
+ struct rte_udp_hdr udp;
+ struct rte_vxlan_hdr vxlan;
+} __rte_packed __rte_aligned(2);
struct encap_vxlan_ipv4_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
- struct ipv4_hdr ipv4;
- struct udp_hdr udp;
- struct vxlan_hdr vxlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
+ struct rte_ipv4_hdr ipv4;
+ struct rte_udp_hdr udp;
+ struct rte_vxlan_hdr vxlan;
+} __rte_packed __rte_aligned(2);
struct encap_vxlan_ipv6_data {
- struct ether_hdr ether;
- struct ipv6_hdr ipv6;
- struct udp_hdr udp;
- struct vxlan_hdr vxlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_ipv6_hdr ipv6;
+ struct rte_udp_hdr udp;
+ struct rte_vxlan_hdr vxlan;
+} __rte_packed __rte_aligned(2);
struct encap_vxlan_ipv6_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
- struct ipv6_hdr ipv6;
- struct udp_hdr udp;
- struct vxlan_hdr vxlan;
-} __attribute__((__packed__));
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
+ struct rte_ipv6_hdr ipv6;
+ struct rte_udp_hdr udp;
+ struct rte_vxlan_hdr vxlan;
+} __rte_packed __rte_aligned(2);
struct encap_qinq_pppoe_data {
- struct ether_hdr ether;
- struct vlan_hdr svlan;
- struct vlan_hdr cvlan;
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr svlan;
+ struct rte_vlan_hdr cvlan;
struct pppoe_ppp_hdr pppoe_ppp;
-} __attribute__((__packed__));
+} __rte_packed __rte_aligned(2);
static size_t
encap_data_size(struct rte_table_action_encap_config *encap)
{
struct encap_ether_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- ETHER_TYPE_IPv4 :
- ETHER_TYPE_IPv6;
+ RTE_ETHER_TYPE_IPV4 :
+ RTE_ETHER_TYPE_IPV6;
/* Ethernet */
- ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr);
+ rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr);
d->ether.ether_type = rte_htons(ethertype);
return 0;
{
struct encap_vlan_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- ETHER_TYPE_IPv4 :
- ETHER_TYPE_IPv6;
+ RTE_ETHER_TYPE_IPV4 :
+ RTE_ETHER_TYPE_IPV6;
/* Ethernet */
- ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
+ rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN);
/* VLAN */
d->vlan.vlan_tci = rte_htons(VLAN(p->vlan.vlan.pcp,
{
struct encap_qinq_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- ETHER_TYPE_IPv4 :
- ETHER_TYPE_IPv6;
+ RTE_ETHER_TYPE_IPV4 :
+ RTE_ETHER_TYPE_IPV6;
/* Ethernet */
- ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_QINQ);
+ rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_QINQ);
/* SVLAN */
d->svlan.vlan_tci = rte_htons(VLAN(p->qinq.svlan.pcp,
p->qinq.svlan.dei,
p->qinq.svlan.vid));
- d->svlan.eth_proto = rte_htons(ETHER_TYPE_VLAN);
+ d->svlan.eth_proto = rte_htons(RTE_ETHER_TYPE_VLAN);
/* CVLAN */
d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,
struct encap_qinq_pppoe_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
+ rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN);
/* SVLAN */
d->svlan.vlan_tci = rte_htons(VLAN(p->qinq.svlan.pcp,
p->qinq.svlan.dei,
p->qinq.svlan.vid));
- d->svlan.eth_proto = rte_htons(ETHER_TYPE_VLAN);
+ d->svlan.eth_proto = rte_htons(RTE_ETHER_TYPE_VLAN);
/* CVLAN */
d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,
p->qinq.cvlan.dei,
p->qinq.cvlan.vid));
- d->cvlan.eth_proto = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+ d->cvlan.eth_proto = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
uint32_t i;
/* Ethernet */
- ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr);
+ rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr);
d->ether.ether_type = rte_htons(ethertype);
/* MPLS */
struct encap_pppoe_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+ rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
+ rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
struct encap_vxlan_ipv4_vlan_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
+ rte_ether_addr_copy(&p->vxlan.ether.da,
+ &d->ether.d_addr);
+ rte_ether_addr_copy(&p->vxlan.ether.sa,
+ &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN);
/* VLAN */
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
- d->vlan.eth_proto = rte_htons(ETHER_TYPE_IPv4);
+ d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IPV4);
/* IPv4*/
d->ipv4.version_ihl = 0x45;
struct encap_vxlan_ipv4_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_IPv4);
+ rte_ether_addr_copy(&p->vxlan.ether.da,
+ &d->ether.d_addr);
+ rte_ether_addr_copy(&p->vxlan.ether.sa,
+ &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV4);
/* IPv4*/
d->ipv4.version_ihl = 0x45;
struct encap_vxlan_ipv6_vlan_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_VLAN);
+ rte_ether_addr_copy(&p->vxlan.ether.da,
+ &d->ether.d_addr);
+ rte_ether_addr_copy(&p->vxlan.ether.sa,
+ &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN);
/* VLAN */
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
- d->vlan.eth_proto = rte_htons(ETHER_TYPE_IPv6);
+ d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IPV6);
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |
struct encap_vxlan_ipv6_data *d = data;
/* Ethernet */
- ether_addr_copy(&p->vxlan.ether.da, &d->ether.d_addr);
- ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_IPv6);
+ rte_ether_addr_copy(&p->vxlan.ether.da,
+ &d->ether.d_addr);
+ rte_ether_addr_copy(&p->vxlan.ether.sa,
+ &d->ether.s_addr);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV6);
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |
ether_length = (uint16_t)mbuf->pkt_len;
ipv4_total_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr) +
- sizeof(struct ipv4_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr) +
+ sizeof(struct rte_ipv4_hdr));
ipv4_hdr_cksum = encap_vxlan_ipv4_checksum_update(vxlan_tbl->ipv4.hdr_checksum,
rte_htons(ipv4_total_length));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
vxlan_pkt->ipv4.total_length = rte_htons(ipv4_total_length);
ether_length = (uint16_t)mbuf->pkt_len;
ipv4_total_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr) +
- sizeof(struct ipv4_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr) +
+ sizeof(struct rte_ipv4_hdr));
ipv4_hdr_cksum = encap_vxlan_ipv4_checksum_update(vxlan_tbl->ipv4.hdr_checksum,
rte_htons(ipv4_total_length));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
vxlan_pkt->ipv4.total_length = rte_htons(ipv4_total_length);
ether_length = (uint16_t)mbuf->pkt_len;
ipv6_payload_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
vxlan_pkt->ipv6.payload_len = rte_htons(ipv6_payload_length);
ether_length = (uint16_t)mbuf->pkt_len;
ipv6_payload_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
- sizeof(struct udp_hdr));
+ (sizeof(struct rte_vxlan_hdr) +
+ sizeof(struct rte_udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
vxlan_pkt->ipv6.payload_len = rte_htons(ipv6_payload_length);
case 1LLU << RTE_TABLE_ACTION_ENCAP_MPLS:
{
struct encap_mpls_data *mpls = data;
- size_t size = sizeof(struct ether_hdr) +
+ size_t size = sizeof(struct rte_ether_hdr) +
mpls->mpls_count * 4;
encap(ip, data, size);
struct nat_ipv4_data {
uint32_t addr;
uint16_t port;
-} __attribute__((__packed__));
+} __rte_packed;
struct nat_ipv6_data {
uint8_t addr[16];
uint16_t port;
-} __attribute__((__packed__));
+} __rte_packed;
static size_t
nat_data_size(struct rte_table_action_nat_config *nat __rte_unused,
}
static __rte_always_inline void
-pkt_ipv4_work_nat(struct ipv4_hdr *ip,
+pkt_ipv4_work_nat(struct rte_ipv4_hdr *ip,
struct nat_ipv4_data *data,
struct rte_table_action_nat_config *cfg)
{
if (cfg->source_nat) {
if (cfg->proto == 0x6) {
- struct tcp_hdr *tcp = (struct tcp_hdr *) &ip[1];
+ struct rte_tcp_hdr *tcp = (struct rte_tcp_hdr *) &ip[1];
uint16_t ip_cksum, tcp_cksum;
ip_cksum = nat_ipv4_checksum_update(ip->hdr_checksum,
tcp->src_port = data->port;
tcp->cksum = tcp_cksum;
} else {
- struct udp_hdr *udp = (struct udp_hdr *) &ip[1];
+ struct rte_udp_hdr *udp = (struct rte_udp_hdr *) &ip[1];
uint16_t ip_cksum, udp_cksum;
ip_cksum = nat_ipv4_checksum_update(ip->hdr_checksum,
}
} else {
if (cfg->proto == 0x6) {
- struct tcp_hdr *tcp = (struct tcp_hdr *) &ip[1];
+ struct rte_tcp_hdr *tcp = (struct rte_tcp_hdr *) &ip[1];
uint16_t ip_cksum, tcp_cksum;
ip_cksum = nat_ipv4_checksum_update(ip->hdr_checksum,
tcp->dst_port = data->port;
tcp->cksum = tcp_cksum;
} else {
- struct udp_hdr *udp = (struct udp_hdr *) &ip[1];
+ struct rte_udp_hdr *udp = (struct rte_udp_hdr *) &ip[1];
uint16_t ip_cksum, udp_cksum;
ip_cksum = nat_ipv4_checksum_update(ip->hdr_checksum,
}
static __rte_always_inline void
-pkt_ipv6_work_nat(struct ipv6_hdr *ip,
+pkt_ipv6_work_nat(struct rte_ipv6_hdr *ip,
struct nat_ipv6_data *data,
struct rte_table_action_nat_config *cfg)
{
if (cfg->source_nat) {
if (cfg->proto == 0x6) {
- struct tcp_hdr *tcp = (struct tcp_hdr *) &ip[1];
+ struct rte_tcp_hdr *tcp = (struct rte_tcp_hdr *) &ip[1];
uint16_t tcp_cksum;
tcp_cksum = nat_ipv6_tcp_udp_checksum_update(tcp->cksum,
tcp->src_port = data->port;
tcp->cksum = tcp_cksum;
} else {
- struct udp_hdr *udp = (struct udp_hdr *) &ip[1];
+ struct rte_udp_hdr *udp = (struct rte_udp_hdr *) &ip[1];
uint16_t udp_cksum;
udp_cksum = nat_ipv6_tcp_udp_checksum_update(udp->dgram_cksum,
}
} else {
if (cfg->proto == 0x6) {
- struct tcp_hdr *tcp = (struct tcp_hdr *) &ip[1];
+ struct rte_tcp_hdr *tcp = (struct rte_tcp_hdr *) &ip[1];
uint16_t tcp_cksum;
tcp_cksum = nat_ipv6_tcp_udp_checksum_update(tcp->cksum,
tcp->dst_port = data->port;
tcp->cksum = tcp_cksum;
} else {
- struct udp_hdr *udp = (struct udp_hdr *) &ip[1];
+ struct rte_udp_hdr *udp = (struct rte_udp_hdr *) &ip[1];
uint16_t udp_cksum;
udp_cksum = nat_ipv6_tcp_udp_checksum_update(udp->dgram_cksum,
struct ttl_data {
uint32_t n_packets;
-} __attribute__((__packed__));
+} __rte_packed;
#define TTL_INIT(data, decrement) \
((data)->n_packets = (decrement) ? 1 : 0)
}
static __rte_always_inline uint64_t
-pkt_ipv4_work_ttl(struct ipv4_hdr *ip,
+pkt_ipv4_work_ttl(struct rte_ipv4_hdr *ip,
struct ttl_data *data)
{
uint32_t drop;
}
static __rte_always_inline uint64_t
-pkt_ipv6_work_ttl(struct ipv6_hdr *ip,
+pkt_ipv6_work_ttl(struct rte_ipv6_hdr *ip,
struct ttl_data *data)
{
uint32_t drop;
struct stats_data {
uint64_t n_packets;
uint64_t n_bytes;
-} __attribute__((__packed__));
+} __rte_packed;
static int
stats_apply(struct stats_data *data,
*/
struct time_data {
uint64_t time;
-} __attribute__((__packed__));
+} __rte_packed;
static int
time_apply(struct time_data *data,
/** Private data size to store cipher iv / aad. */
uint8_t iv_aad_data[32];
-} __attribute__((__packed__));
+} __rte_packed;
static int
sym_crypto_cfg_check(struct rte_table_action_sym_crypto_config *cfg)
*/
struct tag_data {
uint32_t tag;
-} __attribute__((__packed__));
+} __rte_packed;
static int
tag_apply(struct tag_data *data,
*/
struct decap_data {
uint16_t n;
-} __attribute__((__packed__));
+} __rte_packed;
static int
decap_apply(struct decap_data *data,
if ((tc_mask & (1 << i)) == 0)
continue;
- dst->n_packets[e_RTE_METER_GREEN] =
- mtr_trtcm_data_stats_get(src, e_RTE_METER_GREEN);
+ dst->n_packets[RTE_COLOR_GREEN] =
+ mtr_trtcm_data_stats_get(src, RTE_COLOR_GREEN);
- dst->n_packets[e_RTE_METER_YELLOW] =
- mtr_trtcm_data_stats_get(src, e_RTE_METER_YELLOW);
+ dst->n_packets[RTE_COLOR_YELLOW] =
+ mtr_trtcm_data_stats_get(src, RTE_COLOR_YELLOW);
- dst->n_packets[e_RTE_METER_RED] =
- mtr_trtcm_data_stats_get(src, e_RTE_METER_RED);
+ dst->n_packets[RTE_COLOR_RED] =
+ mtr_trtcm_data_stats_get(src, RTE_COLOR_RED);
dst->n_packets_valid = 1;
dst->n_bytes_valid = 0;
if ((tc_mask & (1 << i)) == 0)
continue;
- mtr_trtcm_data_stats_reset(src, e_RTE_METER_GREEN);
- mtr_trtcm_data_stats_reset(src, e_RTE_METER_YELLOW);
- mtr_trtcm_data_stats_reset(src, e_RTE_METER_RED);
+ mtr_trtcm_data_stats_reset(src, RTE_COLOR_GREEN);
+ mtr_trtcm_data_stats_reset(src, RTE_COLOR_YELLOW);
+ mtr_trtcm_data_stats_reset(src, RTE_COLOR_RED);
}
uint16_t total_length;
if (cfg->common.ip_version) {
- struct ipv4_hdr *hdr = ip;
+ struct rte_ipv4_hdr *hdr = ip;
dscp = hdr->type_of_service >> 2;
total_length = rte_ntohs(hdr->total_length);
} else {
- struct ipv6_hdr *hdr = ip;
+ struct rte_ipv6_hdr *hdr = ip;
dscp = (rte_ntohl(hdr->vtc_flow) & 0x0F600000) >> 18;
- total_length =
- rte_ntohs(hdr->payload_len) + sizeof(struct ipv6_hdr);
+ total_length = rte_ntohs(hdr->payload_len) +
+ sizeof(struct rte_ipv6_hdr);
}
if (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) {
uint16_t total_length0, total_length1, total_length2, total_length3;
if (cfg->common.ip_version) {
- struct ipv4_hdr *hdr0 = ip0;
- struct ipv4_hdr *hdr1 = ip1;
- struct ipv4_hdr *hdr2 = ip2;
- struct ipv4_hdr *hdr3 = ip3;
+ struct rte_ipv4_hdr *hdr0 = ip0;
+ struct rte_ipv4_hdr *hdr1 = ip1;
+ struct rte_ipv4_hdr *hdr2 = ip2;
+ struct rte_ipv4_hdr *hdr3 = ip3;
dscp0 = hdr0->type_of_service >> 2;
dscp1 = hdr1->type_of_service >> 2;
total_length2 = rte_ntohs(hdr2->total_length);
total_length3 = rte_ntohs(hdr3->total_length);
} else {
- struct ipv6_hdr *hdr0 = ip0;
- struct ipv6_hdr *hdr1 = ip1;
- struct ipv6_hdr *hdr2 = ip2;
- struct ipv6_hdr *hdr3 = ip3;
+ struct rte_ipv6_hdr *hdr0 = ip0;
+ struct rte_ipv6_hdr *hdr1 = ip1;
+ struct rte_ipv6_hdr *hdr2 = ip2;
+ struct rte_ipv6_hdr *hdr3 = ip3;
dscp0 = (rte_ntohl(hdr0->vtc_flow) & 0x0F600000) >> 18;
dscp1 = (rte_ntohl(hdr1->vtc_flow) & 0x0F600000) >> 18;
dscp2 = (rte_ntohl(hdr2->vtc_flow) & 0x0F600000) >> 18;
dscp3 = (rte_ntohl(hdr3->vtc_flow) & 0x0F600000) >> 18;
- total_length0 =
- rte_ntohs(hdr0->payload_len) + sizeof(struct ipv6_hdr);
- total_length1 =
- rte_ntohs(hdr1->payload_len) + sizeof(struct ipv6_hdr);
- total_length2 =
- rte_ntohs(hdr2->payload_len) + sizeof(struct ipv6_hdr);
- total_length3 =
- rte_ntohs(hdr3->payload_len) + sizeof(struct ipv6_hdr);
+ total_length0 = rte_ntohs(hdr0->payload_len) +
+ sizeof(struct rte_ipv6_hdr);
+ total_length1 = rte_ntohs(hdr1->payload_len) +
+ sizeof(struct rte_ipv6_hdr);
+ total_length2 = rte_ntohs(hdr2->payload_len) +
+ sizeof(struct rte_ipv6_hdr);
+ total_length3 = rte_ntohs(hdr3->payload_len) +
+ sizeof(struct rte_ipv6_hdr);
}
if (cfg->action_mask & (1LLU << RTE_TABLE_ACTION_LB)) {
git.droids-corp.org / dpdk.git / blobdiff