net: add rte prefix to SCTP structure

Add 'rte_' prefix to structures:
- rename struct sctp_hdr as struct rte_sctp_hdr.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Olivier Matz 2019-05-21 18:13:12 +02:00 committed by Ferruh Yigit
parent 24ac604ef7
commit 09d9ae1ac9
17 changed files with 40 additions and 36 deletions

View File

@ -368,7 +368,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
struct rte_ipv4_hdr *ipv4_hdr = l3_hdr; struct rte_ipv4_hdr *ipv4_hdr = l3_hdr;
struct udp_hdr *udp_hdr; struct udp_hdr *udp_hdr;
struct tcp_hdr *tcp_hdr; struct tcp_hdr *tcp_hdr;
struct sctp_hdr *sctp_hdr; struct rte_sctp_hdr *sctp_hdr;
uint64_t ol_flags = 0; uint64_t ol_flags = 0;
uint32_t max_pkt_len, tso_segsz = 0; uint32_t max_pkt_len, tso_segsz = 0;
@ -435,7 +435,8 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
if (info->gso_enable) if (info->gso_enable)
ol_flags |= PKT_TX_TCP_SEG; ol_flags |= PKT_TX_TCP_SEG;
} else if (info->l4_proto == IPPROTO_SCTP) { } else if (info->l4_proto == IPPROTO_SCTP) {
sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len); sctp_hdr = (struct rte_sctp_hdr *)
((char *)l3_hdr + info->l3_len);
sctp_hdr->cksum = 0; sctp_hdr->cksum = 0;
/* sctp payload must be a multiple of 4 to be /* sctp payload must be a multiple of 4 to be
* offloaded */ * offloaded */

View File

