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
net/ice/base: remove deprecated field
[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
2845ca0
..
fe3e06c
100644
(file)
--- a/
drivers/net/ice/ice_hash.c
+++ b/
drivers/net/ice/ice_hash.c
@@
-479,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)},
@@
-1012,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;
@@
-1125,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 &=
@@
-1139,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;
@@
-1256,16
+1274,15
@@
ice_hash_create(struct ice_adapter *ad,
goto out;
} else {
goto out;
} else {
- filter_ptr->rss_cfg.
packet_hdr
= headermask;
- filter_ptr->rss_cfg.hash
ed
_flds = hash_field;
- filter_ptr->rss_cfg.symm =
+ filter_ptr->rss_cfg.
hash.addl_hdrs
= headermask;
+ filter_ptr->rss_cfg.hash
.hash
_flds = hash_field;
+ filter_ptr->rss_cfg.
hash.
symm =
(hash_function ==
RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
(hash_function ==
RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
+ filter_ptr->rss_cfg.hash.hdr_type = ICE_RSS_ANY_HEADERS;
- ret = ice_add_rss_cfg(hw, vsi->idx,
- filter_ptr->rss_cfg.hashed_flds,
- filter_ptr->rss_cfg.packet_hdr,
- filter_ptr->rss_cfg.symm);
+ ret = ice_add_rss_cfg_wrap(pf, vsi->idx,
+ &filter_ptr->rss_cfg.hash);
if (ret) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
if (ret) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
@@
-1306,9
+1323,8
@@
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,
- filter_ptr->rss_cfg.hashed_flds,
- filter_ptr->rss_cfg.packet_hdr);
+ ret = ice_rem_rss_cfg_wrap(pf, vsi->idx,
+ &filter_ptr->rss_cfg.hash);
/* Fixme: Ignore the error if a rule does not exist.
* Currently a rule for inputset change or symm turn on/off
* will overwrite an exist rule, while application still
/* Fixme: Ignore the error if a rule does not exist.
* Currently a rule for inputset change or symm turn on/off
* will overwrite an exist rule, while application still