git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vhost: promote vDPA API as stable
[dpdk.git]
/
drivers
/
net
/
ice
/
ice_hash.c
diff --git
a/drivers/net/ice/ice_hash.c
b/drivers/net/ice/ice_hash.c
index
e535e4b
..
45c69e6
100644
(file)
--- a/
drivers/net/ice/ice_hash.c
+++ b/
drivers/net/ice/ice_hash.c
@@
-204,10
+204,6
@@
struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {
ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};
ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {
- ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
- ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
- ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP};
struct rss_type_match_hdr hint_eth_ipv4_esp = {
ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
ICE_FLOW_SEG_HDR_ESP,
struct rss_type_match_hdr hint_eth_ipv4_esp = {
ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
ICE_FLOW_SEG_HDR_ESP,
@@
-313,10
+309,6
@@
struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {
ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};
ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};
-struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = {
- ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
- ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
- ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};
struct rss_type_match_hdr hint_eth_pppoes = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE};
struct rss_type_match_hdr hint_eth_pppoes = {
ICE_FLOW_SEG_HDR_PPPOE,
ETH_RSS_ETH | ETH_RSS_PPPOE};
@@
-400,8
+392,6
@@
static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_pppoes_ipv4_udp},
{pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4_tcp},
&hint_eth_pppoes_ipv4_udp},
{pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE,
&hint_eth_pppoes_ipv4_tcp},
- {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE,
- &hint_eth_pppoes_ipv4_sctp},
{pattern_eth_ipv4_esp, ICE_INSET_NONE,
&hint_eth_ipv4_esp},
{pattern_eth_ipv4_udp_esp, ICE_INSET_NONE,
{pattern_eth_ipv4_esp, ICE_INSET_NONE,
&hint_eth_ipv4_esp},
{pattern_eth_ipv4_udp_esp, ICE_INSET_NONE,
@@
-452,8
+442,6
@@
static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
&hint_eth_pppoes_ipv6_udp},
{pattern_eth_pppoes_ipv6_tcp, ICE_INSET_NONE,
&hint_eth_pppoes_ipv6_tcp},
&hint_eth_pppoes_ipv6_udp},
{pattern_eth_pppoes_ipv6_tcp, ICE_INSET_NONE,
&hint_eth_pppoes_ipv6_tcp},
- {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE,
- &hint_eth_pppoes_ipv6_sctp},
{pattern_eth_pppoes, ICE_INSET_NONE,
&hint_eth_pppoes},
};
{pattern_eth_pppoes, ICE_INSET_NONE,
&hint_eth_pppoes},
};
@@
-491,6
+479,8
@@
struct ice_hash_match_type ice_hash_type_list[] = {
BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)},
{ETH_RSS_PFCP,
BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},
BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)},
{ETH_RSS_PFCP,
BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},
+ {ETH_RSS_GTPU,
+ BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)},
/* IPV4 */
{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
/* IPV4 */
{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
@@
-1024,6
+1014,7
@@
ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
enum rte_flow_action_type action_type;
const struct rte_flow_action_rss *rss;
const struct rte_flow_action *action;
enum rte_flow_action_type action_type;
const struct rte_flow_action_rss *rss;
const struct rte_flow_action *action;
+ bool hash_map_found = false;
uint64_t rss_attr_src_dst;
uint64_t rss_attr_l3_pre;
uint64_t rss_attr_symm;
uint64_t rss_attr_src_dst;
uint64_t rss_attr_l3_pre;
uint64_t rss_attr_symm;
@@
-1137,12
+1128,20
@@
ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
if (rss_type == ht_map->hash_type) {
hash_meta->hash_flds =
ht_map->hash_flds;
if (rss_type == ht_map->hash_type) {
hash_meta->hash_flds =
ht_map->hash_flds;
+ hash_map_found = true;
break;
}
}
break;
}
}
+ if (pattern_match_item->pattern_list !=
+ pattern_empty && !hash_map_found) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "Not supported flow");
+ }
+
/* update hash field for nat-t esp. */
/* update hash field for nat-t esp. */
- if (rss_type
==
ETH_RSS_ESP &&
+ if (rss_type
&
ETH_RSS_ESP &&
(m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
hash_meta->hash_flds &=
(m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
hash_meta->hash_flds &=
@@
-1151,21
+1150,28
@@
ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
}
BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
}
- /* update hash field for gtpu
-ip and gtpu-eh
. */
- if (
rss_type != ETH_RSS_GTPU)
+ /* update hash field for gtpu
eh/gtpu dwn/gtpu up
. */
+ if (
!(rss_type & ETH_RSS_GTPU)) {
break;
break;
- else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_IP)
- hash_meta->hash_flds |=
- BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID);
- else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH)
+ } else if (hash_meta->pkt_hdr &
+ ICE_FLOW_SEG_HDR_GTPU_EH) {
+ hash_meta->hash_flds &=
+ ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_EH_TEID);
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_EH_TEID);
- else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_DWN)
+ } else if (hash_meta->pkt_hdr &
+ ICE_FLOW_SEG_HDR_GTPU_DWN) {
+ hash_meta->hash_flds &=
+ ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID);
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID);
- else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_UP)
+ } else if (hash_meta->pkt_hdr &
+ ICE_FLOW_SEG_HDR_GTPU_UP) {
+ hash_meta->hash_flds &=
+ ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID);
hash_meta->hash_flds |=
BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID);
+ }
break;
break;
@@
-1274,7
+1280,7
@@
ice_hash_create(struct ice_adapter *ad,
(hash_function ==
RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
(hash_function ==
RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
- ret = ice_add_rss_cfg
(hw
, vsi->idx,
+ ret = ice_add_rss_cfg
_wrap(pf
, vsi->idx,
filter_ptr->rss_cfg.hashed_flds,
filter_ptr->rss_cfg.packet_hdr,
filter_ptr->rss_cfg.symm);
filter_ptr->rss_cfg.hashed_flds,
filter_ptr->rss_cfg.packet_hdr,
filter_ptr->rss_cfg.symm);
@@
-1318,7
+1324,7
@@
ice_hash_destroy(struct ice_adapter *ad,
(1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
} else {
(1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
} else {
- ret = ice_rem_rss_cfg
(hw
, vsi->idx,
+ ret = ice_rem_rss_cfg
_wrap(pf
, vsi->idx,
filter_ptr->rss_cfg.hashed_flds,
filter_ptr->rss_cfg.packet_hdr);
/* Fixme: Ignore the error if a rule does not exist.
filter_ptr->rss_cfg.hashed_flds,
filter_ptr->rss_cfg.packet_hdr);
/* Fixme: Ignore the error if a rule does not exist.