return 0;
}
-#define MBUF_SCHED_QUEUE_TC_COLOR(queue, tc, color) \
- ((uint16_t)((((uint64_t)(queue)) & 0x3) | \
- ((((uint64_t)(tc)) & 0x3) << 2) | \
- ((((uint64_t)(color)) & 0x3) << 4)))
-
-#define MBUF_SCHED_COLOR(sched, color) \
- (((sched) & (~0x30LLU)) | ((color) << 4))
-
struct mtr_trtcm_data {
struct rte_meter_trtcm trtcm;
- uint64_t stats[e_RTE_METER_COLORS];
+ uint64_t stats[RTE_COLORS];
} __attribute__((__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 queue_tc_color;
+ uint16_t tc_queue;
};
struct dscp_table_data {
/* 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;
uint32_t dscp,
uint16_t total_length)
{
- uint64_t drop_mask, sched;
- uint64_t *sched_ptr = (uint64_t *) &mbuf->hash.sched;
+ 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;
color_in = dscp_entry->color;
data += tc;
mp_id = MTR_TRTCM_DATA_METER_PROFILE_ID_GET(data);
- sched = *sched_ptr;
/* Meter */
color_meter = rte_meter_trtcm_color_aware_check(
drop_mask = MTR_TRTCM_DATA_POLICER_ACTION_DROP_GET(data, color_meter);
color_policer =
MTR_TRTCM_DATA_POLICER_ACTION_COLOR_GET(data, color_meter);
- *sched_ptr = MBUF_SCHED_COLOR(sched, color_policer);
+ rte_mbuf_sched_color_set(mbuf, (uint8_t)color_policer);
return drop_mask;
}
}
struct tm_data {
- uint16_t queue_tc_color;
- uint16_t subport;
- uint32_t pipe;
+ uint32_t queue_id;
+ uint32_t reserved;
} __attribute__((__packed__));
static int
return status;
/* Apply */
- data->queue_tc_color = 0;
- data->subport = (uint16_t) p->subport_id;
- data->pipe = p->pipe_id;
+ data->queue_id = p->subport_id <<
+ (__builtin_ctz(cfg->n_pipes_per_subport) + 4) |
+ p->pipe_id << 4;
return 0;
}
uint32_t dscp)
{
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
- struct tm_data *sched_ptr = (struct tm_data *) &mbuf->hash.sched;
- struct tm_data sched;
-
- sched = *data;
- sched.queue_tc_color = dscp_entry->queue_tc_color;
- *sched_ptr = sched;
+ 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);
}
/**
case RTE_TABLE_ACTION_ENCAP_MPLS:
case RTE_TABLE_ACTION_ENCAP_PPPOE:
case RTE_TABLE_ACTION_ENCAP_VXLAN:
+ case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:
return 1;
default:
return 0;
}
struct encap_ether_data {
- struct ether_hdr ether;
+ struct rte_ether_hdr ether;
} __attribute__((__packed__));
#define VLAN(pcp, dei, vid) \
(((uint64_t)(vid)) & 0xFFFLLU)) \
struct encap_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
} __attribute__((__packed__));
struct encap_qinq_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;
} __attribute__((__packed__));
#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
-
#define PPP_PROTOCOL_IP 0x0021
struct pppoe_ppp_hdr {
} __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 rte_ether_hdr ether;
struct ipv4_hdr ipv4;
struct udp_hdr udp;
- struct vxlan_hdr vxlan;
+ struct rte_vxlan_hdr vxlan;
} __attribute__((__packed__));
struct encap_vxlan_ipv4_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
struct ipv4_hdr ipv4;
struct udp_hdr udp;
- struct vxlan_hdr vxlan;
+ struct rte_vxlan_hdr vxlan;
} __attribute__((__packed__));
struct encap_vxlan_ipv6_data {
- struct ether_hdr ether;
+ struct rte_ether_hdr ether;
struct ipv6_hdr ipv6;
struct udp_hdr udp;
- struct vxlan_hdr vxlan;
+ struct rte_vxlan_hdr vxlan;
} __attribute__((__packed__));
struct encap_vxlan_ipv6_vlan_data {
- struct ether_hdr ether;
- struct vlan_hdr vlan;
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr vlan;
struct ipv6_hdr ipv6;
struct udp_hdr udp;
- struct vxlan_hdr vxlan;
+ struct rte_vxlan_hdr vxlan;
+} __attribute__((__packed__));
+
+struct encap_qinq_pppoe_data {
+ struct rte_ether_hdr ether;
+ struct rte_vlan_hdr svlan;
+ struct rte_vlan_hdr cvlan;
+ struct pppoe_ppp_hdr pppoe_ppp;
} __attribute__((__packed__));
static size_t
else
return sizeof(struct encap_vxlan_ipv6_data);
+ case 1LLU << RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:
+ return sizeof(struct encap_qinq_pppoe_data);
+
default:
return 0;
}
case RTE_TABLE_ACTION_ENCAP_VXLAN:
return 0;
+ case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:
+ return 0;
+
default:
return -EINVAL;
}
return 0;
}
+static int
+encap_qinq_pppoe_apply(void *data,
+ struct rte_table_action_encap_params *p)
+{
+ 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);
+
+ /* 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);
+
+ /* 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);
+
+ /* PPPoE and PPP*/
+ d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
+ d->pppoe_ppp.session_id = rte_htons(p->qinq_pppoe.pppoe.session_id);
+ d->pppoe_ppp.length = 0; /* not pre-computed */
+ d->pppoe_ppp.protocol = rte_htons(PPP_PROTOCOL_IP);
+
+ return 0;
+}
+
static int
encap_mpls_apply(void *data,
struct rte_table_action_encap_params *p)
case RTE_TABLE_ACTION_ENCAP_VXLAN:
return encap_vxlan_apply(data, p, cfg);
+ case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:
+ return encap_qinq_pppoe_apply(data, p);
+
default:
return -EINVAL;
}
ether_length = (uint16_t)mbuf->pkt_len;
ipv4_total_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr) +
sizeof(struct 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 rte_vxlan_hdr) +
sizeof(struct udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
ether_length = (uint16_t)mbuf->pkt_len;
ipv4_total_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr) +
sizeof(struct 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 rte_vxlan_hdr) +
sizeof(struct udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
ether_length = (uint16_t)mbuf->pkt_len;
ipv6_payload_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
ether_length = (uint16_t)mbuf->pkt_len;
ipv6_payload_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr));
udp_length = ether_length +
- (sizeof(struct vxlan_hdr) +
+ (sizeof(struct rte_vxlan_hdr) +
sizeof(struct udp_hdr));
vxlan_pkt = encap(ether, vxlan_tbl, sizeof(*vxlan_tbl));
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);
break;
}
+ case 1LLU << RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE:
+ {
+ struct encap_qinq_pppoe_data *qinq_pppoe =
+ encap(ip, data, sizeof(struct encap_qinq_pppoe_data));
+ qinq_pppoe->pppoe_ppp.length = rte_htons(total_length + 2);
+ mbuf->data_off = ip_offset - (sizeof(struct rte_mbuf) +
+ sizeof(struct encap_qinq_pppoe_data));
+ mbuf->pkt_len = mbuf->data_len = total_length +
+ sizeof(struct encap_qinq_pppoe_data);
+ break;
+ }
+
case 1LLU << RTE_TABLE_ACTION_ENCAP_VXLAN:
{
if (cfg->vxlan.ip_version)
&action->dscp_table.entry[i];
struct rte_table_action_dscp_table_entry *entry =
&table->entry[i];
- uint16_t queue_tc_color =
- MBUF_SCHED_QUEUE_TC_COLOR(entry->tc_queue_id,
- entry->tc_id,
- entry->color);
if ((dscp_mask & (1LLU << i)) == 0)
continue;
data->color = entry->color;
data->tc = entry->tc_id;
- data->queue_tc_color = queue_tc_color;
+ data->tc_queue = entry->tc_queue_id;
}
return 0;
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);
}
git.droids-corp.org / dpdk.git / blobdiff