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

Commit f14d6b39 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: implement GRO without NAPI 



Use the new NAPI infrastructure added to mac80211 to get
GRO. We don't really implement NAPI since we don't have
a real poll function and we never schedule a NAPI poll.
Instead of this, we collect all the packets we got from a
single interrupt and then call napi_gro_flush().

This allows us to benefit from GRO. In half duplex medium
like WiFi, its main advantage is that it reduces the number
of TCP Acks, hence improving the TCP Rx performance.

Since we call the Rx path with a spinlock held, remove
the might_sleep mention from the op_mode's API.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarIdo Yariv <ido@wizery.com>
[Squash different patches and rewrite the commit message]
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 9a75b3df

drivers/net/wireless/iwlwifi/dvm/main.c

+12 −0
Original line number Diff line number Diff line
@@ -2053,6 +2053,17 @@ static bool iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) 
	return false;

}



static void iwl_napi_add(struct iwl_op_mode *op_mode,

			 struct napi_struct *napi,

			 struct net_device *napi_dev,

			 int (*poll)(struct napi_struct *, int),

			 int weight)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);



	ieee80211_napi_add(priv->hw, napi, napi_dev, poll, weight);

}



static const struct iwl_op_mode_ops iwl_dvm_ops = {

	.start = iwl_op_mode_dvm_start,

	.stop = iwl_op_mode_dvm_stop,
@@ -2065,6 +2076,7 @@ static const struct iwl_op_mode_ops iwl_dvm_ops = { 
	.cmd_queue_full = iwl_cmd_queue_full,

	.nic_config = iwl_nic_config,

	.wimax_active = iwl_wimax_active,

	.napi_add = iwl_napi_add,

};



/*****************************************************************************

drivers/net/wireless/iwlwifi/iwl-op-mode.h

+22 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#ifndef __iwl_op_mode_h__

#define __iwl_op_mode_h__



#include <linux/netdevice.h>

#include <linux/debugfs.h>



struct iwl_op_mode;
@@ -112,8 +113,11 @@ struct iwl_cfg; 
 * @stop: stop the op_mode. Must free all the memory allocated.

 *	May sleep

 * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the

 *	HCMD this Rx responds to.

 *	This callback may sleep, it is called from a threaded IRQ handler.

 *	HCMD this Rx responds to. Can't sleep.

 * @napi_add: NAPI initialisation. The transport is fully responsible for NAPI,

 *	but the higher layers need to know about it (in particular mac80211 to

 *	to able to call the right NAPI RX functions); this function is needed

 *	to eventually call netif_napi_add() with higher layer involvement.

 * @queue_full: notifies that a HW queue is full.

 *	Must be atomic and called with BH disabled.

 * @queue_not_full: notifies that a HW queue is not full any more.
@@ -143,6 +147,11 @@ struct iwl_op_mode_ops { 
	void (*stop)(struct iwl_op_mode *op_mode);

	int (*rx)(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,

		  struct iwl_device_cmd *cmd);

	void (*napi_add)(struct iwl_op_mode *op_mode,

			 struct napi_struct *napi,

			 struct net_device *napi_dev,

			 int (*poll)(struct napi_struct *, int),

			 int weight);

	void (*queue_full)(struct iwl_op_mode *op_mode, int queue);

	void (*queue_not_full)(struct iwl_op_mode *op_mode, int queue);

	bool (*hw_rf_kill)(struct iwl_op_mode *op_mode, bool state);
@@ -180,7 +189,6 @@ static inline int iwl_op_mode_rx(struct iwl_op_mode *op_mode, 
				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *cmd)

{

	might_sleep();

	return op_mode->ops->rx(op_mode, rxb, cmd);

}
@@ -249,4 +257,15 @@ static inline int iwl_op_mode_exit_d0i3(struct iwl_op_mode *op_mode) 
	return op_mode->ops->exit_d0i3(op_mode);

}



static inline void iwl_op_mode_napi_add(struct iwl_op_mode *op_mode,

					struct napi_struct *napi,

					struct net_device *napi_dev,

					int (*poll)(struct napi_struct *, int),

					int weight)

{

	if (!op_mode->ops->napi_add)

		return;

	op_mode->ops->napi_add(op_mode, napi, napi_dev, poll, weight);

}



#endif /* __iwl_op_mode_h__ */

drivers/net/wireless/iwlwifi/mvm/ops.c

+12 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,17 @@ out: 
	return ret;

}



static void iwl_mvm_napi_add(struct iwl_op_mode *op_mode,

			     struct napi_struct *napi,

			     struct net_device *napi_dev,

			     int (*poll)(struct napi_struct *, int),

			     int weight)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);



	ieee80211_napi_add(mvm->hw, napi, napi_dev, poll, weight);

}



static const struct iwl_op_mode_ops iwl_mvm_ops = {

	.start = iwl_op_mode_mvm_start,

	.stop = iwl_op_mode_mvm_stop,
@@ -1196,4 +1207,5 @@ static const struct iwl_op_mode_ops iwl_mvm_ops = { 
	.nic_config = iwl_mvm_nic_config,

	.enter_d0i3 = iwl_mvm_enter_d0i3,

	.exit_d0i3 = iwl_mvm_exit_d0i3,

	.napi_add = iwl_mvm_napi_add,

};

drivers/net/wireless/iwlwifi/mvm/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm, 


	memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));



	ieee80211_rx_ni(mvm->hw, skb);

	ieee80211_rx(mvm->hw, skb);

}



static void iwl_mvm_calc_rssi(struct iwl_mvm *mvm,

drivers/net/wireless/iwlwifi/mvm/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
		info->status.status_driver_data[0] =

				(void *)(uintptr_t)tx_resp->reduced_tpc;



		ieee80211_tx_status_ni(mvm->hw, skb);

		ieee80211_tx_status(mvm->hw, skb);

	}



	if (txq_id >= mvm->first_agg_queue) {
@@ -944,7 +944,7 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb, 


	while (!skb_queue_empty(&reclaimed_skbs)) {

		skb = __skb_dequeue(&reclaimed_skbs);

		ieee80211_tx_status_ni(mvm->hw, skb);

		ieee80211_tx_status(mvm->hw, skb);

	}



	return 0;