Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 905e4a41 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ixgbe: cleanup flow director hash computation to improve performance 



This change cleans up the layout of the flow director data, and the
algorithm used to calculate the hash resulting in a 35x / 3500% performance
increase versus the old flow director hash computation.  The overall effect
is only a 1% increase in transactions per second though due to the fact
that only 1 packet in 20 are actually hashed upon.

TCP_RR before:
Socket Size   Request  Resp.   Elapsed  Trans.
Send   Recv   Size     Size    Time     Rate
bytes  Bytes  bytes    bytes   secs.    per sec

16384  87380  1        1       60.00    23059.27
16384  87380

TCP_RR after:
Socket Size   Request  Resp.   Elapsed  Trans.
Send   Recv   Size     Size    Time     Rate
bytes  Bytes  bytes    bytes   secs.    per sec

16384  87380  1        1       60.00    23239.98
16384  87380

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d39d576

drivers/net/ixgbe/ixgbe.h

+9 −9
Original line number Diff line number Diff line
@@ -526,25 +526,25 @@ extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw); 
extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc);

extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc);

extern s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,

                                                 struct ixgbe_atr_input *input,

                                                 union ixgbe_atr_input *input,

                                                 u8 queue);

extern s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw,

                                      struct ixgbe_atr_input *input,

                                      union ixgbe_atr_input *input,

                                      struct ixgbe_atr_input_masks *input_masks,

                                      u16 soft_id, u8 queue);

extern s32 ixgbe_atr_set_vlan_id_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_vlan_id_82599(union ixgbe_atr_input *input,

                                       u16 vlan_id);

extern s32 ixgbe_atr_set_src_ipv4_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_src_ipv4_82599(union ixgbe_atr_input *input,

                                        u32 src_addr);

extern s32 ixgbe_atr_set_dst_ipv4_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_dst_ipv4_82599(union ixgbe_atr_input *input,

                                        u32 dst_addr);

extern s32 ixgbe_atr_set_src_port_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_src_port_82599(union ixgbe_atr_input *input,

                                        u16 src_port);

extern s32 ixgbe_atr_set_dst_port_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_dst_port_82599(union ixgbe_atr_input *input,

                                        u16 dst_port);

extern s32 ixgbe_atr_set_flex_byte_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_flex_byte_82599(union ixgbe_atr_input *input,

                                         u16 flex_byte);

extern s32 ixgbe_atr_set_l4type_82599(struct ixgbe_atr_input *input,

extern s32 ixgbe_atr_set_l4type_82599(union ixgbe_atr_input *input,

                                      u8 l4type);

extern void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,

                                   struct ixgbe_ring *ring);

drivers/net/ixgbe/ixgbe_82599.c

+126 −209

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ixgbe/ixgbe_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -2278,7 +2278,7 @@ static int ixgbe_set_rx_ntuple(struct net_device *dev, 
{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ethtool_rx_ntuple_flow_spec fs = cmd->fs;

	struct ixgbe_atr_input input_struct;

	union ixgbe_atr_input input_struct;

	struct ixgbe_atr_input_masks input_masks;

	int target_queue;
@@ -2293,7 +2293,7 @@ static int ixgbe_set_rx_ntuple(struct net_device *dev, 
	    (fs.action < ETHTOOL_RXNTUPLE_ACTION_DROP))

		return -EINVAL;



	memset(&input_struct, 0, sizeof(struct ixgbe_atr_input));

	memset(&input_struct, 0, sizeof(union ixgbe_atr_input));

	memset(&input_masks, 0, sizeof(struct ixgbe_atr_input_masks));



	input_masks.src_ip_mask = fs.m_u.tcp_ip4_spec.ip4src;

drivers/net/ixgbe/ixgbe_main.c

+5 −6
Original line number Diff line number Diff line
@@ -6509,21 +6509,20 @@ static void ixgbe_tx_queue(struct ixgbe_ring *tx_ring, 
static void ixgbe_atr(struct ixgbe_adapter *adapter, struct sk_buff *skb,

		      u8 queue, u32 tx_flags, __be16 protocol)

{

	struct ixgbe_atr_input atr_input;

	union ixgbe_atr_input atr_input;

	struct iphdr *iph = ip_hdr(skb);

	struct ethhdr *eth = (struct ethhdr *)skb->data;

	struct tcphdr *th;

	u16 vlan_id;

	__be16 vlan_id;



	/* Right now, we support IPv4 w/ TCP only */

	if (protocol != htons(ETH_P_IP) ||

	    iph->protocol != IPPROTO_TCP)

		return;



	memset(&atr_input, 0, sizeof(struct ixgbe_atr_input));

	memset(&atr_input, 0, sizeof(union ixgbe_atr_input));



	vlan_id = (tx_flags & IXGBE_TX_FLAGS_VLAN_MASK) >>

		   IXGBE_TX_FLAGS_VLAN_SHIFT;

	vlan_id = htons(tx_flags >> IXGBE_TX_FLAGS_VLAN_SHIFT);



	th = tcp_hdr(skb);
@@ -6531,7 +6530,7 @@ static void ixgbe_atr(struct ixgbe_adapter *adapter, struct sk_buff *skb, 
	ixgbe_atr_set_src_port_82599(&atr_input, th->dest);

	ixgbe_atr_set_dst_port_82599(&atr_input, th->source);

	ixgbe_atr_set_flex_byte_82599(&atr_input, eth->h_proto);

	ixgbe_atr_set_l4type_82599(&atr_input, IXGBE_ATR_L4TYPE_TCP);

	ixgbe_atr_set_l4type_82599(&atr_input, IXGBE_ATR_FLOW_TYPE_TCPV4);

	/* src and dst are inverted, think how the receiver sees them */

	ixgbe_atr_set_src_ipv4_82599(&atr_input, iph->daddr);

	ixgbe_atr_set_dst_ipv4_82599(&atr_input, iph->saddr);

drivers/net/ixgbe/ixgbe_type.h

+40 −27

File changed.

Preview size limit exceeded, changes collapsed.