@ -124,7 +124,7 @@ initialize_tcp_header(struct tcp_hdr *tcp_hdr, uint16_t src_port,
} }
uint16_t uint16_t
initialize_sctp_header(struct sctp_hdr *sctp_hdr, uint16_t src_port, initialize_sctp_header(struct rte_sctp_hdr *sctp_hdr, uint16_t src_port,
uint16_t dst_port, uint16_t pkt_data_len) uint16_t dst_port, uint16_t pkt_data_len)
{ {
uint16_t pkt_len; uint16_t pkt_len;
@ -402,7 +402,7 @@ nomore_mbuf:
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
copy_buf_to_pkt(proto_hdr, copy_buf_to_pkt(proto_hdr,
sizeof(struct sctp_hdr), pkt, sizeof(struct rte_sctp_hdr), pkt,
eth_hdr_size + eth_hdr_size +
sizeof(struct rte_ipv4_hdr)); sizeof(struct rte_ipv4_hdr));
break; break;
@ -427,7 +427,7 @@ nomore_mbuf:
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
copy_buf_to_pkt(proto_hdr, copy_buf_to_pkt(proto_hdr,
sizeof(struct sctp_hdr), pkt, sizeof(struct rte_sctp_hdr), pkt,
eth_hdr_size + eth_hdr_size +
sizeof(struct rte_ipv6_hdr)); sizeof(struct rte_ipv6_hdr));
break; break;

View File

@ -43,7 +43,7 @@ initialize_tcp_header(struct tcp_hdr *tcp_hdr, uint16_t src_port,
uint16_t dst_port, uint16_t pkt_data_len); uint16_t dst_port, uint16_t pkt_data_len);
uint16_t uint16_t
initialize_sctp_header(struct sctp_hdr *sctp_hdr, uint16_t src_port, initialize_sctp_header(struct rte_sctp_hdr *sctp_hdr, uint16_t src_port,
uint16_t dst_port, uint16_t pkt_data_len); uint16_t dst_port, uint16_t pkt_data_len);
uint16_t uint16_t

View File

@ -567,7 +567,7 @@ init_ipv4_sctp_traffic(struct rte_mempool *mp,
{ {
struct rte_ether_hdr pkt_eth_hdr; struct rte_ether_hdr pkt_eth_hdr;
struct rte_ipv4_hdr pkt_ipv4_hdr; struct rte_ipv4_hdr pkt_ipv4_hdr;
struct sctp_hdr pkt_sctp_hdr; struct rte_sctp_hdr pkt_sctp_hdr;
uint32_t src_addr = IPV4_ADDR(11, 12, 13, 14); uint32_t src_addr = IPV4_ADDR(11, 12, 13, 14);
uint32_t dst_addr = IPV4_ADDR(15, 16, 17, 18); uint32_t dst_addr = IPV4_ADDR(15, 16, 17, 18);
uint16_t src_port = 10; uint16_t src_port = 10;

View File

@ -299,7 +299,8 @@ igbe_set_xmit_ctx(struct igb_tx_queue* txq,
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_SCTP | type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_SCTP |
E1000_ADVTXD_DTYP_CTXT | E1000_ADVTXD_DCMD_DEXT; E1000_ADVTXD_DTYP_CTXT | E1000_ADVTXD_DCMD_DEXT;
mss_l4len_idx |= sizeof(struct sctp_hdr) << E1000_ADVTXD_L4LEN_SHIFT; mss_l4len_idx |= sizeof(struct rte_sctp_hdr)
<< E1000_ADVTXD_L4LEN_SHIFT;
break; break;
default: default:
type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_RSV | type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_RSV |

View File

@ -152,7 +152,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
enic_set_layer(gp, FILTER_GENERIC_1_TCP, FILTER_GENERIC_1_L4, enic_set_layer(gp, FILTER_GENERIC_1_TCP, FILTER_GENERIC_1_L4,
&tcp_mask, &tcp_val, sizeof(struct tcp_hdr)); &tcp_mask, &tcp_val, sizeof(struct tcp_hdr));
} else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_SCTP) { } else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_SCTP) {
struct sctp_hdr sctp_mask, sctp_val; struct rte_sctp_hdr sctp_mask, sctp_val;
memset(&sctp_mask, 0, sizeof(sctp_mask)); memset(&sctp_mask, 0, sizeof(sctp_mask));
memset(&sctp_val, 0, sizeof(sctp_val)); memset(&sctp_val, 0, sizeof(sctp_val));
@ -175,7 +175,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
* manually set proto_id=sctp below. * manually set proto_id=sctp below.
*/ */
enic_set_layer(gp, 0, FILTER_GENERIC_1_L4, &sctp_mask, enic_set_layer(gp, 0, FILTER_GENERIC_1_L4, &sctp_mask,
&sctp_val, sizeof(struct sctp_hdr)); &sctp_val, sizeof(struct rte_sctp_hdr));
} }
if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_UDP || if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_UDP ||
@ -246,7 +246,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
enic_set_layer(gp, FILTER_GENERIC_1_TCP, FILTER_GENERIC_1_L4, enic_set_layer(gp, FILTER_GENERIC_1_TCP, FILTER_GENERIC_1_L4,
&tcp_mask, &tcp_val, sizeof(struct tcp_hdr)); &tcp_mask, &tcp_val, sizeof(struct tcp_hdr));
} else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_SCTP) { } else if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_SCTP) {
struct sctp_hdr sctp_mask, sctp_val; struct rte_sctp_hdr sctp_mask, sctp_val;
memset(&sctp_mask, 0, sizeof(sctp_mask)); memset(&sctp_mask, 0, sizeof(sctp_mask));
memset(&sctp_val, 0, sizeof(sctp_val)); memset(&sctp_val, 0, sizeof(sctp_val));
@ -264,7 +264,7 @@ copy_fltr_v2(struct filter_v2 *fltr, const struct rte_eth_fdir_input *input,
} }
enic_set_layer(gp, 0, FILTER_GENERIC_1_L4, &sctp_mask, enic_set_layer(gp, 0, FILTER_GENERIC_1_L4, &sctp_mask,
&sctp_val, sizeof(struct sctp_hdr)); &sctp_val, sizeof(struct rte_sctp_hdr));
} }
if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP || if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP ||

View File

