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
crypto/dpaa_sec: support authonly and chain with raw API
[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
175780c
..
20a3204
100644
(file)
--- a/
drivers/net/ice/ice_hash.c
+++ b/
drivers/net/ice/ice_hash.c
@@
-374,13
+374,17
@@
struct ice_rss_hash_cfg eth_tmplt = {
/* IPv4 */
#define ICE_RSS_TYPE_ETH_IPV4 (ETH_RSS_ETH | ETH_RSS_IPV4 | \
/* IPv4 */
#define ICE_RSS_TYPE_ETH_IPV4 (ETH_RSS_ETH | ETH_RSS_IPV4 | \
- ETH_RSS_FRAG_IPV4)
+ ETH_RSS_FRAG_IPV4 | \
+ ETH_RSS_IPV4_CHKSUM)
#define ICE_RSS_TYPE_ETH_IPV4_UDP (ICE_RSS_TYPE_ETH_IPV4 | \
#define ICE_RSS_TYPE_ETH_IPV4_UDP (ICE_RSS_TYPE_ETH_IPV4 | \
- ETH_RSS_NONFRAG_IPV4_UDP)
+ ETH_RSS_NONFRAG_IPV4_UDP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_ETH_IPV4_TCP (ICE_RSS_TYPE_ETH_IPV4 | \
#define ICE_RSS_TYPE_ETH_IPV4_TCP (ICE_RSS_TYPE_ETH_IPV4 | \
- ETH_RSS_NONFRAG_IPV4_TCP)
+ ETH_RSS_NONFRAG_IPV4_TCP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_ETH_IPV4_SCTP (ICE_RSS_TYPE_ETH_IPV4 | \
#define ICE_RSS_TYPE_ETH_IPV4_SCTP (ICE_RSS_TYPE_ETH_IPV4 | \
- ETH_RSS_NONFRAG_IPV4_SCTP)
+ ETH_RSS_NONFRAG_IPV4_SCTP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_IPV4 ETH_RSS_IPV4
#define ICE_RSS_TYPE_IPV4_UDP (ETH_RSS_IPV4 | \
ETH_RSS_NONFRAG_IPV4_UDP)
#define ICE_RSS_TYPE_IPV4 ETH_RSS_IPV4
#define ICE_RSS_TYPE_IPV4_UDP (ETH_RSS_IPV4 | \
ETH_RSS_NONFRAG_IPV4_UDP)
@@
-394,11
+398,14
@@
struct ice_rss_hash_cfg eth_tmplt = {
#define ICE_RSS_TYPE_ETH_IPV6_FRAG (ETH_RSS_ETH | ETH_RSS_IPV6 | \
ETH_RSS_FRAG_IPV6)
#define ICE_RSS_TYPE_ETH_IPV6_UDP (ICE_RSS_TYPE_ETH_IPV6 | \
#define ICE_RSS_TYPE_ETH_IPV6_FRAG (ETH_RSS_ETH | ETH_RSS_IPV6 | \
ETH_RSS_FRAG_IPV6)
#define ICE_RSS_TYPE_ETH_IPV6_UDP (ICE_RSS_TYPE_ETH_IPV6 | \
- ETH_RSS_NONFRAG_IPV6_UDP)
+ ETH_RSS_NONFRAG_IPV6_UDP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_ETH_IPV6_TCP (ICE_RSS_TYPE_ETH_IPV6 | \
#define ICE_RSS_TYPE_ETH_IPV6_TCP (ICE_RSS_TYPE_ETH_IPV6 | \
- ETH_RSS_NONFRAG_IPV6_TCP)
+ ETH_RSS_NONFRAG_IPV6_TCP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_ETH_IPV6_SCTP (ICE_RSS_TYPE_ETH_IPV6 | \
#define ICE_RSS_TYPE_ETH_IPV6_SCTP (ICE_RSS_TYPE_ETH_IPV6 | \
- ETH_RSS_NONFRAG_IPV6_SCTP)
+ ETH_RSS_NONFRAG_IPV6_SCTP | \
+ ETH_RSS_L4_CHKSUM)
#define ICE_RSS_TYPE_IPV6 ETH_RSS_IPV6
#define ICE_RSS_TYPE_IPV6_UDP (ETH_RSS_IPV6 | \
ETH_RSS_NONFRAG_IPV6_UDP)
#define ICE_RSS_TYPE_IPV6 ETH_RSS_IPV6
#define ICE_RSS_TYPE_IPV6_UDP (ETH_RSS_IPV6 | \
ETH_RSS_NONFRAG_IPV6_UDP)
@@
-619,9
+626,9
@@
ice_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,
psc = item->spec;
if (!psc)
break;
psc = item->spec;
if (!psc)
break;
- else if (psc->
pdu_
type == ICE_GTPU_EH_UPLINK)
+ else if (psc->
hdr.
type == ICE_GTPU_EH_UPLINK)
*phint |= ICE_PHINT_GTPU_EH_UP;
*phint |= ICE_PHINT_GTPU_EH_UP;
- else if (psc->
pdu_
type == ICE_GTPU_EH_DWNLINK)
+ else if (psc->
hdr.
type == ICE_GTPU_EH_DWNLINK)
*phint |= ICE_PHINT_GTPU_EH_DWN;
break;
default:
*phint |= ICE_PHINT_GTPU_EH_DWN;
break;
default:
@@
-689,6
+696,9
@@
ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
} else {
*hash_flds &= ~ICE_FLOW_HASH_IPV4;
}
} else {
*hash_flds &= ~ICE_FLOW_HASH_IPV4;
}
+
+ if (rss_type & ETH_RSS_IPV4_CHKSUM)
+ *hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_CHKSUM);
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_IPV6) {
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_IPV6) {
@@
-765,6
+775,9
@@
ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
} else {
*hash_flds &= ~ICE_FLOW_HASH_UDP_PORT;
}
} else {
*hash_flds &= ~ICE_FLOW_HASH_UDP_PORT;
}
+
+ if (rss_type & ETH_RSS_L4_CHKSUM)
+ *hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_CHKSUM);
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_TCP) {
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_TCP) {
@@
-782,6
+795,9
@@
ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
} else {
*hash_flds &= ~ICE_FLOW_HASH_TCP_PORT;
}
} else {
*hash_flds &= ~ICE_FLOW_HASH_TCP_PORT;
}
+
+ if (rss_type & ETH_RSS_L4_CHKSUM)
+ *hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_CHKSUM);
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_SCTP) {
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_SCTP) {
@@
-799,6
+815,9
@@
ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg,
} else {
*hash_flds &= ~ICE_FLOW_HASH_SCTP_PORT;
}
} else {
*hash_flds &= ~ICE_FLOW_HASH_SCTP_PORT;
}
+
+ if (rss_type & ETH_RSS_L4_CHKSUM)
+ *hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_CHKSUM);
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_L2TPV3) {
}
if (*addl_hdrs & ICE_FLOW_SEG_HDR_L2TPV3) {