vxge: enable rxhash
Subsystems (2)
PATCH 1/12 vxge: enable rxhash
Enable RSS hashing and add ability to pass up the adapter calculated rx hash up the network stack (if feature is available). Add the ability to enable/disable feature via ethtool, which requires that the adapter is not running at the time. Other miscellaneous cleanups and fixes required to get RSS working.
Signed-off-by Jon Mason <[email protected]>
Signed-off-by Ram Vepa <[email protected]>
--- drivers/net/vxge/vxge-config.c | 2 + drivers/net/vxge/vxge-config.h | 12 ++++---- drivers/net/vxge/vxge-ethtool.c | 35 +++++++++++++++++++++++++ drivers/net/vxge/vxge-main.c | 54 ++++++++++++++++++++++++-------------- drivers/net/vxge/vxge-main.h | 18 ++++++------ drivers/net/vxge/vxge-traffic.h | 28 -------------------- 6 files changed, 86 insertions(+), 63 deletions(-)
drivers/net/vxge/vxge-config.c +2 -0
@@ -3204,6 +3204,8 @@ enum vxge_hw_status vxge_hw_vpath_rts_rth_set(VXGE_HW_RTS_ACCESS_STEER_CTRL_ACTION_READ_ENTRY ,VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_RTH_GEN_CFG , 0, &data0, &data1); +if (status !=VXGE_HW_OK ) + goto exit; data0 &= ~(VXGE_HW_RTS_ACCESS_STEER_DATA0_RTH_GEN_BUCKET_SIZE (0xf ) |VXGE_HW_RTS_ACCESS_STEER_DATA0_RTH_GEN_ALG_SEL (0x3 ));
drivers/net/vxge/vxge-config.h +6 -6
@@ -1413,12 +1413,12 @@ enum vxge_hw_rth_algoritms {* See also: vxge_hw_vpath_rts_rth_set(), vxge_hw_vpath_rts_rth_get(). */ struct vxge_hw_rth_hash_types { -u8 hash_type_tcpipv4_en; -u8 hash_type_ipv4_en; -u8 hash_type_tcpipv6_en; -u8 hash_type_ipv6_en; -u8 hash_type_tcpipv6ex_en; -u8 hash_type_ipv6ex_en; +u8 hash_type_tcpipv4_en:1 , + hash_type_ipv4_en:1 , + hash_type_tcpipv6_en:1 , + hash_type_ipv6_en:1 , + hash_type_tcpipv6ex_en:1 , + hash_type_ipv6ex_en:1 ; }; void vxge_hw_device_debug_set(
drivers/net/vxge/vxge-ethtool.c +35 -0
@@ -1119,6 +1119,40 @@ static int vxge_ethtool_get_sset_count(struct net_device *dev, int sset) } } +static int vxge_set_flags (struct net_device *dev,u32 data) +{ +struct vxgedev *vdev = (struct vxgedev *)netdev_priv (dev); +enum vxge_hw_status status; + +if (data & ~ETH_FLAG_RXHASH ) +return -EOPNOTSUPP ; + +if (!!(data Ð_FLAG_RXHASH ) == vdev->devh->config.rth_en) +return 0 ; + +if (netif_running (dev) || (vdev->config.rth_steering ==NO_STEERING )) +return -EINVAL ; + + vdev->devh->config.rth_en = !!(data Ð_FLAG_RXHASH ); + +/* Enabling RTH requires some of the logic in vxge_device_register and a +* vpath reset. Due to these restrictions, only allow modification +* while the interface is down. +*/ + status =vxge_reset_all_vpaths (vdev); +if (status !=VXGE_HW_OK ) { + vdev->devh->config.rth_en = !vdev->devh->config.rth_en; +return -EFAULT ; + } + +if (vdev->devh->config.rth_en) + dev->features |=NETIF_F_RXHASH ; +else + dev->features &= ~NETIF_F_RXHASH ; + +return 0 ; +} +static const struct ethtool_ops vxge_ethtool_ops = { .get_settings = vxge_ethtool_gset, .set_settings = vxge_ethtool_sset,
@@ -1140,6 +1174,7 @@ static const struct ethtool_ops vxge_ethtool_ops = { .phys_id = vxge_ethtool_idnic, .get_sset_count = vxge_ethtool_get_sset_count, .get_ethtool_stats = vxge_get_ethtool_stats, + .set_flags = vxge_set_flags, };void vxge_initialize_ethtool_ops (struct net_device *ndev)
drivers/net/vxge/vxge-main.c +34 -20
91 lines not on this page · raw message
drivers/net/vxge/vxge-main.h +9 -9
@@ -145,15 +145,15 @@ struct vxge_config {int addr_learn_en; -int rth_steering; -int rth_algorithm; -int rth_hash_type_tcpipv4; -int rth_hash_type_ipv4; -int rth_hash_type_tcpipv6; -int rth_hash_type_ipv6; -int rth_hash_type_tcpipv6ex; -int rth_hash_type_ipv6ex; -int rth_bkt_sz; + u32 rth_steering:2, + rth_algorithm:2, + rth_hash_type_tcpipv4:1, + rth_hash_type_ipv4:1, + rth_hash_type_tcpipv6:1, + rth_hash_type_ipv6:1, + rth_hash_type_tcpipv6ex:1, + rth_hash_type_ipv6ex:1, + rth_bkt_sz:8;int rth_jhash_golden_ratio;int tx_steering_type;int fifo_indicate_max_pkts;
drivers/net/vxge/vxge-traffic.h +0 -28
@@ -1904,34 +1904,6 @@ enum vxge_hw_ring_tcode { VXGE_HW_RING_T_CODE_MULTI_ERR = 0xF }; -/** -* enum enum vxge_hw_ring_hash_type - RTH hash types -* @VXGE_HW_RING_HASH_TYPE_NONE: No Hash -* @VXGE_HW_RING_HASH_TYPE_TCP_IPV4: TCP IPv4 -* @VXGE_HW_RING_HASH_TYPE_UDP_IPV4: UDP IPv4 -* @VXGE_HW_RING_HASH_TYPE_IPV4: IPv4 -* @VXGE_HW_RING_HASH_TYPE_TCP_IPV6: TCP IPv6 -* @VXGE_HW_RING_HASH_TYPE_UDP_IPV6: UDP IPv6 -* @VXGE_HW_RING_HASH_TYPE_IPV6: IPv6 -* @VXGE_HW_RING_HASH_TYPE_TCP_IPV6_EX: TCP IPv6 extension -* @VXGE_HW_RING_HASH_TYPE_UDP_IPV6_EX: UDP IPv6 extension -* @VXGE_HW_RING_HASH_TYPE_IPV6_EX: IPv6 extension -* -* RTH hash types -*/ -enum vxge_hw_ring_hash_type { -VXGE_HW_RING_HASH_TYPE_NONE =0x0 , -VXGE_HW_RING_HASH_TYPE_TCP_IPV4 =0x1 , -VXGE_HW_RING_HASH_TYPE_UDP_IPV4 =0x2 , -VXGE_HW_RING_HASH_TYPE_IPV4 =0x3 , -VXGE_HW_RING_HASH_TYPE_TCP_IPV6 =0x4 , -VXGE_HW_RING_HASH_TYPE_UDP_IPV6 =0x5 , -VXGE_HW_RING_HASH_TYPE_IPV6 =0x6 , -VXGE_HW_RING_HASH_TYPE_TCP_IPV6_EX =0x7 , -VXGE_HW_RING_HASH_TYPE_UDP_IPV6_EX =0x8 , -VXGE_HW_RING_HASH_TYPE_IPV6_EX =0x9 -}; -enum vxge_hw_status vxge_hw_ring_rxd_reserve (struct __vxge_hw_ring *ring_handle,void **rxdh);
Signature · 1 line
1.7.0.4