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

Commit 854d773e authored by Sara Sharon's avatar Sara Sharon Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: improve RSS configuration 



Improve current RSS configuration:
 * Use netdev_rss_key instead of keeping a local copy.
 * Configure also UDP hashing to have UDP traffic spread across queues.
 * Do not direct RSS traffic to our fallback queue.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 013a67ea

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c

+4 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
 *****************************************************************************/

#include <linux/vmalloc.h>

#include <linux/ieee80211.h>

#include <linux/netdevice.h>



#include "mvm.h"

#include "fw-dbg.h"
@@ -880,8 +881,10 @@ static ssize_t iwl_dbgfs_indirection_tbl_write(struct iwl_mvm *mvm, 
	struct iwl_rss_config_cmd cmd = {

		.flags = cpu_to_le32(IWL_RSS_ENABLE),

		.hash_mask = IWL_RSS_HASH_TYPE_IPV4_TCP |

			     IWL_RSS_HASH_TYPE_IPV4_UDP |

			     IWL_RSS_HASH_TYPE_IPV4_PAYLOAD |

			     IWL_RSS_HASH_TYPE_IPV6_TCP |

			     IWL_RSS_HASH_TYPE_IPV6_UDP |

			     IWL_RSS_HASH_TYPE_IPV6_PAYLOAD,

	};

	int ret, i, num_repeats, nbytes = count / 2;
@@ -905,7 +908,7 @@ static ssize_t iwl_dbgfs_indirection_tbl_write(struct iwl_mvm *mvm, 
	memcpy(&cmd.indirection_table[i * nbytes], cmd.indirection_table,

	       ARRAY_SIZE(cmd.indirection_table) % nbytes);



	memcpy(cmd.secret_key, mvm->secret_key, sizeof(cmd.secret_key));

	netdev_rss_key_fill(cmd.secret_key, sizeof(cmd.secret_key));



	mutex_lock(&mvm->mutex);

	ret = iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+7 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
 *

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

#include <net/mac80211.h>

#include <linux/netdevice.h>



#include "iwl-trans.h"

#include "iwl-op-mode.h"
@@ -114,14 +115,18 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm) 
	struct iwl_rss_config_cmd cmd = {

		.flags = cpu_to_le32(IWL_RSS_ENABLE),

		.hash_mask = IWL_RSS_HASH_TYPE_IPV4_TCP |

			     IWL_RSS_HASH_TYPE_IPV4_UDP |

			     IWL_RSS_HASH_TYPE_IPV4_PAYLOAD |

			     IWL_RSS_HASH_TYPE_IPV6_TCP |

			     IWL_RSS_HASH_TYPE_IPV6_UDP |

			     IWL_RSS_HASH_TYPE_IPV6_PAYLOAD,

	};



	/* Do not direct RSS traffic to Q 0 which is our fallback queue */

	for (i = 0; i < ARRAY_SIZE(cmd.indirection_table); i++)

		cmd.indirection_table[i] = i % mvm->trans->num_rx_queues;

	memcpy(cmd.secret_key, mvm->secret_key, sizeof(cmd.secret_key));

		cmd.indirection_table[i] =

			1 + (i % (mvm->trans->num_rx_queues - 1));

	netdev_rss_key_fill(cmd.secret_key, sizeof(cmd.secret_key));



	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);

}

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −1
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ struct iwl_mvm { 
	atomic_t pending_frames[IWL_MVM_STATION_COUNT];

	u32 tfd_drained[IWL_MVM_STATION_COUNT];

	u8 rx_ba_sessions;

	u32 secret_key[IWL_RSS_HASH_KEY_CNT];



	/* configured by mac80211 */

	u32 rts_threshold;

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

+0 −3
Original line number Diff line number Diff line
@@ -725,9 +725,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 


	iwl_mvm_tof_init(mvm);



	/* init RSS hash key */

	get_random_bytes(mvm->secret_key, sizeof(mvm->secret_key));



	return op_mode;



 out_unregister: