d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/hn: Simplify RX hash related bits.

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D7736
This commit is contained in:
Sepherosa Ziehau 2016-09-02 03:19:55 +00:00
parent 5e5d4b233a
commit 4e835450fd
4 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
View File

@ -1289,7 +1289,7 @@ netvsc_recv(struct hn_rx_ring *rxr, const void *data, int dlen,
struct ifnet *ifp = rxr->hn_ifp; struct ifnet *ifp = rxr->hn_ifp;
struct mbuf *m_new; struct mbuf *m_new;
int size, do_lro = 0, do_csum = 1; int size, do_lro = 0, do_csum = 1;
int hash_type = M_HASHTYPE_OPAQUE_HASH; int hash_type;
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return (0); return (0);
@ -1421,13 +1421,13 @@ netvsc_recv(struct hn_rx_ring *rxr, const void *data, int dlen,
m_new->m_flags |= M_VLANTAG; m_new->m_flags |= M_VLANTAG;
} }
if (info->hash_info != NULL && info->hash_value != NULL) { if (info->hash_info != HN_NDIS_HASH_INFO_INVALID) {
rxr->hn_rss_pkts++; rxr->hn_rss_pkts++;
m_new->m_pkthdr.flowid = info->hash_value->hash_value; m_new->m_pkthdr.flowid = info->hash_value;
if ((info->hash_info->hash_info & NDIS_HASH_FUNCTION_MASK) == hash_type = M_HASHTYPE_OPAQUE_HASH;
if ((info->hash_info & NDIS_HASH_FUNCTION_MASK) ==
NDIS_HASH_FUNCTION_TOEPLITZ) { NDIS_HASH_FUNCTION_TOEPLITZ) {
uint32_t type = uint32_t type = (info->hash_info & NDIS_HASH_TYPE_MASK);
(info->hash_info->hash_info & NDIS_HASH_TYPE_MASK);
switch (type) { switch (type) {
case NDIS_HASH_IPV4: case NDIS_HASH_IPV4:
@ -1456,12 +1456,8 @@ netvsc_recv(struct hn_rx_ring *rxr, const void *data, int dlen,
} }
} }
} else { } else {
if (info->hash_value != NULL) { m_new->m_pkthdr.flowid = rxr->hn_rx_idx;
m_new->m_pkthdr.flowid = info->hash_value->hash_value; hash_type = M_HASHTYPE_OPAQUE;
} else {
m_new->m_pkthdr.flowid = rxr->hn_rx_idx;
hash_type = M_HASHTYPE_OPAQUE;
}
} }
M_HASHTYPE_SET(m_new, hash_type); M_HASHTYPE_SET(m_new, hash_type);

20
sys/dev/hyperv/netvsc/hv_rndis_filter.c
View File

@ -158,8 +158,7 @@ hv_rf_find_recvinfo(const rndis_packet *rpkt, struct hn_recvinfo *info)
info->vlan_info = HN_NDIS_VLAN_INFO_INVALID; info->vlan_info = HN_NDIS_VLAN_INFO_INVALID;
info->csum_info = HN_NDIS_RXCSUM_INFO_INVALID; info->csum_info = HN_NDIS_RXCSUM_INFO_INVALID;
info->hash_info = NULL; info->hash_info = HN_NDIS_HASH_INFO_INVALID;
info->hash_value = NULL;
if (rpkt->per_pkt_info_offset == 0) if (rpkt->per_pkt_info_offset == 0)
return (0); return (0);
@ -207,18 +206,16 @@ hv_rf_find_recvinfo(const rndis_packet *rpkt, struct hn_recvinfo *info)
break; break;
case nbl_hash_value: case nbl_hash_value:
if (__predict_false(dlen < if (__predict_false(dlen < HN_NDIS_HASH_VALUE_SIZE))
sizeof(struct rndis_hash_value)))
return (EINVAL); return (EINVAL);
info->hash_value = data; info->hash_value = *((const uint32_t *)data);
mask |= HV_RF_RECVINFO_HASHVAL; mask |= HV_RF_RECVINFO_HASHVAL;
break; break;
case nbl_hash_info: case nbl_hash_info:
if (__predict_false(dlen < if (__predict_false(dlen < HN_NDIS_HASH_INFO_SIZE))
sizeof(struct rndis_hash_info)))
return (EINVAL); return (EINVAL);
info->hash_info = data; info->hash_info = *((const uint32_t *)data);
mask |= HV_RF_RECVINFO_HASHINF; mask |= HV_RF_RECVINFO_HASHINF;
break; break;
@ -234,6 +231,13 @@ hv_rf_find_recvinfo(const rndis_packet *rpkt, struct hn_recvinfo *info)
pi = (const struct rndis_pktinfo *) pi = (const struct rndis_pktinfo *)
((const uint8_t *)pi + pi->rm_size); ((const uint8_t *)pi + pi->rm_size);
} }
/*
* Final fixup.
* - If there is no hash value, invalidate the hash info.
*/
if ((mask & HV_RF_RECVINFO_HASHVAL) == 0)
info->hash_info = HN_NDIS_HASH_INFO_INVALID;
return (0); return (0);
} }

13
sys/dev/hyperv/netvsc/if_hnreg.h
View File

@ -208,4 +208,17 @@ struct hn_nvs_rndis_ack {
} __packed; } __packed;
CTASSERT(sizeof(struct hn_nvs_rndis_ack) >= HN_NVS_REQSIZE_MIN); CTASSERT(sizeof(struct hn_nvs_rndis_ack) >= HN_NVS_REQSIZE_MIN);
/*
* RNDIS extension
*/
/* Per-packet hash info */
#define HN_NDIS_HASH_INFO_SIZE sizeof(uint32_t)
#define HN_NDIS_PKTINFO_TYPE_HASHINF NDIS_PKTINFO_TYPE_ORIG_NBLIST
/* NDIS_HASH_ */
/* Per-packet hash value */
#define HN_NDIS_HASH_VALUE_SIZE sizeof(uint32_t)
#define HN_NDIS_PKTINFO_TYPE_HASHVAL NDIS_PKTINFO_TYPE_PKT_CANCELID
#endif /* !_IF_HNREG_H_ */ #endif /* !_IF_HNREG_H_ */

5
sys/dev/hyperv/netvsc/if_hnvar.h
View File

@ -57,12 +57,13 @@ struct rndis_tcp_ip_csum_info_;
#define HN_NDIS_VLAN_INFO_INVALID 0xffffffff #define HN_NDIS_VLAN_INFO_INVALID 0xffffffff
#define HN_NDIS_RXCSUM_INFO_INVALID 0 #define HN_NDIS_RXCSUM_INFO_INVALID 0
#define HN_NDIS_HASH_INFO_INVALID 0
struct hn_recvinfo { struct hn_recvinfo {
uint32_t vlan_info; uint32_t vlan_info;
uint32_t csum_info; uint32_t csum_info;
const struct rndis_hash_info *hash_info; uint32_t hash_info;
const struct rndis_hash_value *hash_value; uint32_t hash_value;
}; };
#define HN_SEND_CTX_INITIALIZER(cb, cbarg) \ #define HN_SEND_CTX_INITIALIZER(cb, cbarg) \