@ -910,9 +910,9 @@ enic_copy_item_sctp_v2(struct copy_item_args *arg)
mask = &rte_flow_item_sctp_mask; mask = &rte_flow_item_sctp_mask;
memcpy(gp->layer[FILTER_GENERIC_1_L4].mask, &mask->hdr, memcpy(gp->layer[FILTER_GENERIC_1_L4].mask, &mask->hdr,
sizeof(struct sctp_hdr)); sizeof(struct rte_sctp_hdr));
memcpy(gp->layer[FILTER_GENERIC_1_L4].val, &spec->hdr, memcpy(gp->layer[FILTER_GENERIC_1_L4].val, &spec->hdr,
sizeof(struct sctp_hdr)); sizeof(struct rte_sctp_hdr));
return 0; return 0;
} }

View File

@ -801,7 +801,7 @@ i40e_fdir_construct_pkt(struct i40e_pf *pf,
unsigned char *payload, *ptr; unsigned char *payload, *ptr;
struct udp_hdr *udp; struct udp_hdr *udp;
struct tcp_hdr *tcp; struct tcp_hdr *tcp;
struct sctp_hdr *sctp; struct rte_sctp_hdr *sctp;
uint8_t size, dst = 0; uint8_t size, dst = 0;
uint8_t i, pit_idx, set_idx = I40E_FLXPLD_L4_IDX; /* use l4 by default*/ uint8_t i, pit_idx, set_idx = I40E_FLXPLD_L4_IDX; /* use l4 by default*/
int len; int len;
@ -841,8 +841,8 @@ i40e_fdir_construct_pkt(struct i40e_pf *pf,
break; break;
case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP: case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:
sctp = (struct sctp_hdr *)(raw_pkt + len); sctp = (struct rte_sctp_hdr *)(raw_pkt + len);
payload = (unsigned char *)sctp + sizeof(struct sctp_hdr); payload = (unsigned char *)sctp + sizeof(struct rte_sctp_hdr);
/* /*
* The source and destination fields in the transmitted packet * The source and destination fields in the transmitted packet
* need to be presented in a reversed order with respect * need to be presented in a reversed order with respect
@ -886,8 +886,8 @@ i40e_fdir_construct_pkt(struct i40e_pf *pf,
break; break;
case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP: case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:
sctp = (struct sctp_hdr *)(raw_pkt + len); sctp = (struct rte_sctp_hdr *)(raw_pkt + len);
payload = (unsigned char *)sctp + sizeof(struct sctp_hdr); payload = (unsigned char *)sctp + sizeof(struct rte_sctp_hdr);
/* /*
* The source and destination fields in the transmitted packet * The source and destination fields in the transmitted packet
* need to be presented in a reversed order with respect * need to be presented in a reversed order with respect
@ -1091,7 +1091,7 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,
unsigned char *ptr; unsigned char *ptr;
struct udp_hdr *udp; struct udp_hdr *udp;
struct tcp_hdr *tcp; struct tcp_hdr *tcp;
struct sctp_hdr *sctp; struct rte_sctp_hdr *sctp;
struct rte_flow_item_gtp *gtp; struct rte_flow_item_gtp *gtp;
struct rte_ipv4_hdr *gtp_ipv4; struct rte_ipv4_hdr *gtp_ipv4;
struct rte_ipv6_hdr *gtp_ipv6; struct rte_ipv6_hdr *gtp_ipv6;
@ -1138,8 +1138,8 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,
tcp->dst_port = fdir_input->flow.tcp4_flow.src_port; tcp->dst_port = fdir_input->flow.tcp4_flow.src_port;
tcp->data_off = I40E_FDIR_TCP_DEFAULT_DATAOFF; tcp->data_off = I40E_FDIR_TCP_DEFAULT_DATAOFF;
} else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) { } else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) {
sctp = (struct sctp_hdr *)(raw_pkt + len); sctp = (struct rte_sctp_hdr *)(raw_pkt + len);
payload = (unsigned char *)sctp + sizeof(struct sctp_hdr); payload = (unsigned char *)sctp + sizeof(struct rte_sctp_hdr);
/** /**
* The source and destination fields in the transmitted packet * The source and destination fields in the transmitted packet
* need to be presented in a reversed order with respect * need to be presented in a reversed order with respect
@ -1175,8 +1175,8 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,
tcp->src_port = fdir_input->flow.udp6_flow.dst_port; tcp->src_port = fdir_input->flow.udp6_flow.dst_port;
tcp->dst_port = fdir_input->flow.udp6_flow.src_port; tcp->dst_port = fdir_input->flow.udp6_flow.src_port;
} else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV6_SCTP) { } else if (pctype == I40E_FILTER_PCTYPE_NONF_IPV6_SCTP) {
sctp = (struct sctp_hdr *)(raw_pkt + len); sctp = (struct rte_sctp_hdr *)(raw_pkt + len);
payload = (unsigned char *)sctp + sizeof(struct sctp_hdr); payload = (unsigned char *)sctp + sizeof(struct rte_sctp_hdr);
/** /**
* The source and destination fields in the transmitted packet * The source and destination fields in the transmitted packet
* need to be presented in a reversed order with respect * need to be presented in a reversed order with respect

View File

@ -307,7 +307,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags,
break; break;
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
*td_cmd |= I40E_TX_DESC_CMD_L4T_EOFT_SCTP; *td_cmd |= I40E_TX_DESC_CMD_L4T_EOFT_SCTP;
*td_offset |= (sizeof(struct sctp_hdr) >> 2) << *td_offset |= (sizeof(struct rte_sctp_hdr) >> 2) <<
I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT; I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
break; break;
case PKT_TX_UDP_CKSUM: case PKT_TX_UDP_CKSUM:

View File

@ -1422,7 +1422,7 @@ iavf_txd_enable_checksum(uint64_t ol_flags,
break; break;
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
*td_cmd |= IAVF_TX_DESC_CMD_L4T_EOFT_SCTP; *td_cmd |= IAVF_TX_DESC_CMD_L4T_EOFT_SCTP;
*td_offset |= (sizeof(struct sctp_hdr) >> 2) << *td_offset |= (sizeof(struct rte_sctp_hdr) >> 2) <<
IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT; IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
break; break;
case PKT_TX_UDP_CKSUM: case PKT_TX_UDP_CKSUM:

View File

@ -1782,7 +1782,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
break; break;
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
*td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_SCTP; *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_SCTP;
*td_offset |= (sizeof(struct sctp_hdr) >> 2) << *td_offset |= (sizeof(struct rte_sctp_hdr) >> 2) <<
ICE_TX_DESC_LEN_L4_LEN_S; ICE_TX_DESC_LEN_L4_LEN_S;
break; break;
case PKT_TX_UDP_CKSUM: case PKT_TX_UDP_CKSUM:

View File

@ -436,7 +436,8 @@ ixgbe_set_xmit_ctx(struct ixgbe_tx_queue *txq,
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_SCTP | type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_SCTP |
IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT; IXGBE_ADVTXD_DTYP_CTXT | IXGBE_ADVTXD_DCMD_DEXT;
mss_l4len_idx |= sizeof(struct sctp_hdr) << IXGBE_ADVTXD_L4LEN_SHIFT; mss_l4len_idx |= sizeof(struct rte_sctp_hdr)
<< IXGBE_ADVTXD_L4LEN_SHIFT;
tx_offload_mask.l2_len |= ~0; tx_offload_mask.l2_len |= ~0;
tx_offload_mask.l3_len |= ~0; tx_offload_mask.l3_len |= ~0;
break; break;

View File

@ -79,7 +79,7 @@ process_inner_cksums(struct rte_ether_hdr *eth_hdr,
struct rte_ipv6_hdr *ipv6_hdr; struct rte_ipv6_hdr *ipv6_hdr;
struct udp_hdr *udp_hdr; struct udp_hdr *udp_hdr;
struct tcp_hdr *tcp_hdr; struct tcp_hdr *tcp_hdr;
struct sctp_hdr *sctp_hdr; struct rte_sctp_hdr *sctp_hdr;
uint64_t ol_flags = 0; uint64_t ol_flags = 0;
info->l2_len = sizeof(struct rte_ether_hdr); info->l2_len = sizeof(struct rte_ether_hdr);
@ -129,7 +129,8 @@ process_inner_cksums(struct rte_ether_hdr *eth_hdr,
tcp_hdr->cksum = get_psd_sum(l3_hdr, ethertype, ol_flags); tcp_hdr->cksum = get_psd_sum(l3_hdr, ethertype, ol_flags);
} else if (l4_proto == IPPROTO_SCTP) { } else if (l4_proto == IPPROTO_SCTP) {
sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len); sctp_hdr = (struct rte_sctp_hdr *)
((char *)l3_hdr + info->l3_len);
sctp_hdr->cksum = 0; sctp_hdr->cksum = 0;
ol_flags |= PKT_TX_SCTP_CKSUM; ol_flags |= PKT_TX_SCTP_CKSUM;
} }

View File

@ -730,7 +730,7 @@ static const struct rte_flow_item_tcp rte_flow_item_tcp_mask = {
* Matches a SCTP header. * Matches a SCTP header.
*/ */
struct rte_flow_item_sctp { struct rte_flow_item_sctp {
struct sctp_hdr hdr; /**< SCTP header definition. */ struct rte_sctp_hdr hdr; /**< SCTP header definition. */
}; };
/** Default mask for RTE_FLOW_ITEM_TYPE_SCTP. */ /** Default mask for RTE_FLOW_ITEM_TYPE_SCTP. */

View File

@ -370,7 +370,7 @@ l3:
hdr_lens->l4_len = (th->data_off & 0xf0) >> 2; hdr_lens->l4_len = (th->data_off & 0xf0) >> 2;
return pkt_type; return pkt_type;
} else if ((pkt_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_SCTP) { } else if ((pkt_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_SCTP) {
hdr_lens->l4_len = sizeof(struct sctp_hdr); hdr_lens->l4_len = sizeof(struct rte_sctp_hdr);
return pkt_type; return pkt_type;
} else { } else {
uint32_t prev_off = off; uint32_t prev_off = off;
@ -506,7 +506,7 @@ l3:
hdr_lens->inner_l4_len = (th->data_off & 0xf0) >> 2; hdr_lens->inner_l4_len = (th->data_off & 0xf0) >> 2;
} else if ((pkt_type & RTE_PTYPE_INNER_L4_MASK) == } else if ((pkt_type & RTE_PTYPE_INNER_L4_MASK) ==
RTE_PTYPE_INNER_L4_SCTP) { RTE_PTYPE_INNER_L4_SCTP) {
hdr_lens->inner_l4_len = sizeof(struct sctp_hdr); hdr_lens->inner_l4_len = sizeof(struct rte_sctp_hdr);
} else { } else {
hdr_lens->inner_l4_len = 0; hdr_lens->inner_l4_len = 0;
} }

View File

@ -23,7 +23,7 @@ extern "C" {
/** /**
* SCTP Header * SCTP Header
*/ */
struct sctp_hdr { struct rte_sctp_hdr {
uint16_t src_port; /**< Source port. */ uint16_t src_port; /**< Source port. */
uint16_t dst_port; /**< Destin port. */ uint16_t dst_port; /**< Destin port. */
uint32_t tag; /**< Validation tag. */ uint32_t tag; /**< Validation tag. */

View File

@ -226,7 +226,7 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr)
dgram_cksum)); dgram_cksum));
break; break;
case PKT_TX_SCTP_CKSUM: case PKT_TX_SCTP_CKSUM:
net_hdr->csum_offset = (offsetof(struct sctp_hdr, net_hdr->csum_offset = (offsetof(struct rte_sctp_hdr,
cksum)); cksum));
break; break;
} }
@ -1032,7 +1032,7 @@ vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m)
if (l4_proto == IPPROTO_UDP) if (l4_proto == IPPROTO_UDP)
m->ol_flags |= PKT_TX_UDP_CKSUM; m->ol_flags |= PKT_TX_UDP_CKSUM;
break; break;
case (offsetof(struct sctp_hdr, cksum)): case (offsetof(struct rte_sctp_hdr, cksum)):
if (l4_proto == IPPROTO_SCTP) if (l4_proto == IPPROTO_SCTP)
m->ol_flags |= PKT_TX_SCTP_CKSUM; m->ol_flags |= PKT_TX_SCTP_CKSUM;
break; break;