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

Commit 3e587cf3 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: force inline transmit functions 



Inlining these functions gives us about 15% more 64 byte packets per
second when using pktgen. 13.3 million to 15 million with a single
queue.

Also fix the function names in i40evf to i40evf not i40e while we are
touching the function header.

Change-ID: I3294ae9b085cf438672b6db5f9af122490ead9d0
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8f6a2b05

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+16 −16
Original line number Diff line number Diff line
@@ -2063,11 +2063,11 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * otherwise  returns 0 to indicate the flags has been set properly.

 **/

#ifdef I40E_FCOE

int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

				      struct i40e_ring *tx_ring,

				      u32 *flags)

#else

static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

					     struct i40e_ring *tx_ring,

					     u32 *flags)

#endif
@@ -2412,9 +2412,9 @@ static inline int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size) 
 * Returns 0 if stop is not needed

 **/

#ifdef I40E_FCOE

int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#else

static int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#endif

{

	if (likely(I40E_DESC_UNUSED(tx_ring) >= size))
@@ -2494,11 +2494,11 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags, 
 * @td_offset: offset for checksum or crc

 **/

#ifdef I40E_FCOE

void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

			struct i40e_tx_buffer *first, u32 tx_flags,

			const u8 hdr_len, u32 td_cmd, u32 td_offset)

#else

static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

			       struct i40e_tx_buffer *first, u32 tx_flags,

			       const u8 hdr_len, u32 td_cmd, u32 td_offset)

#endif
@@ -2661,10 +2661,10 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * one descriptor.

 **/

#ifdef I40E_FCOE

int i40e_xmit_descriptor_count(struct sk_buff *skb,

inline int i40e_xmit_descriptor_count(struct sk_buff *skb,

				      struct i40e_ring *tx_ring)

#else

static int i40e_xmit_descriptor_count(struct sk_buff *skb,

static inline int i40e_xmit_descriptor_count(struct sk_buff *skb,

					     struct i40e_ring *tx_ring)

#endif

{

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+16 −20
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 
}



/**

 * i40e_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW

 * i40evf_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW

 * @skb:     send buffer

 * @tx_ring: ring to send buffer on

 * @flags:   the tx flags to be set
@@ -1358,7 +1358,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 
 * Returns error code indicate the frame should be dropped upon error and the

 * otherwise  returns 0 to indicate the flags has been set properly.

 **/

static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb,

					       struct i40e_ring *tx_ring,

					       u32 *flags)

{
@@ -1699,11 +1699,7 @@ static inline int __i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size) 
 *

 * Returns 0 if stop is not needed

 **/

#ifdef I40E_FCOE

int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#else

static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#endif

static inline int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

{

	if (likely(I40E_DESC_UNUSED(tx_ring) >= size))

		return 0;
@@ -1711,7 +1707,7 @@ static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size) 
}



/**

 * i40e_tx_map - Build the Tx descriptor

 * i40evf_tx_map - Build the Tx descriptor

 * @tx_ring:  ring to send buffer on

 * @skb:      send buffer

 * @first:    first buffer info buffer to use
@@ -1720,7 +1716,7 @@ static int i40evf_maybe_stop_tx(struct i40e_ring *tx_ring, int size) 
 * @td_cmd:   the command field in the descriptor

 * @td_offset: offset for checksum or crc

 **/

static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

				 struct i40e_tx_buffer *first, u32 tx_flags,

				 const u8 hdr_len, u32 td_cmd, u32 td_offset)

{
@@ -1874,7 +1870,7 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
}



/**

 * i40e_xmit_descriptor_count - calculate number of tx descriptors needed

 * i40evf_xmit_descriptor_count - calculate number of tx descriptors needed

 * @skb:     send buffer

 * @tx_ring: ring to send buffer on

 *
@@ -1882,7 +1878,7 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * there is not enough descriptors available in this ring since we need at least

 * one descriptor.

 **/

static int i40e_xmit_descriptor_count(struct sk_buff *skb,

static inline int i40evf_xmit_descriptor_count(struct sk_buff *skb,

					       struct i40e_ring *tx_ring)

{

	unsigned int f;
@@ -1924,11 +1920,11 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	u32 td_cmd = 0;

	u8 hdr_len = 0;

	int tso;

	if (0 == i40e_xmit_descriptor_count(skb, tx_ring))

	if (0 == i40evf_xmit_descriptor_count(skb, tx_ring))

		return NETDEV_TX_BUSY;



	/* prepare the xmit flags */

	if (i40e_tx_prepare_vlan_flags(skb, tx_ring, &tx_flags))

	if (i40evf_tx_prepare_vlan_flags(skb, tx_ring, &tx_flags))

		goto out_drop;



	/* obtain protocol of skb */
@@ -1971,7 +1967,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	i40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,

			   cd_tunneling, cd_l2tag2);



	i40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,

	i40evf_tx_map(tx_ring, skb, first, tx_flags, hdr_len,

		      td_cmd, td_offset);



	return NETDEV_TX_OK;